UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add argument index to format error messages

Browse Source
This commit is contained in:
Asher Baker 2016-02-15 10:20:08 +00:00
parent 9008705b9d
commit 936bdc47f0
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/logic/sprintf.cpp
View File

@ -87,7 +87,7 @@ try_serverlang:
} }
else else
{ {
pCtx->ThrowNativeErrorEx(SP_ERROR_PARAM, "Translation failed: invalid client index %d", target); pCtx->ThrowNativeErrorEx(SP_ERROR_PARAM, "Translation failed: invalid client index %d (arg %d)", target, *arg);
goto error_out; goto error_out;
} }
@ -102,13 +102,13 @@ try_serverlang:
{ {
if (pPhrases->FindTranslation(key, SOURCEMOD_LANGUAGE_ENGLISH, &pTrans) != Trans_Okay) if (pPhrases->FindTranslation(key, SOURCEMOD_LANGUAGE_ENGLISH, &pTrans) != Trans_Okay)
{ {
pCtx->ThrowNativeErrorEx(SP_ERROR_PARAM, "Language phrase \"%s\" not found", key); pCtx->ThrowNativeErrorEx(SP_ERROR_PARAM, "Language phrase \"%s\" not found (arg %d)", key, *arg);
goto error_out; goto error_out;
} }
} }
else else
{ {
pCtx->ThrowNativeErrorEx(SP_ERROR_PARAM, "Language phrase \"%s\" not found", key); pCtx->ThrowNativeErrorEx(SP_ERROR_PARAM, "Language phrase \"%s\" not found (arg %d)", key, *arg);
goto error_out; goto error_out;
} }
} }
@ -123,9 +123,8 @@ try_serverlang:
if ((*arg) + (max_params - 1) > (size_t)params[0]) if ((*arg) + (max_params - 1) > (size_t)params[0])
{ {
pCtx->ThrowNativeErrorEx(SP_ERROR_PARAMS_MAX, pCtx->ThrowNativeErrorEx(SP_ERROR_PARAMS_MAX,
"Translation string formatted incorrectly - missing at least %d parameters", "Translation string formatted incorrectly - missing at least %d parameters (arg %d)",
((*arg + (max_params - 1)) - params[0]) ((*arg + (max_params - 1)) - params[0]), *arg);
);
goto error_out; goto error_out;
} }
@ -1127,7 +1126,7 @@ reswitch:
const char *auth; const char *auth;
int userid; int userid;
if (!bridge->DescribePlayer(*value, &name, &auth, &userid)) if (!bridge->DescribePlayer(*value, &name, &auth, &userid))
return pCtx->ThrowNativeError("Client index %d is invalid", *value); return pCtx->ThrowNativeError("Client index %d is invalid (arg %d)", *value, arg);
ke::SafeSprintf(buffer, ke::SafeSprintf(buffer,
sizeof(buffer), sizeof(buffer),
"%s<%d><%s><>", "%s<%d><%s><>",
@ -1154,7 +1153,7 @@ reswitch:
const char *name = "Console"; const char *name = "Console";
if (*value) { if (*value) {
if (!bridge->DescribePlayer(*value, &name, nullptr, nullptr)) if (!bridge->DescribePlayer(*value, &name, nullptr, nullptr))
return pCtx->ThrowNativeError("Client index %d is invalid", *value); return pCtx->ThrowNativeError("Client index %d is invalid (arg %d)", *value, arg);
} }
AddString(&buf_p, llen, name, width, prec, flags); AddString(&buf_p, llen, name, width, prec, flags);
arg++; arg++;