prog->error_cmd("%s: Bad string", prog->name);
}
-qbool PRVM_ConsoleCommand (prvm_prog_t *prog, const char *text, int *func, qbool preserve_self, int curself, double ptime, qbool prog_loaded, const char *error_message)
+qbool PRVM_ConsoleCommand(prvm_prog_t *prog, const char *text, size_t textlen, int *func, qbool preserve_self, int curself, double ptime, qbool prog_loaded, const char *error_message)
{
int restorevm_tempstringsbuf_cursize;
int save_self = 0; // hush compiler warning
PRVM_gameglobalfloat(time) = ptime;
PRVM_gameglobaledict(self) = curself;
restorevm_tempstringsbuf_cursize = prog->tempstringsbuf.cursize;
- PRVM_G_INT(OFS_PARM0) = PRVM_SetTempString(prog, text);
+ PRVM_G_INT(OFS_PARM0) = PRVM_SetTempString(prog, text, textlen);
prog->ExecuteProgram(prog, *func, error_message);
prog->tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize;
if(preserve_self)
*/
void VM_cvar_string(prvm_prog_t *prog)
{
- char string[VM_TEMPSTRING_MAXSIZE];
+ char cvar_name[VM_TEMPSTRING_MAXSIZE];
+
VM_SAFEPARMCOUNTRANGE(1,8,VM_cvar_string);
- VM_VarString(prog, 0, string, sizeof(string));
- VM_CheckEmptyString(prog, string);
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, PRVM_Cvar_ReadOk(prog, string) ? Cvar_VariableString(prog->console_cmd->cvars, string, prog->console_cmd->cvars_flagsmask) : "");
+ VM_VarString(prog, 0, cvar_name, sizeof(cvar_name));
+ VM_CheckEmptyString(prog, cvar_name);
+ if (PRVM_Cvar_ReadOk(prog, cvar_name))
+ {
+ const char *cvar_string = Cvar_VariableString(prog->console_cmd->cvars, cvar_name, prog->console_cmd->cvars_flagsmask);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, cvar_string, strlen(cvar_string));
+ }
+ else
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, "", 0);
}
*/
void VM_cvar_defstring(prvm_prog_t *prog)
{
- char string[VM_TEMPSTRING_MAXSIZE];
+ char cvar_name[VM_TEMPSTRING_MAXSIZE];
+ const char *cvar_defstring;
+
VM_SAFEPARMCOUNTRANGE(1,8,VM_cvar_defstring);
- VM_VarString(prog, 0, string, sizeof(string));
- VM_CheckEmptyString(prog, string);
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, Cvar_VariableDefString(prog->console_cmd->cvars, string, prog->console_cmd->cvars_flagsmask));
+ VM_VarString(prog, 0, cvar_name, sizeof(cvar_name));
+ VM_CheckEmptyString(prog, cvar_name);
+ cvar_defstring = Cvar_VariableDefString(prog->console_cmd->cvars, cvar_name, prog->console_cmd->cvars_flagsmask);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, cvar_defstring, strlen(cvar_defstring));
}
/*
*/
void VM_cvar_description(prvm_prog_t *prog)
{
- char string[VM_TEMPSTRING_MAXSIZE];
+ char cvar_name[VM_TEMPSTRING_MAXSIZE];
+ const char *cvar_desc;
+
VM_SAFEPARMCOUNTRANGE(1,8,VM_cvar_description);
- VM_VarString(prog, 0, string, sizeof(string));
- VM_CheckEmptyString(prog, string);
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, Cvar_VariableDescription(prog->console_cmd->cvars, string, prog->console_cmd->cvars_flagsmask));
+ VM_VarString(prog, 0, cvar_name, sizeof(cvar_name));
+ VM_CheckEmptyString(prog, cvar_name);
+ cvar_desc = Cvar_VariableDescription(prog->console_cmd->cvars, cvar_name, prog->console_cmd->cvars_flagsmask);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, cvar_desc, strlen(cvar_desc));
}
/*
=================
{
prvm_vec_t v;
char s[128];
+ size_t slen;
VM_SAFEPARMCOUNT(1, VM_ftos);
v = PRVM_G_FLOAT(OFS_PARM0);
if ((prvm_vec_t)((prvm_int_t)v) == v)
- dpsnprintf(s, sizeof(s), "%.0f", v);
+ slen = dpsnprintf(s, sizeof(s), "%.0f", v);
else
- dpsnprintf(s, sizeof(s), "%f", v);
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, s);
+ slen = dpsnprintf(s, sizeof(s), "%f", v);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, s, slen);
}
/*
void VM_vtos(prvm_prog_t *prog)
{
char s[512];
+ size_t slen;
VM_SAFEPARMCOUNT(1,VM_vtos);
- dpsnprintf (s, sizeof(s), "'%5.1f %5.1f %5.1f'", PRVM_G_VECTOR(OFS_PARM0)[0], PRVM_G_VECTOR(OFS_PARM0)[1], PRVM_G_VECTOR(OFS_PARM0)[2]);
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, s);
+ slen = dpsnprintf(s, sizeof(s), "'%5.1f %5.1f %5.1f'", PRVM_G_VECTOR(OFS_PARM0)[0], PRVM_G_VECTOR(OFS_PARM0)[1], PRVM_G_VECTOR(OFS_PARM0)[2]);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, s, slen);
}
/*
void VM_etos(prvm_prog_t *prog)
{
char s[128];
+ size_t slen;
VM_SAFEPARMCOUNT(1, VM_etos);
- dpsnprintf (s, sizeof(s), "entity %i", PRVM_G_EDICTNUM(OFS_PARM0));
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, s);
+ slen = dpsnprintf(s, sizeof(s), "entity %i", PRVM_G_EDICTNUM(OFS_PARM0));
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, s, slen);
}
/*
#endif
char fmt[VM_TEMPSTRING_MAXSIZE];
char result[VM_TEMPSTRING_MAXSIZE];
+ size_t result_len;
+
VM_SAFEPARMCOUNTRANGE(2, 8, VM_strftime);
VM_VarString(prog, 1, fmt, sizeof(fmt));
t = time(NULL);
return;
}
#if _MSC_VER >= 1400
- strftime(result, sizeof(result), fmt, &tm);
+ result_len = strftime(result, sizeof(result), fmt, &tm);
#else
- strftime(result, sizeof(result), fmt, tm);
+ result_len = strftime(result, sizeof(result), fmt, tm);
#endif
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, result);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, result, result_len);
}
/*
if (end < VM_TEMPSTRING_MAXSIZE - 1)
string[end++] = c;
}
- string[end] = 0;
+ string[end] = '\0';
// remove \n following \r
if (c == '\r')
{
if (developer_extra.integer)
Con_DPrintf("fgets: %s: %s\n", prog->name, string);
if (c >= 0 || end)
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, string);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, string, end);
}
/*
if (i < 0 || i >= prog->numfielddefs)
{
VM_Warning(prog, "VM_entityfieldname: %s: field index out of bounds\n", prog->name);
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, "");
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, "", 0);
return;
}
if (i < 0 || i >= prog->numfielddefs)
{
- VM_Warning(prog, "VM_entityfielddata: %s: field index out of bounds\n", prog->name);
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, "");
+ VM_Warning(prog, "VM_entityfielddata: %s: field index out of bounds\n", prog->name);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, "", 0);
return;
}
ent = PRVM_G_EDICT(OFS_PARM1);
if(ent->free)
{
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, "");
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, "", 0);
VM_Warning(prog, "VM_entityfielddata: %s: entity %i is free !\n", prog->name, PRVM_NUM_FOR_EDICT(ent));
return;
}
break;
if (j == prvm_type_size[type])
{
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, "");
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, "", 0);
return;
}
-
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, PRVM_UglyValueString(prog, (etype_t)d->type, val, valuebuf, sizeof(valuebuf)));
+
+ PRVM_UglyValueString(prog, (etype_t)d->type, val, valuebuf, sizeof(valuebuf));
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, valuebuf, strlen(valuebuf));
}
// KrimZon - DP_QC_ENTITYDATA
void VM_strdecolorize(prvm_prog_t *prog)
{
char szNewString[VM_TEMPSTRING_MAXSIZE];
+ size_t szNewString_len;
const char *szString;
// Prepare Strings
VM_SAFEPARMCOUNT(1,VM_strdecolorize);
szString = PRVM_G_STRING(OFS_PARM0);
- COM_StringDecolorize(szString, 0, szNewString, sizeof(szNewString), true);
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, szNewString);
+ szNewString_len = COM_StringDecolorize(szString, 0, szNewString, sizeof(szNewString), true);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, szNewString, szNewString_len);
}
// DRESK - String Length (not counting color codes)
void VM_strtolower(prvm_prog_t *prog)
{
char szNewString[VM_TEMPSTRING_MAXSIZE];
+ size_t szNewString_len;
const char *szString;
// Prepare Strings
VM_SAFEPARMCOUNT(1,VM_strtolower);
szString = PRVM_G_STRING(OFS_PARM0);
- COM_ToLowerString(szString, szNewString, sizeof(szNewString) );
+ szNewString_len = COM_ToLowerString(szString, szNewString, sizeof(szNewString) );
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, szNewString);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, szNewString, szNewString_len);
}
/*
void VM_strtoupper(prvm_prog_t *prog)
{
char szNewString[VM_TEMPSTRING_MAXSIZE];
+ size_t szNewString_len;
const char *szString;
// Prepare Strings
VM_SAFEPARMCOUNT(1,VM_strtoupper);
szString = PRVM_G_STRING(OFS_PARM0);
- COM_ToUpperString(szString, szNewString, sizeof(szNewString) );
+ szNewString_len = COM_ToUpperString(szString, szNewString, sizeof(szNewString) );
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, szNewString);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, szNewString, szNewString_len);
}
/*
void VM_strcat(prvm_prog_t *prog)
{
char s[VM_TEMPSTRING_MAXSIZE];
+ size_t slen;
+
VM_SAFEPARMCOUNTRANGE(1, 8, VM_strcat);
- VM_VarString(prog, 0, s, sizeof(s));
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, s);
+ slen = VM_VarString(prog, 0, s, sizeof(s));
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, s, slen);
}
/*
u_start = u8_byteofs(s, start, NULL);
if (u_start < 0)
{
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, "");
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, "", 0);
return;
}
u_length = u8_bytelen(s + u_start, length);
u_length = sizeof(string)-1;
memcpy(string, s + u_start, u_length);
- string[u_length] = 0;
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, string);
+ string[u_length] = '\0';
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, string, u_length);
}
/*
string[si++] = subject[i];
string[si] = '\0';
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, string);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, string, si);
}
/*
string[si++] = subject[i];
string[si] = '\0';
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, string);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, string, si);
}
/*
if(!COM_ParseToken_VM_Tokenize(&p, false))
break;
tokens_endpos[num_tokens] = p - tokenize_string;
- tokens[num_tokens] = PRVM_SetTempString(prog, com_token);
+ tokens[num_tokens] = PRVM_SetTempString(prog, com_token, com_token_len);
++num_tokens;
}
if(!COM_ParseToken_Console(&p))
break;
tokens_endpos[num_tokens] = p - tokenize_string;
- tokens[num_tokens] = PRVM_SetTempString(prog, com_token);
+ tokens[num_tokens] = PRVM_SetTempString(prog, com_token, com_token_len);
++num_tokens;
}
tokens_endpos[num_tokens] = p0 - tokenize_string;
if (j >= (int)sizeof(tokentext))
break;
- tokentext[j++] = 0;
- tokens[num_tokens++] = PRVM_SetTempString(prog, token);
+ tokentext[j++] = '\0';
+ tokens[num_tokens++] = PRVM_SetTempString(prog, token, j - 1);
if (!*p)
break;
}
void VM_search_getfilename(prvm_prog_t *prog)
{
int handle, filenum;
+
VM_SAFEPARMCOUNT(2, VM_search_getfilename);
handle = (int)PRVM_G_FLOAT(OFS_PARM0);
return;
}
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, prog->opensearches[handle]->filenames[filenum]);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog,
+ prog->opensearches[handle]->filenames[filenum],
+ strlen(prog->opensearches[handle]->filenames[filenum]));
}
/*
char tmp[8];
int len;
- VM_SAFEPARMCOUNT(1, VM_chr);
+ VM_SAFEPARMCOUNT(1, VM_chr);
len = u8_fromchar((Uchar)PRVM_G_FLOAT(OFS_PARM0), tmp, sizeof(tmp));
- tmp[len] = 0;
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, tmp);
+ tmp[len] = '\0';
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, tmp, len);
}
/*
void VM_keynumtostring (prvm_prog_t *prog)
{
char tinystr[TINYSTR_LEN];
- VM_SAFEPARMCOUNT(1, VM_keynumtostring);
+ const char *str; // Key_KeynumToString doesn't always return tinystr
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, Key_KeynumToString((int)PRVM_G_FLOAT(OFS_PARM0), tinystr, TINYSTR_LEN));
+ VM_SAFEPARMCOUNT(1, VM_keynumtostring);
+ str = Key_KeynumToString((int)PRVM_G_FLOAT(OFS_PARM0), tinystr, sizeof(tinystr));
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, str, strlen(str));
}
/*
{
const char *cmd;
char ret[VM_TEMPSTRING_MAXSIZE];
+ size_t ret_len;
int keys[FKFC_NUMKEYS];
int i;
int bindmap;
ret[0] = 0;
for(i = 0; i < FKFC_NUMKEYS; i++)
- dp_strlcat(ret, va(vabuf, sizeof(vabuf), " \'%i\'", keys[i]), sizeof(ret));
+ ret_len = dp_strlcat(ret, va(vabuf, sizeof(vabuf), " \'%i\'", keys[i]), sizeof(ret));
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, ret);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, ret, ret_len);
}
/*
void VM_getkeybind (prvm_prog_t *prog)
{
int bindmap;
+ const char *bind;
+
VM_SAFEPARMCOUNTRANGE(1, 2, VM_getkeybind);
if(prog->argc == 2)
bindmap = bound(-1, PRVM_G_FLOAT(OFS_PARM1), MAX_BINDMAPS-1);
else
bindmap = 0; // consistent to "bind"
-
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, Key_GetBind((int)PRVM_G_FLOAT(OFS_PARM0), bindmap));
+ bind = Key_GetBind((int)PRVM_G_FLOAT(OFS_PARM0), bindmap);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, bind, strlen(bind));
}
/*
else
outstr[outpos++] = *in;
}
- outstr[outpos] = 0;
- PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString(prog, outstr );
+ outstr[outpos] = '\0';
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, outstr, outpos);
}
/*
else
*out = *pos;
- *out = 0;
- PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString(prog, outstr );
+ *out = '\0';
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, outstr, out - outstr);
}
/*
if( *in == '\'' || (*in == '\\' && !*++in) )
break;
- dp_strlcpy(out, in, outstr + sizeof(outstr) - out);
- PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString(prog, outstr );
+ out += dp_strlcpy(out, in, outstr + sizeof(outstr) - out);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, outstr, out - outstr);
}
/*
for( ; *set ; *out++ = *set++ );
*out++ = '\'';
- dp_strlcpy(out, in, outstr + sizeof(outstr) - out);
- PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString(prog, outstr );
+ out += dp_strlcpy(out, in, outstr + sizeof(outstr) - out);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, outstr, out - outstr);
}
void VM_buf_implode (prvm_prog_t *prog)
{
prvm_stringbuffer_t *stringbuffer;
- char k[VM_TEMPSTRING_MAXSIZE];
- const char *sep;
- int i;
- size_t l;
+ char k[VM_TEMPSTRING_MAXSIZE];
+ size_t k_len;
+ const char *sep;
+ int i;
+ size_t l;
+
VM_SAFEPARMCOUNT(2, VM_buf_implode);
stringbuffer = (prvm_stringbuffer_t *)Mem_ExpandableArray_RecordAtIndex(&prog->stringbuffersarray, (int)PRVM_G_FLOAT(OFS_PARM0));
if(!stringbuffer->num_strings)
return;
sep = PRVM_G_STRING(OFS_PARM1);
- k[0] = 0;
+ k[0] = '\0';
+ k_len = 0;
for(l = i = 0;i < stringbuffer->num_strings;i++)
{
if(stringbuffer->strings[i])
if (l >= sizeof(k) - 1)
break;
dp_strlcat(k, sep, sizeof(k));
- dp_strlcat(k, stringbuffer->strings[i], sizeof(k));
+ k_len = dp_strlcat(k, stringbuffer->strings[i], sizeof(k));
}
}
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, k);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, k, k_len);
}
/*
return;
}
if (strindex < stringbuffer->num_strings && stringbuffer->strings[strindex])
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, stringbuffer->strings[strindex]);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, stringbuffer->strings[strindex], strlen(stringbuffer->strings[strindex]));
}
/*
void VM_uncolorstring (prvm_prog_t *prog)
{
char szNewString[VM_TEMPSTRING_MAXSIZE];
+ size_t szNewString_len;
const char *szString;
// Prepare Strings
VM_SAFEPARMCOUNT(1, VM_uncolorstring);
szString = PRVM_G_STRING(OFS_PARM0);
- COM_StringDecolorize(szString, 0, szNewString, sizeof(szNewString), true);
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, szNewString);
-
+ szNewString_len = COM_StringDecolorize(szString, 0, szNewString, sizeof(szNewString), true);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, szNewString, szNewString_len);
}
// #221 float(string str, string sub[, float startpos]) strstrofs (FTE_STRINGS)
char t[9 * 4 + 1];
int i;
size_t len = 0;
+
VM_SAFEPARMCOUNTRANGE(0, 8, VM_chr2str);
for(i = 0; i < prog->argc && len < sizeof(t)-1; ++i)
len += u8_fromchar((Uchar)PRVM_G_FLOAT(OFS_PARM0+i*3), t + len, sizeof(t)-1);
- t[len] = 0;
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, t);
+ t[len] = '\0';
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, t, len);
}
static int chrconv_number(int i, int base, int conv)
}
*result = '\0';
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, (char *) resbuf);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, (char *)resbuf, result - resbuf);
}
// #225 string(float chars, string s, ...) strpad (FTE_STRINGS)
{
char src[VM_TEMPSTRING_MAXSIZE];
char destbuf[VM_TEMPSTRING_MAXSIZE];
+ size_t destbuf_len;
int pad;
+
VM_SAFEPARMCOUNTRANGE(1, 8, VM_strpad);
pad = (int) PRVM_G_FLOAT(OFS_PARM0);
VM_VarString(prog, 1, src, sizeof(src));
// note: < 0 = left padding, > 0 = right padding,
// this is reverse logic of printf!
- dpsnprintf(destbuf, sizeof(destbuf), "%*s", -pad, src);
+ destbuf_len = dpsnprintf(destbuf, sizeof(destbuf), "%*s", -pad, src);
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, destbuf);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, destbuf, destbuf_len);
}
// #226 string(string info, string key, string value, ...) infoadd (FTE_STRINGS)
InfoString_SetValue(temp, VM_TEMPSTRING_MAXSIZE, key, value);
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, temp);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, temp, strlen(temp));
}
// #227 string(string info, string key) infoget (FTE_STRINGS)
InfoString_GetValue(info, key, value, VM_TEMPSTRING_MAXSIZE);
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, value);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, value, strlen(value));
}
//#228 float(string s1, string s2, float len) strncmp (FTE_STRINGS)
outhex[2*i] = hexmap[(out[i] >> 4) & 15];
outhex[2*i+1] = hexmap[(out[i] >> 0) & 15];
}
- outhex[2*i] = 0;
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, outhex);
+ outhex[2*i] = '\0';
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, outhex, 2*i);
}
else
PRVM_G_INT(OFS_RETURN) = 0;
PRVM_gameglobalfloat(trace_dpstartcontents) = trace->startsupercontents;
PRVM_gameglobalfloat(trace_dphitcontents) = trace->hitsupercontents;
PRVM_gameglobalfloat(trace_dphitq3surfaceflags) = trace->hitq3surfaceflags;
- PRVM_gameglobalstring(trace_dphittexturename) = trace->hittexture ? PRVM_SetTempString(prog, trace->hittexture->name) : 0;
+ PRVM_gameglobalstring(trace_dphittexturename) = trace->hittexture ? PRVM_SetTempString(prog, trace->hittexture->name, strlen(trace->hittexture->name)) : 0;
}
void VM_ClearTraceGlobals(prvm_prog_t *prog)
*q++ = hex[ *(unsigned char *)p & 0xF];
}
}
- *q++ = 0;
+ *q = '\0';
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, dest);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, dest, q - dest);
}
// #510 string(string input, ...) uri_unescape (DP_QC_URI_ESCAPE)
// otherwise:
*q++ = *p++;
}
- *q++ = 0;
+ *q = '\0';
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, dest);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, dest, q - dest);
}
// #502 string(string filename) whichpack (DP_QC_WHICHPACK)
fn = PRVM_G_STRING(OFS_PARM0);
pack = FS_WhichPack(fn);
- PRVM_G_INT(OFS_RETURN) = pack ? PRVM_SetTempString(prog, pack) : 0;
+ PRVM_G_INT(OFS_RETURN) = pack ? PRVM_SetTempString(prog, pack, strlen(pack)) : 0;
}
typedef struct
{
if(length_received >= sizeof(handle->buffer))
length_received = sizeof(handle->buffer) - 1;
- handle->buffer[length_received] = 0;
+ handle->buffer[length_received] = '\0';
PRVM_G_FLOAT(OFS_PARM0) = handle->id;
PRVM_G_FLOAT(OFS_PARM1) = status;
- PRVM_G_INT(OFS_PARM2) = PRVM_SetTempString(prog, handle->buffer);
+ PRVM_G_INT(OFS_PARM2) = PRVM_SetTempString(prog, handle->buffer, length_received);
prog->ExecuteProgram(prog, PRVM_allfunction(URI_Get_Callback), "QC function URI_Get_Callback is missing");
}
{
const char *ip;
char normalized[128];
+ size_t normalized_len;
int port;
lhnetaddress_t addr;
if(prog->argc > 1)
port = (int) PRVM_G_FLOAT(OFS_PARM1);
- if(LHNETADDRESS_FromString(&addr, ip, port) && LHNETADDRESS_ToString(&addr, normalized, sizeof(normalized), prog->argc > 1))
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, normalized);
+ if(LHNETADDRESS_FromString(&addr, ip, port) && (normalized_len = LHNETADDRESS_ToString(&addr, normalized, sizeof(normalized), prog->argc > 1)))
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, normalized, normalized_len);
else
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, "");
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, "", 0);
}
//string(prvm_prog_t *prog) getextresponse = #624; // returns the next extResponse packet that was sent to this client
int first;
--cl_net_extresponse_count;
first = (cl_net_extresponse_last + NET_EXTRESPONSE_MAX - cl_net_extresponse_count) % NET_EXTRESPONSE_MAX;
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, cl_net_extresponse[first]);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, cl_net_extresponse[first], strlen(cl_net_extresponse[first]));
}
}
int first;
--sv_net_extresponse_count;
first = (sv_net_extresponse_last + NET_EXTRESPONSE_MAX - sv_net_extresponse_count) % NET_EXTRESPONSE_MAX;
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, sv_net_extresponse[first]);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, sv_net_extresponse[first], strlen(sv_net_extresponse[first]));
}
}
break;
}
}
+
finished:
- *o = 0;
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, outbuf);
+ *o = '\0';
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, outbuf, o - outbuf);
}
{
model_t *model;
msurface_t *surface;
+
VM_SAFEPARMCOUNT(2, VM_getsurfacetexture);
PRVM_G_INT(OFS_RETURN) = OFS_NULL;
if (!(model = getmodel(prog, PRVM_G_EDICT(OFS_PARM0))) || !(surface = getsurface(model, (int)PRVM_G_FLOAT(OFS_PARM1))))
return;
- PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, surface->texture->name);
+ PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(prog, surface->texture->name, strlen(surface->texture->name));
}
//PF_getsurfacenearpoint, // #438 float(entity e, vector p) getsurfacenearpoint = #438;
void VM_getsurfacenearpoint(prvm_prog_t *prog)
projects / xonotic / darkplaces.git / blobdiff