From 5b04efa344d68ac6140258777f019286d2dbf9e6 Mon Sep 17 00:00:00 2001 From: Spoike Date: Mon, 23 Jul 2007 10:59:48 +0000 Subject: [PATCH] Fixed some toolchain warnings. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2532 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/common/common.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/engine/common/common.c b/engine/common/common.c index 9087d537e..fd339ef45 100644 --- a/engine/common/common.c +++ b/engine/common/common.c @@ -1386,7 +1386,7 @@ void *SZ_GetSpace (sizebuf_t *buf, int length) if (length > buf->maxsize) Sys_Error ("SZ_GetSpace: %i is > full buffer size", length); - Sys_Printf ("SZ_GetSpace: overflow\n"); // because Con_Printf may be redirected + Sys_Printf ("SZ_GetSpace: overflow (%i+%i bytes of %i)\n", buf->cursize, length, buf->maxsize); // because Con_Printf may be redirected SZ_Clear (buf); buf->overflowed = true; } @@ -1550,11 +1550,11 @@ void COM_FileBase (char *in, char *out, int outlen) s = in + strlen(in) - 1; - while (s != in && *s != '.') + while (s > in && *s != '.') s--; for (s2 = s ; *s2 && *s2 != '/' ; s2--) - ; + ; if (in > s2) s2 = in; @@ -2852,7 +2852,11 @@ void Info_RemoveKey (char *s, const char *key) if (!strcmp (key, pkey) ) { - strcpy (start, s); // remove this part + //strip out the value by copying the next string over the top of this one + //(we were using strcpy, but valgrind moaned) + while(*s) + *start++ = *s++; + *start = 0; return; }