1
0
Fork 0

DBG: replaced all 'not enough arguments' (closes #1216)

This commit is contained in:
mrexodia 2016-11-05 05:02:18 +01:00
parent e5026590b4
commit 98a009230d
No known key found for this signature in database
GPG Key ID: FC89E0AAA0C1AAD8
9 changed files with 19 additions and 76 deletions

View File

@ -383,11 +383,8 @@ static bool cbDisableAllHardwareBreakpoints(const BREAKPOINT* bp)
bool cbDebugSetHardwareBreakpoint(int argc, char* argv[])
{
if(argc < 2)
{
dputs(QT_TRANSLATE_NOOP("DBG", "Not enough arguments!"));
if(IsArgumentsLessThan(argc, 2))
return false;
}
duint addr;
if(!valfromstring(argv[1], &addr))
return false;
@ -677,11 +674,8 @@ static bool cbDisableAllMemoryBreakpoints(const BREAKPOINT* bp)
bool cbDebugSetMemoryBpx(int argc, char* argv[])
{
if(argc < 2)
{
dputs(QT_TRANSLATE_NOOP("DBG", "Not enough arguments!"));
if(IsArgumentsLessThan(argc, 2))
return false;
}
duint addr;
if(!valfromstring(argv[1], &addr))
return false;
@ -947,11 +941,8 @@ static bool cbDisableAllDllBreakpoints(const BREAKPOINT* bp)
bool cbDebugBpDll(int argc, char* argv[])
{
if(argc < 2)
{
dputs(QT_TRANSLATE_NOOP("DBG", "Not enough arguments!"));
if(IsArgumentsLessThan(argc, 2))
return false;
}
DWORD type = UE_ON_LIB_ALL;
if(argc > 2)
{

View File

@ -61,11 +61,8 @@ static bool cbDebugSetBPXCommandConditionCommon(BP_TYPE Type, int argc, char* ar
static bool cbDebugSetBPXFastResumeCommon(BP_TYPE Type, int argc, char* argv[])
{
BREAKPOINT bp;
if(argc < 2)
{
dputs(QT_TRANSLATE_NOOP("DBG", "Not enough arguments!\n"));
if(IsArgumentsLessThan(argc, 2))
return false;
}
auto fastResume = true;
if(argc > 2)
{
@ -91,11 +88,8 @@ static bool cbDebugSetBPXFastResumeCommon(BP_TYPE Type, int argc, char* argv[])
static bool cbDebugSetBPXSingleshootCommon(BP_TYPE Type, int argc, char* argv[])
{
BREAKPOINT bp;
if(argc < 2)
{
dputs(QT_TRANSLATE_NOOP("DBG", "Not enough arguments!\n"));
if(IsArgumentsLessThan(argc, 2))
return false;
}
auto singleshoot = true;
if(argc > 2)
{
@ -121,11 +115,8 @@ static bool cbDebugSetBPXSingleshootCommon(BP_TYPE Type, int argc, char* argv[])
static bool cbDebugSetBPXSilentCommon(BP_TYPE Type, int argc, char* argv[])
{
BREAKPOINT bp;
if(argc < 2)
{
dputs(QT_TRANSLATE_NOOP("DBG", "Not enough arguments!\n"));
if(IsArgumentsLessThan(argc, 2))
return false;
}
auto silent = true;
if(argc > 2)
{
@ -150,11 +141,8 @@ static bool cbDebugSetBPXSilentCommon(BP_TYPE Type, int argc, char* argv[])
static bool cbDebugGetBPXHitCountCommon(BP_TYPE Type, int argc, char* argv[])
{
if(argc < 2)
{
dputs(QT_TRANSLATE_NOOP("DBG", "Not enough arguments!\n"));
if(IsArgumentsLessThan(argc, 2))
return false;
}
BREAKPOINT bp;
if(!BpGetAny(Type, argv[1], &bp))
{
@ -168,11 +156,8 @@ static bool cbDebugGetBPXHitCountCommon(BP_TYPE Type, int argc, char* argv[])
static bool cbDebugResetBPXHitCountCommon(BP_TYPE Type, int argc, char* argv[])
{
if(argc < 2)
{
dputs(QT_TRANSLATE_NOOP("DBG", "Not enough arguments!\n"));
if(IsArgumentsLessThan(argc, 2))
return false;
}
duint value = 0;
if(argc > 2)
if(!valfromstring(argv[2], &value, false))

View File

@ -45,11 +45,8 @@ bool cbDebugInit(int argc, char* argv[])
cbDebugStop(argc, argv);
static char arg1[deflen] = "";
if(argc < 2)
{
dputs(QT_TRANSLATE_NOOP("DBG", "Not enough arguments!"));
if(IsArgumentsLessThan(argc, 2))
return false;
}
strcpy_s(arg1, argv[1]);
char szResolvedPath[MAX_PATH] = "";
if(ResolveShortcut(GuiGetWindowHandle(), StringUtils::Utf8ToUtf16(arg1).c_str(), szResolvedPath, _countof(szResolvedPath)))
@ -150,11 +147,8 @@ bool cbDebugStop(int argc, char* argv[])
bool cbDebugAttach(int argc, char* argv[])
{
if(argc < 2)
{
dputs(QT_TRANSLATE_NOOP("DBG", "Not enough arguments!"));
if(IsArgumentsLessThan(argc, 2))
return false;
}
duint pid = 0;
if(!valfromstring(argv[1], &pid, false))
return false;

View File

@ -219,11 +219,8 @@ bool cbInstrSar(int argc, char* argv[])
bool cbInstrPush(int argc, char* argv[])
{
if(argc < 2)
{
dputs(QT_TRANSLATE_NOOP("DBG", "Not enough arguments!"));
if(IsArgumentsLessThan(argc, 2))
return false;
}
duint value;
if(!valfromstring(argv[1], &value))
{

View File

@ -27,11 +27,8 @@ bool cbDebugDisasm(int argc, char* argv[])
bool cbDebugDump(int argc, char* argv[])
{
if(argc < 2)
{
dputs(QT_TRANSLATE_NOOP("DBG", "Not enough arguments!"));
if(IsArgumentsLessThan(argc, 2))
return false;
}
duint addr = 0;
if(!valfromstring(argv[1], &addr))
{
@ -157,11 +154,8 @@ bool cbInstrDisableGuiUpdate(int argc, char* argv[])
bool cbDebugSetfreezestack(int argc, char* argv[])
{
if(argc < 2)
{
dputs(QT_TRANSLATE_NOOP("DBG", "Not enough arguments!"));
if(IsArgumentsLessThan(argc, 2))
return false;
}
bool freeze = *argv[1] != '0';
dbgsetfreezestack(freeze);
if(freeze)

View File

@ -63,11 +63,8 @@ bool cbDebugMemset(int argc, char* argv[])
duint addr;
duint value;
duint size;
if(argc < 3)
{
dputs(QT_TRANSLATE_NOOP("DBG", "Not enough arguments"));
if(IsArgumentsLessThan(argc, 3))
return false;
}
if(!valfromstring(argv[1], &addr, false) || !valfromstring(argv[2], &value, false))
return false;
if(argc > 3)

View File

@ -154,11 +154,8 @@ bool cbDebugResumeAllThreads(int argc, char* argv[])
bool cbDebugSetPriority(int argc, char* argv[])
{
if(argc < 3)
{
dputs(QT_TRANSLATE_NOOP("DBG", "Not enough arguments!"));
if(IsArgumentsLessThan(argc, 3))
return false;
}
duint threadid;
if(!valfromstring(argv[1], &threadid, false))
return false;
@ -220,11 +217,8 @@ bool cbDebugSetPriority(int argc, char* argv[])
bool cbDebugSetthreadname(int argc, char* argv[])
{
if(argc < 2)
{
dputs(QT_TRANSLATE_NOOP("DBG", "Not enough arguments!"));
if(IsArgumentsLessThan(argc, 2))
return false;
}
duint threadid;
if(!valfromstring(argv[1], &threadid, false))
return false;

View File

@ -11,11 +11,8 @@ extern std::vector<std::pair<duint, duint>> RunToUserCodeBreakpoints;
static bool cbDebugConditionalTrace(void* callBack, bool stepOver, int argc, char* argv[])
{
if(argc < 2)
{
dputs(QT_TRANSLATE_NOOP("DBG", "Not enough arguments"));
if(IsArgumentsLessThan(argc, 2))
return false;
}
if(dbgtraceactive())
{
dputs(QT_TRANSLATE_NOOP("DBG", "Trace already active"));

View File

@ -36,11 +36,8 @@ static String notesFile;
static bool cbStrLen(int argc, char* argv[])
{
if(argc < 2)
{
dputs(QT_TRANSLATE_NOOP("DBG", "not enough arguments!"));
if(IsArgumentsLessThan(argc, 2))
return false;
}
dprintf_untranslated("\"%s\"[%d]\n", argv[1], int(strlen(argv[1])));
return true;
}
@ -64,11 +61,8 @@ static bool DbgScriptDllExec(const char* dll);
static bool cbScriptDll(int argc, char* argv[])
{
if(argc < 2)
{
dputs(QT_TRANSLATE_NOOP("DBG", "not enough arguments!"));
if(IsArgumentsLessThan(argc, 2))
return false;
}
return DbgScriptDllExec(argv[1]);
}