r954 - in tags/1.34-rc2/code: botlib client unix
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Thu Oct 26 11:09:43 EDT 2006
Author: ludwig
Date: 2006-10-26 11:09:42 -0400 (Thu, 26 Oct 2006)
New Revision: 954
Modified:
tags/1.34-rc2/code/botlib/l_precomp.c
tags/1.34-rc2/code/client/cl_main.c
tags/1.34-rc2/code/client/qal.c
tags/1.34-rc2/code/unix/unix_main.c
Log:
commiting changes into tags is stupid ...
Modified: tags/1.34-rc2/code/botlib/l_precomp.c
===================================================================
--- tags/1.34-rc2/code/botlib/l_precomp.c 2006-10-26 15:02:33 UTC (rev 953)
+++ tags/1.34-rc2/code/botlib/l_precomp.c 2006-10-26 15:09:42 UTC (rev 954)
@@ -469,9 +469,9 @@
strcat(token->string, "\"");
for (t = tokens; t; t = t->next)
{
- strncat(token->string, t->string, MAX_TOKEN - strlen(token->string) - 1);
+ strncat(token->string, t->string, MAX_TOKEN - strlen(token->string));
} //end for
- strncat(token->string, "\"", MAX_TOKEN - strlen(token->string) - 1);
+ strncat(token->string, "\"", MAX_TOKEN - strlen(token->string));
return qtrue;
} //end of the function PC_StringizeTokens
//============================================================================
@@ -1015,7 +1015,7 @@
break;
} //end if
if (token.type == TT_PUNCTUATION && *token.string == '>') break;
- strncat(path, token.string, MAX_PATH - 1);
+ strncat(path, token.string, MAX_PATH);
} //end while
if (*token.string != '>')
{
Modified: tags/1.34-rc2/code/client/cl_main.c
===================================================================
--- tags/1.34-rc2/code/client/cl_main.c 2006-10-26 15:02:33 UTC (rev 953)
+++ tags/1.34-rc2/code/client/cl_main.c 2006-10-26 15:09:42 UTC (rev 954)
@@ -2784,7 +2784,7 @@
Q_strncpyz( info, MSG_ReadString( msg ), MAX_INFO_STRING );
if (strlen(info)) {
if (info[strlen(info)-1] != '\n') {
- strncat(info, "\n", sizeof(info) - 1);
+ strncat(info, "\n", sizeof(info));
}
Com_Printf( "%s: %s", NET_AdrToString( from ), info );
}
Modified: tags/1.34-rc2/code/client/qal.c
===================================================================
--- tags/1.34-rc2/code/client/qal.c 2006-10-26 15:02:33 UTC (rev 953)
+++ tags/1.34-rc2/code/client/qal.c 2006-10-26 15:09:42 UTC (rev 954)
@@ -176,8 +176,8 @@
#else
char fn[1024];
getcwd(fn, sizeof(fn));
- strncat(fn, "/", sizeof(fn) - strlen(fn) - 1);
- strncat(fn, libname, sizeof(fn) - strlen(fn) - 1);
+ strncat(fn, "/", sizeof(fn));
+ strncat(fn, libname, sizeof(fn));
if( (OpenALLib = OBJLOAD(fn)) == 0 )
{
Modified: tags/1.34-rc2/code/unix/unix_main.c
===================================================================
--- tags/1.34-rc2/code/unix/unix_main.c 2006-10-26 15:02:33 UTC (rev 953)
+++ tags/1.34-rc2/code/unix/unix_main.c 2006-10-26 15:09:42 UTC (rev 954)
@@ -1236,7 +1236,7 @@
if( msg[ i ] == '\n' )
{
Com_sprintf( tempBuffer, 7, "%c[0m\n", 0x1B );
- strncat( buffer, tempBuffer, bufferSize - 1);
+ strncat( buffer, tempBuffer, bufferSize );
i++;
}
else if( msg[ i ] == Q_COLOR_ESCAPE )
@@ -1258,7 +1258,7 @@
if( escapeCode )
{
Com_sprintf( tempBuffer, 7, "%c[%sm", 0x1B, escapeCode );
- strncat( buffer, tempBuffer, bufferSize - 1);
+ strncat( buffer, tempBuffer, bufferSize );
}
i++;
@@ -1267,7 +1267,7 @@
else
{
Com_sprintf( tempBuffer, 7, "%c", msg[ i++ ] );
- strncat( buffer, tempBuffer, bufferSize - 1);
+ strncat( buffer, tempBuffer, bufferSize );
}
}
}
More information about the quake3-commits
mailing list