1
0
Fork 0

DBG: fixed various warnings (closes issue #1175)

This commit is contained in:
mrexodia 2016-10-19 12:43:10 +02:00
parent 9138a3410e
commit fcf5916250
No known key found for this signature in database
GPG Key ID: FC89E0AAA0C1AAD8
5 changed files with 7 additions and 8 deletions

View File

@ -248,7 +248,7 @@ extern "C" DLL_EXPORT bool _dbg_addrinfoget(duint addr, SEGMENTREG segment, ADDR
len--;
if(len)
len++;
comment = StringUtils::sprintf("%s:%u", StringUtils::Utf16ToUtf8(filename + len), line.LineNumber);
comment = StringUtils::sprintf("%s:%u", StringUtils::Utf16ToUtf8(filename + len).c_str(), line.LineNumber);
retval = true;
}
if(!bOnlyCipAutoComments || addr == GetContextDataEx(hActiveThread, UE_CIP)) //no line number

View File

@ -196,7 +196,7 @@ void RecursiveAnalysis::analyzeFunction(duint entryPoint)
auto size = mCp.Disassemble(addr, translateAddr(addr)) ? mCp.Size() : 1;
BridgeCFInstruction instr;
instr.addr = addr;
for(duint i = 0; i < size; i++)
for(int i = 0; i < size; i++)
instr.data[i] = inRange(addr + i) ? *translateAddr(addr + i) : 0;
node.instrs.push_back(instr);
addr += size;

View File

@ -212,10 +212,9 @@ bool cbCommandProvider(char* cmd, int maxlen);
void cmdloop()
{
char command_[deflen] = "";
bool bLoop = true;
StringList commands;
commands.reserve(100);
while(bLoop)
while(true)
{
if(!cbCommandProvider(command_, deflen))
break;

View File

@ -241,7 +241,7 @@ void StringUtils::ReplaceAll(WString & s, const WString & from, const WString &
}
}
String StringUtils::sprintf(const char* format, ...)
String StringUtils::sprintf(_Printf_format_string_ const char* format, ...)
{
va_list args;
va_start(args, format);
@ -261,7 +261,7 @@ String StringUtils::sprintf(const char* format, ...)
return String(buffer());
}
WString StringUtils::sprintf(const wchar_t* format, ...)
WString StringUtils::sprintf(_Printf_format_string_ const wchar_t* format, ...)
{
va_list args;
va_start(args, format);

View File

@ -29,8 +29,8 @@ public:
static WString Utf8ToUtf16(const char* str);
static void ReplaceAll(String & s, const String & from, const String & to);
static void ReplaceAll(WString & s, const WString & from, const WString & to);
static String sprintf(const char* format, ...);
static WString sprintf(const wchar_t* format, ...);
static String sprintf(_In_z_ _Printf_format_string_ const char* format, ...);
static WString sprintf(_In_z_ _Printf_format_string_ const wchar_t* format, ...);
static String ToLower(const String & s);
static bool StartsWith(const String & h, const String & n);
static bool FromHex(const String & text, std::vector<unsigned char> & data, bool reverse = false);