fte/fteqw
2
0
Fork 1
Code Issues Pull requests Releases 1 Activity Actions

Fix some warnings. Hopefully fix bullet plugin.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5287 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2018-08-04 19:00:19 +00:00
parent aede46c776
commit 98b71860ed
33 changed files with 439 additions and 264 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engine/server/sv_ccmds.c
View file

@ -462,7 +462,7 @@ void SV_Map_f (void)
{
char level[MAX_QPATH];
char spot[MAX_QPATH];
char expanded[MAX_QPATH];
char expanded[MAX_QPATH+64];
char *nextserver;
qboolean preserveplayers= false;
qboolean isrestart = false; //don't hurt settings

10
engine/server/sv_sql.c
View file

@ -323,7 +323,7 @@ int sql_serverworker(void *sref)
if (qres)
{
if (qerror)
Q_strncpy(qres->error, qerror, qesize);
Q_strncpyz(qres->error, qerror, qesize);
qres->result = res;
qres->rows = rows;
qres->columns = columns;
@ -491,7 +491,7 @@ int sql_serverworker(void *sref)
if (qres)
{ // hopefully the qmysql_close gained us some memory otherwise we're pretty screwed
qres->rows = qres->columns = -1;
Q_strncpy(qres->error, error, esize);
Q_strncpyz(qres->error, error, esize);
SQL_PushResult(server, qres);
}
@ -872,14 +872,14 @@ int SQL_NewServer(const char *driver, const char **paramstr)
for (i = 0; i < SQL_CONNECT_STRUCTPARAMS; i++)
{
server->connectparams[i] = ((char *)(server + 1)) + tsize;
Q_strncpy(server->connectparams[i], paramstr[i], paramsize[i]);
Q_strncpyz(server->connectparams[i], paramstr[i], paramsize[i]);
// string should be null-terminated due to Z_Malloc
tsize += paramsize[i] + 1;
}
for (i = SQL_CONNECT_STRUCTPARAMS; i < SQL_CONNECT_PARAMS; i++)
{
server->connectparams[i] = (char *)Z_Malloc(sizeof(char) * (paramsize[i] + 1));
Q_strncpy(server->connectparams[i], paramstr[i], paramsize[i]);
Q_strncpyz(server->connectparams[i], paramstr[i], paramsize[i]);
// string should be null-terminated due to Z_Malloc
}
@ -936,7 +936,7 @@ int SQL_NewQuery(sqlserver_t *server, qboolean (*callback)(queryrequest_t *req,
}
qreq->callback = callback;
Q_strncpy(qreq->query, str, qsize);
Q_strncpyz(qreq->query, str, qsize);
qreq->nextreq = server->requests;
server->requests = qreq;

4
engine/server/sv_user.c
View file

@ -1231,9 +1231,9 @@ void SV_SendClientPrespawnInfo(client_t *client)
{
//grab the model name... without a progs/ prefix if it has one
if (!strncmp(sv.strings.vw_model_precache[i], "progs/", 6))
Q_strncpy(mname, sv.strings.vw_model_precache[i]+6, sizeof(mname));
Q_strncpyz(mname, sv.strings.vw_model_precache[i]+6, sizeof(mname));
else
Q_strncpy(mname, sv.strings.vw_model_precache[i], sizeof(mname));
Q_strncpyz(mname, sv.strings.vw_model_precache[i], sizeof(mname));
//strip .mdl extensions, for compat with ezquake
COM_FileExtension(mname, ext, sizeof(ext));