From be731888e767fcc7228d33e04903982e13b43278 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Thu, 13 Sep 2007 18:28:47 +0000 Subject: [PATCH] GetCmdArg() and GetCmdArgString() now return a string length --HG-- extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%401427 --- core/smn_console.cpp | 10 ++++++---- plugins/include/console.inc | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/core/smn_console.cpp b/core/smn_console.cpp index dff169b1..1070fbc4 100644 --- a/core/smn_console.cpp +++ b/core/smn_console.cpp @@ -630,24 +630,26 @@ static cell_t sm_GetCmdArgs(IPluginContext *pContext, const cell_t *params) static cell_t sm_GetCmdArg(IPluginContext *pContext, const cell_t *params) { const char *arg = engine->Cmd_Argv(params[1]); + size_t length; - pContext->StringToLocalUTF8(params[2], params[3], arg, NULL); + pContext->StringToLocalUTF8(params[2], params[3], arg, &length); - return 1; + return (cell_t)length; } static cell_t sm_GetCmdArgString(IPluginContext *pContext, const cell_t *params) { const char *args = engine->Cmd_Args(); + size_t length; if (!args) { args = ""; } - pContext->StringToLocalUTF8(params[1], params[2], args, NULL); + pContext->StringToLocalUTF8(params[1], params[2], args, &length); - return 1; + return (cell_t)length; } static cell_t sm_PrintToServer(IPluginContext *pCtx, const cell_t *params) diff --git a/plugins/include/console.inc b/plugins/include/console.inc index 27e9db97..8bf6c99d 100644 --- a/plugins/include/console.inc +++ b/plugins/include/console.inc @@ -338,7 +338,7 @@ native GetCmdArgs(); * @param argnum Argument number to retrieve. * @param buffer Buffer to use for storing the string. * @param maxlength Maximum length of the buffer. - * @noreturn + * @return Length of string written to buffer. */ native GetCmdArg(argnum, String:buffer[], maxlength); @@ -348,7 +348,7 @@ native GetCmdArg(argnum, String:buffer[], maxlength); * * @param buffer Buffer to use for storing the string. * @param maxlength Maximum length of the buffer. - * @noreturn + * @return Length of string written to buffer. */ native GetCmdArgString(String:buffer[], maxlength);