diff options
| author | Rusty Wagner <rusty@vector35.com> | 2020-06-08 23:11:12 -0400 |
|---|---|---|
| committer | Rusty Wagner <rusty@vector35.com> | 2020-06-09 18:59:43 -0400 |
| commit | 7b2700b2748b9513811ab6521c9b57e23175c1e2 (patch) | |
| tree | 3d21461fb775caf07a7bb79a92057bf8f222b827 | |
| parent | ecc69a0da9a7f37e9e126beb17c20e537be92e22 (diff) | |
Fix warnings
| -rw-r--r-- | binaryninjaapi.h | 10 | ||||
| -rw-r--r-- | binaryreader.cpp | 2 | ||||
| -rw-r--r-- | binaryview.cpp | 2 | ||||
| -rw-r--r-- | examples/triage/byte.cpp | 4 | ||||
| -rw-r--r-- | examples/triage/headers.cpp | 10 | ||||
| -rw-r--r-- | examples/triage/imports.cpp | 6 | ||||
| -rw-r--r-- | lowlevelil.cpp | 4 | ||||
| -rw-r--r-- | lowlevelilinstruction.cpp | 6 | ||||
| -rw-r--r-- | ui/xreflist.h | 10 |
9 files changed, 27 insertions, 27 deletions
diff --git a/binaryninjaapi.h b/binaryninjaapi.h index c5367026..95575d41 100644 --- a/binaryninjaapi.h +++ b/binaryninjaapi.h @@ -1335,7 +1335,7 @@ __attribute__ ((format (printf, 1, 2))) void SetLength(uint64_t length); void SetDataOffset(uint64_t dataOffset); void SetDataLength(uint64_t dataLength); - void SetFlags(uint64_t flags); + void SetFlags(uint32_t flags); }; class Section: public CoreRefCountObject<BNSection, BNNewSectionReference, BNFreeSection> @@ -3428,9 +3428,9 @@ __attribute__ ((format (printf, 1, 2))) ExprId FloatConstDouble(double val, const ILSourceLocation& loc = ILSourceLocation()); ExprId Flag(uint32_t flag, const ILSourceLocation& loc = ILSourceLocation()); ExprId FlagSSA(const SSAFlag& flag, const ILSourceLocation& loc = ILSourceLocation()); - ExprId FlagBit(size_t size, uint32_t flag, uint32_t bitIndex, + ExprId FlagBit(size_t size, uint32_t flag, size_t bitIndex, const ILSourceLocation& loc = ILSourceLocation()); - ExprId FlagBitSSA(size_t size, const SSAFlag& flag, uint32_t bitIndex, + ExprId FlagBitSSA(size_t size, const SSAFlag& flag, size_t bitIndex, const ILSourceLocation& loc = ILSourceLocation()); ExprId Add(size_t size, ExprId a, ExprId b, uint32_t flags = 0, const ILSourceLocation& loc = ILSourceLocation()); @@ -3540,7 +3540,7 @@ __attribute__ ((format (printf, 1, 2))) ExprId IntrinsicSSA(const std::vector<SSARegisterOrFlag>& outputs, uint32_t intrinsic, const std::vector<ExprId>& params, const ILSourceLocation& loc = ILSourceLocation()); ExprId Breakpoint(const ILSourceLocation& loc = ILSourceLocation()); - ExprId Trap(uint32_t num, const ILSourceLocation& loc = ILSourceLocation()); + ExprId Trap(int64_t num, const ILSourceLocation& loc = ILSourceLocation()); ExprId Undefined(const ILSourceLocation& loc = ILSourceLocation()); ExprId Unimplemented(const ILSourceLocation& loc = ILSourceLocation()); ExprId UnimplementedMemoryRef(size_t size, ExprId addr, const ILSourceLocation& loc = ILSourceLocation()); @@ -3600,7 +3600,7 @@ __attribute__ ((format (printf, 1, 2))) ExprId GetExprForRegisterOrConstantOperation(BNLowLevelILOperation op, size_t size, BNRegisterOrConstant* operands, size_t operandCount); - ExprId Operand(uint32_t n, ExprId expr); + ExprId Operand(size_t n, ExprId expr); BNLowLevelILInstruction GetRawExpr(size_t i) const; LowLevelILInstruction operator[](size_t i); diff --git a/binaryreader.cpp b/binaryreader.cpp index 4665aebf..1308a6b4 100644 --- a/binaryreader.cpp +++ b/binaryreader.cpp @@ -299,7 +299,7 @@ string BinaryReader::ReadCString(size_t maxSize) result.push_back(cur); } } - catch (ReadException& r) + catch (ReadException&) {;} return result; } diff --git a/binaryview.cpp b/binaryview.cpp index 24a50c11..0dfd0a8d 100644 --- a/binaryview.cpp +++ b/binaryview.cpp @@ -714,7 +714,7 @@ void Segment::SetDataLength(uint64_t dataLength) } -void Segment::SetFlags(uint64_t flags) +void Segment::SetFlags(uint32_t flags) { BNSegmentSetFlags(m_object, flags); } diff --git a/examples/triage/byte.cpp b/examples/triage/byte.cpp index 69305430..9fdb80be 100644 --- a/examples/triage/byte.cpp +++ b/examples/triage/byte.cpp @@ -265,7 +265,7 @@ void ByteView::adjustSize(int width, int height) m_addrWidth = QString::number(m_data->GetEnd(), 16).size(); if (m_addrWidth < 8) m_addrWidth = 8; - int cols = ((width - 4) / m_render.getFontWidth()) - (m_addrWidth + 2); + int cols = ((width - 4) / m_render.getFontWidth()) - ((int)m_addrWidth + 2); if (cols < 1) cols = 1; if ((size_t)cols != m_cols) @@ -553,7 +553,7 @@ void ByteView::updateCaret() if (((m_prevCursorAddr >= m_lines[i].address) && (m_prevCursorAddr <= (m_lines[i].address + m_lines[i].length))) || ((m_cursorAddr >= m_lines[i].address) && (m_cursorAddr <= (m_lines[i].address + m_lines[i].length)))) { - viewport()->update(0, (i - m_topLine) * m_render.getFontHeight(), + viewport()->update(0, (int)(i - m_topLine) * m_render.getFontHeight(), viewport()->size().width(), m_render.getFontHeight() + 3); } } diff --git a/examples/triage/headers.cpp b/examples/triage/headers.cpp index e5d962ca..1baa4c66 100644 --- a/examples/triage/headers.cpp +++ b/examples/triage/headers.cpp @@ -112,13 +112,13 @@ PEHeaders::PEHeaders(BinaryViewRef data) uint64_t machineValue = GetValueOfStructMember(data, "COFF_Header", peOffset, "machine"); QString machineName = GetNameOfEnumerationMember(data, "coff_machine", machineValue); if (machineName.startsWith("IMAGE_FILE_MACHINE_")) - machineName = machineName.mid(strlen("IMAGE_FILE_MACHINE_")); + machineName = machineName.mid((int)strlen("IMAGE_FILE_MACHINE_")); AddField("Machine", machineName); uint64_t subsysValue = GetValueOfStructMember(data, optHeaderName, optHeaderStart, "subsystem"); QString subsysName = GetNameOfEnumerationMember(data, "pe_subsystem", subsysValue); if (subsysName.startsWith("IMAGE_SUBSYSTEM_")) - subsysName = subsysName.mid(strlen("IMAGE_SUBSYSTEM_")); + subsysName = subsysName.mid((int)strlen("IMAGE_SUBSYSTEM_")); AddField("Subsystem", subsysName); uint64_t secs = GetValueOfStructMember(data, "COFF_Header", peOffset, "timeDateStamp"); @@ -204,7 +204,7 @@ PEHeaders::PEHeaders(BinaryViewRef data) if (coffCharValue & member.value) { if (QString::fromStdString(member.name).startsWith("IMAGE_FILE_")) - coffCharValues.push_back(QString::fromStdString(member.name).mid(strlen("IMAGE_FILE_"))); + coffCharValues.push_back(QString::fromStdString(member.name).mid((int)strlen("IMAGE_FILE_"))); else coffCharValues.push_back(QString::fromStdString(member.name)); } @@ -223,7 +223,7 @@ PEHeaders::PEHeaders(BinaryViewRef data) if (dllCharValue & member.value) { if (QString::fromStdString(member.name).startsWith("IMAGE_DLLCHARACTERISTICS_")) - dllCharValues.push_back(QString::fromStdString(member.name).mid(strlen("IMAGE_DLLCHARACTERISTICS_"))); + dllCharValues.push_back(QString::fromStdString(member.name).mid((int)strlen("IMAGE_DLLCHARACTERISTICS_"))); else dllCharValues.push_back(QString::fromStdString(member.name)); } @@ -324,6 +324,6 @@ HeaderWidget::HeaderWidget(QWidget* parent, const Headers& header): QWidget(pare } for (col = 1; col < (int)header.GetColumns(); col++) layout->setColumnMinimumWidth(col * 3 - 1, UIContext::getScaledWindowSize(20, 20).width()); - layout->setColumnStretch(header.GetColumns() * 3 - 1, 1); + layout->setColumnStretch((int)header.GetColumns() * 3 - 1, 1); setLayout(layout); } diff --git a/examples/triage/imports.cpp b/examples/triage/imports.cpp index 89683878..01e379f8 100644 --- a/examples/triage/imports.cpp +++ b/examples/triage/imports.cpp @@ -59,11 +59,11 @@ QVariant GenericImportsModel::data(const QModelIndex& index, int role) const { QString name = QString::fromStdString(m_entries[index.row()]->GetFullName()); if (name.endsWith("@GOT")) - name = name.mid(0, name.size() - strlen("@GOT")); + name = name.mid(0, name.size() - (int)strlen("@GOT")); else if (name.endsWith("@PLT")) - name = name.mid(0, name.size() - strlen("@PLT")); + name = name.mid(0, name.size() - (int)strlen("@PLT")); else if (name.endsWith("@IAT")) - name = name.mid(0, name.size() - strlen("@IAT")); + name = name.mid(0, name.size() - (int)strlen("@IAT")); return name; } if (index.column() == m_moduleCol) diff --git a/lowlevelil.cpp b/lowlevelil.cpp index 10f72541..13b465f9 100644 --- a/lowlevelil.cpp +++ b/lowlevelil.cpp @@ -346,9 +346,9 @@ ExprId LowLevelILFunction::GetExprForRegisterOrConstantOperation(BNLowLevelILOpe } -ExprId LowLevelILFunction::Operand(uint32_t n, ExprId expr) +ExprId LowLevelILFunction::Operand(size_t n, ExprId expr) { - BNLowLevelILSetExprSourceOperand(m_object, expr, n); + BNLowLevelILSetExprSourceOperand(m_object, expr, (uint32_t)n); return expr; } diff --git a/lowlevelilinstruction.cpp b/lowlevelilinstruction.cpp index faaa79a9..529f6840 100644 --- a/lowlevelilinstruction.cpp +++ b/lowlevelilinstruction.cpp @@ -3036,13 +3036,13 @@ ExprId LowLevelILFunction::FlagSSA(const SSAFlag& flag, const ILSourceLocation& } -ExprId LowLevelILFunction::FlagBit(size_t size, uint32_t flag, uint32_t bitIndex, const ILSourceLocation& loc) +ExprId LowLevelILFunction::FlagBit(size_t size, uint32_t flag, size_t bitIndex, const ILSourceLocation& loc) { return AddExprWithLocation(LLIL_FLAG_BIT, loc, size, 0, flag, bitIndex); } -ExprId LowLevelILFunction::FlagBitSSA(size_t size, const SSAFlag& flag, uint32_t bitIndex, +ExprId LowLevelILFunction::FlagBitSSA(size_t size, const SSAFlag& flag, size_t bitIndex, const ILSourceLocation& loc) { return AddExprWithLocation(LLIL_FLAG_BIT_SSA, loc, size, 0, flag.flag, flag.version, bitIndex); @@ -3445,7 +3445,7 @@ ExprId LowLevelILFunction::Breakpoint(const ILSourceLocation& loc) } -ExprId LowLevelILFunction::Trap(uint32_t num, const ILSourceLocation& loc) +ExprId LowLevelILFunction::Trap(int64_t num, const ILSourceLocation& loc) { return AddExprWithLocation(LLIL_TRAP, loc, 0, 0, num); } diff --git a/ui/xreflist.h b/ui/xreflist.h index 86282e5f..ec7a1c7e 100644 --- a/ui/xreflist.h +++ b/ui/xreflist.h @@ -105,7 +105,7 @@ public: XrefFunctionHeader(); XrefFunctionHeader(FunctionRef func, XrefHeader* parent, XrefItem* child); XrefFunctionHeader(const XrefFunctionHeader& header); - virtual int childCount() const override { return m_refs.size(); } + virtual int childCount() const override { return (int)m_refs.size(); } virtual uint64_t addr() const { return m_func->GetStart(); } virtual void appendChild(XrefItem* ref) override; virtual int row(const XrefItem* item) const override; @@ -120,7 +120,7 @@ class XrefCodeReferences: public XrefHeader public: XrefCodeReferences(XrefHeader* parent); virtual ~XrefCodeReferences(); - virtual int childCount() const override { return m_refs.size(); } + virtual int childCount() const override { return (int)m_refs.size(); } virtual void appendChild(XrefItem* ref) override; XrefHeader* parentOf(XrefItem* ref) const; virtual int row(const XrefItem* item) const override; @@ -134,7 +134,7 @@ class XrefDataReferences: public XrefHeader public: XrefDataReferences(XrefHeader* parent); virtual ~XrefDataReferences(); - virtual int childCount() const override { return m_refs.size(); }; + virtual int childCount() const override { return (int)m_refs.size(); }; virtual void appendChild(XrefItem* ref) override; virtual int row(const XrefItem* item) const override; virtual XrefItem* child(int i) const override; @@ -148,7 +148,7 @@ public: XrefRoot(); XrefRoot(XrefRoot&& root); ~XrefRoot(); - virtual int childCount() const override { return m_refs.size(); } + virtual int childCount() const override { return (int)m_refs.size(); } void appendChild(XrefItem* ref) override; XrefHeader* parentOf(XrefItem* ref); virtual int row(const XrefItem* item) const override; @@ -206,7 +206,7 @@ public: virtual QModelIndex index(int row, int col, const QModelIndex& parent = QModelIndex()) const override; virtual QVariant data(const QModelIndex& i, int role) const override; Qt::ItemFlags flags(const QModelIndex& index) const override; - virtual int rowCount(const QModelIndex& parent = QModelIndex()) const override { (void)parent; return m_refs.size(); }; + virtual int rowCount(const QModelIndex& parent = QModelIndex()) const override { (void)parent; return (int)m_refs.size(); }; virtual QModelIndex parent(const QModelIndex& i) const override { (void)i; return QModelIndex(); } virtual int columnCount(const QModelIndex& parent = QModelIndex()) const override { (void) parent; return 4;}; virtual QVariant headerData(int column, Qt::Orientation orientation, int role) const override; |
