quick/Quake-III-Arena-VS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed compilation warnings (mostly size_t->int, signed/unsigned conversions).

Browse Source
This commit is contained in:
Artem Kharytoniuk
2014-07-08 23:32:09 +03:00
parent 0f690ecf79
commit 3cc9bcd542
70 changed files with 316 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
code/botlib/l_precomp.c
View File

@@ -469,9 +469,9 @@ int PC_StringizeTokens(token_t *tokens, token_t *token)
strcat(token->string, "\"");
for (t = tokens; t; t = t->next)
{
strncat(token->string, t->string, MAX_TOKEN - strlen(token->string));
strncat(token->string, t->string, MAX_TOKEN - (int)strlen(token->string));
} //end for
strncat(token->string, "\"", MAX_TOKEN - strlen(token->string));
strncat(token->string, "\"", MAX_TOKEN - (int)strlen(token->string));
return qtrue;
} //end of the function PC_StringizeTokens
//============================================================================
@@ -680,7 +680,7 @@ void PC_AddBuiltinDefines(source_t *source)
for (i = 0; builtin[i].string; i++)
{
define = (define_t *) GetMemory(sizeof(define_t) + strlen(builtin[i].string) + 1);
define = (define_t *) GetMemory(sizeof(define_t) + (int)strlen(builtin[i].string) + 1);
Com_Memset(define, 0, sizeof(define_t));
define->name = (char *) define + sizeof(define_t);
strcpy(define->name, builtin[i].string);
@@ -705,7 +705,7 @@ int PC_ExpandBuiltinDefine(source_t *source, token_t *deftoken, define_t *define
token_t **firsttoken, token_t **lasttoken)
{
token_t *token;
unsigned long t; // time_t t; //to prevent LCC warning
time_t t;
char *curtime;
token = PC_CopyToken(deftoken);
@@ -728,7 +728,7 @@ int PC_ExpandBuiltinDefine(source_t *source, token_t *deftoken, define_t *define
{
strcpy(token->string, source->scriptstack->filename);
token->type = TT_NAME;
token->subtype = strlen(token->string);
token->subtype = (int)strlen(token->string);
*firsttoken = token;
*lasttoken = token;
break;
@@ -743,7 +743,7 @@ int PC_ExpandBuiltinDefine(source_t *source, token_t *deftoken, define_t *define
strcat(token->string, "\"");
free(curtime);
token->type = TT_NAME;
token->subtype = strlen(token->string);
token->subtype = (int)strlen(token->string);
*firsttoken = token;
*lasttoken = token;
break;
@@ -757,7 +757,7 @@ int PC_ExpandBuiltinDefine(source_t *source, token_t *deftoken, define_t *define
strcat(token->string, "\"");
free(curtime);
token->type = TT_NAME;
token->subtype = strlen(token->string);
token->subtype = (int)strlen(token->string);
*firsttoken = token;
*lasttoken = token;
break;
@@ -1215,7 +1215,7 @@ int PC_Directive_define(source_t *source)
#endif //DEFINEHASHING
} //end if
//allocate define
define = (define_t *) GetMemory(sizeof(define_t) + strlen(token.string) + 1);
define = (define_t *) GetMemory(sizeof(define_t) + (int)strlen(token.string) + 1);
Com_Memset(define, 0, sizeof(define_t));
define->name = (char *) define + sizeof(define_t);
strcpy(define->name, token.string);
@@ -1325,7 +1325,7 @@ define_t *PC_DefineFromString(char *string)
PC_InitTokenHeap();
script = LoadScriptMemory(string, strlen(string), "*extern");
script = LoadScriptMemory(string, (int)strlen(string), "*extern");
//create a new source
Com_Memset(&src, 0, sizeof(source_t));
strncpy(src.filename, "*extern", MAX_PATH);
@@ -1451,7 +1451,7 @@ define_t *PC_CopyDefine(source_t *source, define_t *define)
define_t *newdefine;
token_t *token, *newtoken, *lasttoken;
newdefine = (define_t *) GetMemory(sizeof(define_t) + strlen(define->name) + 1);
newdefine = (define_t *) GetMemory(sizeof(define_t) + (int)strlen(define->name) + 1);
//copy the define name
newdefine->name = (char *) newdefine + sizeof(define_t);
strcpy(newdefine->name, define->name);
@@ -2740,7 +2740,7 @@ int PC_ReadToken(source_t *source, token_t *token)
if (newtoken.type == TT_STRING)
{
token->string[strlen(token->string)-1] = '\0';
if (strlen(token->string) + strlen(newtoken.string+1) + 1 >= MAX_TOKEN)
if (strlen(token->string) + (int)strlen(newtoken.string+1) + 1 >= MAX_TOKEN)
{
SourceError(source, "string longer than MAX_TOKEN %d\n", MAX_TOKEN);
return qfalse;