From 3cc9bcd54254333f88ed88ddedcba3fe74fa8a19 Mon Sep 17 00:00:00 2001 From: Artem Kharytoniuk Date: Tue, 8 Jul 2014 23:32:09 +0300 Subject: [PATCH] Fixed compilation warnings (mostly size_t->int, signed/unsigned conversions). --- code/botlib/be_aas_bspq3.c | 6 +- code/botlib/be_aas_main.c | 2 +- code/botlib/be_ai_char.c | 8 +- code/botlib/be_ai_chat.c | 156 +++++++++++++++---------------- code/botlib/be_ai_weight.c | 2 +- code/botlib/l_libvar.c | 6 +- code/botlib/l_precomp.c | 22 ++--- code/botlib/l_script.c | 6 +- code/botlib/l_struct.c | 2 +- code/cgame/cg_draw.c | 8 +- code/cgame/cg_main.c | 2 +- code/cgame/cg_scoreboard.c | 6 +- code/client/cl_cgame.c | 6 +- code/client/cl_cin.c | 4 +- code/client/cl_console.c | 4 +- code/client/cl_keys.c | 10 +- code/client/cl_main.c | 28 +++--- code/client/cl_parse.c | 2 +- code/client/cl_scrn.c | 2 +- code/client/snd_dma.c | 2 +- code/game/ai_dmq3.c | 10 +- code/game/ai_main.c | 6 +- code/game/bg_lib.c | 2 +- code/game/bg_lib.h | 2 +- code/game/g_arenas.c | 4 +- code/game/g_bot.c | 6 +- code/game/g_cmds.c | 6 +- code/game/g_main.c | 2 +- code/game/g_spawn.c | 4 +- code/game/g_team.c | 2 +- code/game/q_shared.c | 18 ++-- code/jpeg-6/jmemmgr.c | 8 +- code/jpeg-6/jmemnobs.c | 4 +- code/q3_ui/ui_atoms.c | 4 +- code/q3_ui/ui_cdkey.c | 2 +- code/q3_ui/ui_connect.c | 4 +- code/q3_ui/ui_demo2.c | 2 +- code/q3_ui/ui_gameinfo.c | 6 +- code/q3_ui/ui_menu.c | 4 +- code/q3_ui/ui_mfield.c | 14 +-- code/q3_ui/ui_mods.c | 10 +- code/q3_ui/ui_playermodel.c | 12 +-- code/q3_ui/ui_preferences.c | 2 +- code/q3_ui/ui_qmenu.c | 10 +- code/q3_ui/ui_sppostgame.c | 2 +- code/q3_ui/ui_startserver.c | 2 +- code/q3_ui/ui_video.c | 2 +- code/qcommon/cmd.c | 6 +- code/qcommon/common.c | 46 ++++----- code/qcommon/cvar.c | 6 +- code/qcommon/files.c | 40 ++++---- code/qcommon/msg.c | 4 +- code/qcommon/net_chan.c | 2 +- code/qcommon/vm.c | 4 +- code/qcommon/vm_x86.c | 2 + code/renderer/tr_backend.c | 2 +- code/renderer/tr_bsp.c | 4 +- code/renderer/tr_image.c | 14 +-- code/renderer/tr_model.c | 4 +- code/renderer/tr_shade.c | 4 +- code/renderer/tr_shade_calc.c | 6 +- code/renderer/tr_shader.c | 6 +- code/server/sv_ccmds.c | 4 +- code/server/sv_client.c | 2 +- code/server/sv_init.c | 2 +- code/server/sv_main.c | 4 +- code/win32/vs/props/shared.props | 3 + code/win32/win_main.c | 10 +- code/win32/win_net.c | 8 +- code/win32/win_syscon.c | 10 +- 70 files changed, 316 insertions(+), 311 deletions(-) diff --git a/code/botlib/be_aas_bspq3.c b/code/botlib/be_aas_bspq3.c index 97c286d..0fbb734 100644 --- a/code/botlib/be_aas_bspq3.c +++ b/code/botlib/be_aas_bspq3.c @@ -419,7 +419,7 @@ void AAS_ParseBSPEntities(void) return; } //end if StripDoubleQuotes(token.string); - epair->key = (char *) GetHunkMemory(strlen(token.string) + 1); + epair->key = (char *) GetHunkMemory((int)strlen(token.string) + 1); strcpy(epair->key, token.string); if (!PS_ExpectTokenType(script, TT_STRING, 0, &token)) { @@ -428,7 +428,7 @@ void AAS_ParseBSPEntities(void) return; } //end if StripDoubleQuotes(token.string); - epair->value = (char *) GetHunkMemory(strlen(token.string) + 1); + epair->value = (char *) GetHunkMemory((int)strlen(token.string) + 1); strcpy(epair->value, token.string); } //end while if (strcmp(token.string, "}")) @@ -478,7 +478,7 @@ void AAS_DumpBSPData(void) int AAS_LoadBSPFile(void) { AAS_DumpBSPData(); - bspworld.entdatasize = strlen(botimport.BSPEntityData()) + 1; + bspworld.entdatasize = (int)strlen(botimport.BSPEntityData()) + 1; bspworld.dentdata = (char *) GetClearedHunkMemory(bspworld.entdatasize); Com_Memcpy(bspworld.dentdata, botimport.BSPEntityData(), bspworld.entdatasize); AAS_ParseBSPEntities(); diff --git a/code/botlib/be_aas_main.c b/code/botlib/be_aas_main.c index dac1ce3..d76a761 100644 --- a/code/botlib/be_aas_main.c +++ b/code/botlib/be_aas_main.c @@ -148,7 +148,7 @@ void AAS_UpdateStringIndexes(int numconfigstrings, char *configstrings[]) if (configstrings[i]) { //if (aasworld.configstrings[i]) FreeMemory(aasworld.configstrings[i]); - aasworld.configstrings[i] = (char *) GetMemory(strlen(configstrings[i]) + 1); + aasworld.configstrings[i] = (char *) GetMemory((int)strlen(configstrings[i]) + 1); strcpy(aasworld.configstrings[i], configstrings[i]); } //end if } //end for diff --git a/code/botlib/be_ai_char.c b/code/botlib/be_ai_char.c index ea34030..ddbbeba 100644 --- a/code/botlib/be_ai_char.c +++ b/code/botlib/be_ai_char.c @@ -198,7 +198,7 @@ void BotDefaultCharacteristics(bot_character_t *ch, bot_character_t *defaultch) else if (defaultch->c[i].type == CT_STRING) { ch->c[i].type = CT_STRING; - ch->c[i].value.string = (char *) GetMemory(strlen(defaultch->c[i].value.string)+1); + ch->c[i].value.string = (char *) GetMemory((int)strlen(defaultch->c[i].value.string)+1); strcpy(ch->c[i].value.string, defaultch->c[i].value.string); } //end else if } //end for @@ -247,7 +247,7 @@ bot_character_t *BotLoadCharacterFromFile(char *charfile, int skill) return NULL; } //end if //if it's the correct skill - if (skill < 0 || token.intvalue == skill) + if (skill < 0 || (int)token.intvalue == skill) { foundcharacter = qtrue; ch->skill = token.intvalue; @@ -302,7 +302,7 @@ bot_character_t *BotLoadCharacterFromFile(char *charfile, int skill) else if (token.type == TT_STRING) { StripDoubleQuotes(token.string); - ch->c[index].value.string = GetMemory(strlen(token.string)+1); + ch->c[index].value.string = GetMemory((int)strlen(token.string)+1); strcpy(ch->c[index].value.string, token.string); ch->c[index].type = CT_STRING; } //end else if @@ -553,7 +553,7 @@ int BotInterpolateCharacters(int handle1, int handle2, float desiredskill) else if (ch1->c[i].type == CT_STRING) { out->c[i].type = CT_STRING; - out->c[i].value.string = (char *) GetMemory(strlen(ch1->c[i].value.string)+1); + out->c[i].value.string = (char *) GetMemory((int)strlen(ch1->c[i].value.string)+1); strcpy(out->c[i].value.string, ch1->c[i].value.string); } //end else if } //end for diff --git a/code/botlib/be_ai_chat.c b/code/botlib/be_ai_chat.c index 7c719dd..2844f11 100644 --- a/code/botlib/be_ai_chat.c +++ b/code/botlib/be_ai_chat.c @@ -427,7 +427,7 @@ void BotRemoveTildes(char *message) { if (message[i] == '~') { - memmove(&message[i], &message[i+1], strlen(&message[i+1])+1); + memmove(&message[i], &message[i+1], (int)strlen(&message[i+1])+1); } //end if } //end for } //end of the function BotRemoveTildes @@ -450,7 +450,7 @@ void UnifyWhiteSpaces(char *string) //write only one space if (oldptr > string && *ptr) *oldptr++ = ' '; //remove all other white spaces - if (ptr > oldptr) memmove(oldptr, ptr, strlen(ptr)+1); + if (ptr > oldptr) memmove(oldptr, ptr, (int)strlen(ptr)+1); } //end if while(*ptr && !IsWhiteSpace(*ptr)) ptr++; } //end while @@ -467,7 +467,7 @@ int StringContains(char *str1, char *str2, int casesensitive) if (str1 == NULL || str2 == NULL) return -1; - len = strlen(str1) - strlen(str2); + len = (int)strlen(str1) - (int)strlen(str2); index = 0; for (i = 0; i <= len; i++, str1++, index++) { @@ -496,7 +496,7 @@ char *StringContainsWord(char *str1, char *str2, int casesensitive) { int len, i, j; - len = strlen(str1) - strlen(str2); + len = (int)strlen(str1) - (int)strlen(str2); for (i = 0; i <= len; i++, str1++) { //if not at the start of the string @@ -548,17 +548,17 @@ void StringReplaceWords(char *string, char *synonym, char *replacement) str2 = StringContainsWord(string, replacement, qfalse); while(str2) { - if (str2 <= str && str < str2 + strlen(replacement)) break; + if (str2 <= str && str < str2 + (int)strlen(replacement)) break; str2 = StringContainsWord(str2+1, replacement, qfalse); } //end while if (!str2) { - memmove(str + strlen(replacement), str+strlen(synonym), strlen(str+strlen(synonym))+1); + memmove(str + (int)strlen(replacement), str+(int)strlen(synonym), (int)strlen(str+(int)strlen(synonym))+1); //append the synonum replacement - Com_Memcpy(str, replacement, strlen(replacement)); + Com_Memcpy(str, replacement, (int)strlen(replacement)); } //end if //find the next synonym in the string - str = StringContainsWord(str+strlen(replacement), synonym, qfalse); + str = StringContainsWord(str+(int)strlen(replacement), synonym, qfalse); } //end if } //end of the function StringReplaceWords //=========================================================================== @@ -682,19 +682,19 @@ bot_synonymlist_t *BotLoadSynonyms(char *filename) return NULL; } //end if StripDoubleQuotes(token.string); - if (strlen(token.string) <= 0) + if ((int)strlen(token.string) <= 0) { SourceError(source, "empty string", token.string); FreeSource(source); return NULL; } //end if - size += sizeof(bot_synonym_t) + strlen(token.string) + 1; + size += sizeof(bot_synonym_t) + (int)strlen(token.string) + 1; if (pass) { synonym = (bot_synonym_t *) ptr; ptr += sizeof(bot_synonym_t); synonym->string = ptr; - ptr += strlen(token.string) + 1; + ptr += (int)strlen(token.string) + 1; strcpy(synonym->string, token.string); // if (lastsynonym) lastsynonym->next = synonym; @@ -838,10 +838,10 @@ void BotReplaceReplySynonyms(char *string, unsigned long int context) str2 = StringContainsWord(str1, replacement, qfalse); if (str2 && str2 == str1) continue; // - memmove(str1 + strlen(replacement), str1+strlen(synonym->string), - strlen(str1+strlen(synonym->string)) + 1); + memmove(str1 + (int)strlen(replacement), str1+(int)strlen(synonym->string), + (int)strlen(str1+(int)strlen(synonym->string)) + 1); //append the synonum replacement - Com_Memcpy(str1, replacement, strlen(replacement)); + Com_Memcpy(str1, replacement, (int)strlen(replacement)); // break; } //end for @@ -874,7 +874,7 @@ int BotLoadChatMessage(source_t *source, char *chatmessagestring) if (token.type == TT_STRING) { StripDoubleQuotes(token.string); - if (strlen(ptr) + strlen(token.string) + 1 > MAX_MESSAGE_SIZE) + if ((int)strlen(ptr) + (int)strlen(token.string) + 1 > MAX_MESSAGE_SIZE) { SourceError(source, "chat message too long\n"); return qfalse; @@ -884,22 +884,22 @@ int BotLoadChatMessage(source_t *source, char *chatmessagestring) //variable string else if (token.type == TT_NUMBER && (token.subtype & TT_INTEGER)) { - if (strlen(ptr) + 7 > MAX_MESSAGE_SIZE) + if ((int)strlen(ptr) + 7 > MAX_MESSAGE_SIZE) { SourceError(source, "chat message too long\n"); return qfalse; } //end if - sprintf(&ptr[strlen(ptr)], "%cv%ld%c", ESCAPE_CHAR, token.intvalue, ESCAPE_CHAR); + sprintf(&ptr[(int)strlen(ptr)], "%cv%ld%c", ESCAPE_CHAR, token.intvalue, ESCAPE_CHAR); } //end if //random string else if (token.type == TT_NAME) { - if (strlen(ptr) + 7 > MAX_MESSAGE_SIZE) + if ((int)strlen(ptr) + 7 > MAX_MESSAGE_SIZE) { SourceError(source, "chat message too long\n"); return qfalse; } //end if - sprintf(&ptr[strlen(ptr)], "%cr%s%c", ESCAPE_CHAR, token.string, ESCAPE_CHAR); + sprintf(&ptr[(int)strlen(ptr)], "%cr%s%c", ESCAPE_CHAR, token.string, ESCAPE_CHAR); } //end else if else { @@ -984,13 +984,13 @@ bot_randomlist_t *BotLoadRandomStrings(char *filename) FreeSource(source); return NULL; } //end if - size += sizeof(bot_randomlist_t) + strlen(token.string) + 1; + size += sizeof(bot_randomlist_t) + (int)strlen(token.string) + 1; if (pass) { random = (bot_randomlist_t *) ptr; ptr += sizeof(bot_randomlist_t); random->string = ptr; - ptr += strlen(token.string) + 1; + ptr += (int)strlen(token.string) + 1; strcpy(random->string, token.string); random->firstrandomstring = NULL; random->numstrings = 0; @@ -1012,13 +1012,13 @@ bot_randomlist_t *BotLoadRandomStrings(char *filename) FreeSource(source); return NULL; } //end if - size += sizeof(bot_randomstring_t) + strlen(chatmessagestring) + 1; + size += sizeof(bot_randomstring_t) + (int)strlen(chatmessagestring) + 1; if (pass) { randomstring = (bot_randomstring_t *) ptr; ptr += sizeof(bot_randomstring_t); randomstring->string = ptr; - ptr += strlen(chatmessagestring) + 1; + ptr += (int)strlen(chatmessagestring) + 1; strcpy(randomstring->string, chatmessagestring); // random->numstrings++; @@ -1203,10 +1203,10 @@ bot_matchpiece_t *BotLoadMatchPieces(source_t *source, char *endtoken) } //end if } //end if StripDoubleQuotes(token.string); - matchstring = (bot_matchstring_t *) GetClearedHunkMemory(sizeof(bot_matchstring_t) + strlen(token.string) + 1); + matchstring = (bot_matchstring_t *) GetClearedHunkMemory(sizeof(bot_matchstring_t) + (int)strlen(token.string) + 1); matchstring->string = (char *) matchstring + sizeof(bot_matchstring_t); strcpy(matchstring->string, token.string); - if (!strlen(token.string)) emptystring = qtrue; + if (!(int)strlen(token.string)) emptystring = qtrue; matchstring->next = NULL; if (lastmatchstring) lastmatchstring->next = matchstring; else matchpiece->firststring = matchstring; @@ -1375,7 +1375,7 @@ int StringsMatch(bot_matchpiece_t *pieces, bot_match_t *match) newstrptr = NULL; for (ms = mp->firststring; ms; ms = ms->next) { - if (!strlen(ms->string)) + if (!(int)strlen(ms->string)) { newstrptr = strptr; break; @@ -1401,7 +1401,7 @@ int StringsMatch(bot_matchpiece_t *pieces, bot_match_t *match) } //end if } //end for if (!newstrptr) return qfalse; - strptr = newstrptr + strlen(ms->string); + strptr = newstrptr + (int)strlen(ms->string); } //end if //if it is a variable piece of string else if (mp->type == MT_VARIABLE) @@ -1412,14 +1412,14 @@ int StringsMatch(bot_matchpiece_t *pieces, bot_match_t *match) } //end else if } //end for //if a match was found - if (!mp && (lastvariable >= 0 || !strlen(strptr))) + if (!mp && (lastvariable >= 0 || !(int)strlen(strptr))) { //if the last piece was a variable string if (lastvariable >= 0) { assert( match->variables[lastvariable].offset >= 0 ); // bk001204 match->variables[lastvariable].length = - strlen(&match->string[ (int) match->variables[lastvariable].offset]); + (int)strlen(&match->string[ (int) match->variables[lastvariable].offset]); } //end if return qtrue; } //end if @@ -1438,10 +1438,10 @@ int BotFindMatch(char *str, bot_match_t *match, unsigned long int context) strncpy(match->string, str, MAX_MESSAGE_SIZE); //remove any trailing enters - while(strlen(match->string) && - match->string[strlen(match->string)-1] == '\n') + while((int)strlen(match->string) && + match->string[(int)strlen(match->string)-1] == '\n') { - match->string[strlen(match->string)-1] = '\0'; + match->string[(int)strlen(match->string)-1] = '\0'; } //end while //compare the string with all the match strings for (ms = matchtemplates; ms; ms = ms->next) @@ -1552,7 +1552,7 @@ bot_stringlist_t *BotCheckChatMessageIntegrety(char *message, bot_stringlist_t * if (!BotFindStringInList(stringlist, temp)) { Log_Write("%s = {\"%s\"} //MISSING RANDOM\r\n", temp, temp); - s = GetClearedMemory(sizeof(bot_stringlist_t) + strlen(temp) + 1); + s = GetClearedMemory(sizeof(bot_stringlist_t) + (int)strlen(temp) + 1); s->string = (char *) s + sizeof(bot_stringlist_t); strcpy(s->string, temp); s->next = stringlist; @@ -1900,7 +1900,7 @@ bot_replychat_t *BotLoadReplyChat(char *filename) return NULL; } //end if StripDoubleQuotes(token.string); - if (strlen(namebuffer)) strcat(namebuffer, "\\"); + if ((int)strlen(namebuffer)) strcat(namebuffer, "\\"); strcat(namebuffer, token.string); } while(PC_CheckTokenString(source, ",")); if (!PC_ExpectTokenString(source, ">")) @@ -1909,7 +1909,7 @@ bot_replychat_t *BotLoadReplyChat(char *filename) FreeSource(source); return NULL; } //end if - key->string = (char *) GetClearedHunkMemory(strlen(namebuffer) + 1); + key->string = (char *) GetClearedHunkMemory((int)strlen(namebuffer) + 1); strcpy(key->string, namebuffer); } //end else if else //normal string key @@ -1922,7 +1922,7 @@ bot_replychat_t *BotLoadReplyChat(char *filename) return NULL; } //end if StripDoubleQuotes(token.string); - key->string = (char *) GetClearedHunkMemory(strlen(token.string) + 1); + key->string = (char *) GetClearedHunkMemory((int)strlen(token.string) + 1); strcpy(key->string, token.string); } //end else // @@ -1956,7 +1956,7 @@ bot_replychat_t *BotLoadReplyChat(char *filename) FreeSource(source); return NULL; } //end if - chatmessage = (bot_chatmessage_t *) GetClearedHunkMemory(sizeof(bot_chatmessage_t) + strlen(chatmessagestring) + 1); + chatmessage = (bot_chatmessage_t *) GetClearedHunkMemory(sizeof(bot_chatmessage_t) + (int)strlen(chatmessagestring) + 1); chatmessage->chatmessage = (char *) chatmessage + sizeof(bot_chatmessage_t); strcpy(chatmessage->chatmessage, chatmessagestring); chatmessage->time = -2*CHATMESSAGE_RECENTTIME; @@ -2123,11 +2123,11 @@ bot_chat_t *BotLoadInitialChat(char *chatfile, char *chatname) ptr += sizeof(bot_chatmessage_t); chatmessage->chatmessage = ptr; strcpy(chatmessage->chatmessage, chatmessagestring); - ptr += strlen(chatmessagestring) + 1; + ptr += (int)strlen(chatmessagestring) + 1; //the number of chat messages increased chattype->numchatmessages++; } //end if - size += sizeof(bot_chatmessage_t) + strlen(chatmessagestring) + 1; + size += sizeof(bot_chatmessage_t) + (int)strlen(chatmessagestring) + 1; } //end if } //end while } //end if @@ -2310,13 +2310,13 @@ int BotExpandChatMessage(char *outmessage, char *message, unsigned long mcontext BotReplaceSynonyms(temp, vcontext); } //end else // - if (len + strlen(temp) >= MAX_MESSAGE_SIZE) + if (len + (int)strlen(temp) >= MAX_MESSAGE_SIZE) { botimport.Print(PRT_ERROR, "BotConstructChat: message %s too long\n", message); return qfalse; } //end if strcpy(&outputbuf[len], temp); - len += strlen(temp); + len += (int)strlen(temp); } //end if break; } //end case @@ -2337,13 +2337,13 @@ int BotExpandChatMessage(char *outmessage, char *message, unsigned long mcontext botimport.Print(PRT_ERROR, "BotConstructChat: unknown random string %s\n", temp); return qfalse; } //end if - if (len + strlen(ptr) >= MAX_MESSAGE_SIZE) + if (len + (int)strlen(ptr) >= MAX_MESSAGE_SIZE) { botimport.Print(PRT_ERROR, "BotConstructChat: message \"%s\" too long\n", message); return qfalse; } //end if strcpy(&outputbuf[len], ptr); - len += strlen(ptr); + len += (int)strlen(ptr); expansion = qtrue; break; } //end case @@ -2516,50 +2516,50 @@ void BotInitialChat(int chatstate, char *type, int mcontext, char *var0, char *v if( var0 ) { strcat(match.string, var0); match.variables[0].offset = index; - match.variables[0].length = strlen(var0); - index += strlen(var0); + match.variables[0].length = (int)strlen(var0); + index += (int)strlen(var0); } if( var1 ) { strcat(match.string, var1); match.variables[1].offset = index; - match.variables[1].length = strlen(var1); - index += strlen(var1); + match.variables[1].length = (int)strlen(var1); + index += (int)strlen(var1); } if( var2 ) { strcat(match.string, var2); match.variables[2].offset = index; - match.variables[2].length = strlen(var2); - index += strlen(var2); + match.variables[2].length = (int)strlen(var2); + index += (int)strlen(var2); } if( var3 ) { strcat(match.string, var3); match.variables[3].offset = index; - match.variables[3].length = strlen(var3); - index += strlen(var3); + match.variables[3].length = (int)strlen(var3); + index += (int)strlen(var3); } if( var4 ) { strcat(match.string, var4); match.variables[4].offset = index; - match.variables[4].length = strlen(var4); - index += strlen(var4); + match.variables[4].length = (int)strlen(var4); + index += (int)strlen(var4); } if( var5 ) { strcat(match.string, var5); match.variables[5].offset = index; - match.variables[5].length = strlen(var5); - index += strlen(var5); + match.variables[5].length = (int)strlen(var5); + index += (int)strlen(var5); } if( var6 ) { strcat(match.string, var6); match.variables[6].offset = index; - match.variables[6].length = strlen(var6); - index += strlen(var6); + match.variables[6].length = (int)strlen(var6); + index += (int)strlen(var6); } if( var7 ) { strcat(match.string, var7); match.variables[7].offset = index; - match.variables[7].length = strlen(var7); - index += strlen(var7); + match.variables[7].length = (int)strlen(var7); + index += (int)strlen(var7); } // BotConstructChatMessage(cs, message, mcontext, &match, 0, qfalse); @@ -2695,54 +2695,54 @@ int BotReplyChat(int chatstate, char *message, int mcontext, int vcontext, char } //end for if (bestchatmessage) { - index = strlen(bestmatch.string); + index = (int)strlen(bestmatch.string); if( var0 ) { strcat(bestmatch.string, var0); bestmatch.variables[0].offset = index; - bestmatch.variables[0].length = strlen(var0); - index += strlen(var0); + bestmatch.variables[0].length = (int)strlen(var0); + index += (int)strlen(var0); } if( var1 ) { strcat(bestmatch.string, var1); bestmatch.variables[1].offset = index; - bestmatch.variables[1].length = strlen(var1); - index += strlen(var1); + bestmatch.variables[1].length = (int)strlen(var1); + index += (int)strlen(var1); } if( var2 ) { strcat(bestmatch.string, var2); bestmatch.variables[2].offset = index; - bestmatch.variables[2].length = strlen(var2); - index += strlen(var2); + bestmatch.variables[2].length = (int)strlen(var2); + index += (int)strlen(var2); } if( var3 ) { strcat(bestmatch.string, var3); bestmatch.variables[3].offset = index; - bestmatch.variables[3].length = strlen(var3); - index += strlen(var3); + bestmatch.variables[3].length = (int)strlen(var3); + index += (int)strlen(var3); } if( var4 ) { strcat(bestmatch.string, var4); bestmatch.variables[4].offset = index; - bestmatch.variables[4].length = strlen(var4); - index += strlen(var4); + bestmatch.variables[4].length = (int)strlen(var4); + index += (int)strlen(var4); } if( var5 ) { strcat(bestmatch.string, var5); bestmatch.variables[5].offset = index; - bestmatch.variables[5].length = strlen(var5); - index += strlen(var5); + bestmatch.variables[5].length = (int)strlen(var5); + index += (int)strlen(var5); } if( var6 ) { strcat(bestmatch.string, var6); bestmatch.variables[6].offset = index; - bestmatch.variables[6].length = strlen(var6); - index += strlen(var6); + bestmatch.variables[6].length = (int)strlen(var6); + index += (int)strlen(var6); } if( var7 ) { strcat(bestmatch.string, var7); bestmatch.variables[7].offset = index; - bestmatch.variables[7].length = strlen(var7); - index += strlen(var7); + bestmatch.variables[7].length = (int)strlen(var7); + index += (int)strlen(var7); } if (LibVarGetValue("bot_testrchat")) { @@ -2774,7 +2774,7 @@ int BotChatLength(int chatstate) cs = BotChatStateFromHandle(chatstate); if (!cs) return 0; - return strlen(cs->chatmessage); + return (int)strlen(cs->chatmessage); } //end of the function BotChatLength //=========================================================================== // @@ -2789,7 +2789,7 @@ void BotEnterChat(int chatstate, int clientto, int sendto) cs = BotChatStateFromHandle(chatstate); if (!cs) return; - if (strlen(cs->chatmessage)) + if ((int)strlen(cs->chatmessage)) { BotRemoveTildes(cs->chatmessage); if (LibVarGetValue("bot_testichat")) { diff --git a/code/botlib/be_ai_weight.c b/code/botlib/be_ai_weight.c index 9212519..4b11366 100644 --- a/code/botlib/be_ai_weight.c +++ b/code/botlib/be_ai_weight.c @@ -345,7 +345,7 @@ weightconfig_t *ReadWeightConfig(char *filename) return NULL; } //end if StripDoubleQuotes(token.string); - config->weights[config->numweights].name = (char *) GetClearedMemory(strlen(token.string) + 1); + config->weights[config->numweights].name = (char *) GetClearedMemory((int)strlen(token.string) + 1); strcpy(config->weights[config->numweights].name, token.string); if (!PC_ExpectAnyToken(source, &token)) { diff --git a/code/botlib/l_libvar.c b/code/botlib/l_libvar.c index a8629c8..0207660 100644 --- a/code/botlib/l_libvar.c +++ b/code/botlib/l_libvar.c @@ -84,7 +84,7 @@ libvar_t *LibVarAlloc(char *var_name) { libvar_t *v; - v = (libvar_t *) GetMemory(sizeof(libvar_t) + strlen(var_name) + 1); + v = (libvar_t *) GetMemory(sizeof(libvar_t) + (int)strlen(var_name) + 1); Com_Memset(v, 0, sizeof(libvar_t)); v->name = (char *) v + sizeof(libvar_t); strcpy(v->name, var_name); @@ -194,7 +194,7 @@ libvar_t *LibVar(char *var_name, char *value) //create new variable v = LibVarAlloc(var_name); //variable string - v->string = (char *) GetMemory(strlen(value) + 1); + v->string = (char *) GetMemory((int)strlen(value) + 1); strcpy(v->string, value); //the value v->value = LibVarStringValue(v->string); @@ -249,7 +249,7 @@ void LibVarSet(char *var_name, char *value) v = LibVarAlloc(var_name); } //end else //variable string - v->string = (char *) GetMemory(strlen(value) + 1); + v->string = (char *) GetMemory((int)strlen(value) + 1); strcpy(v->string, value); //the value v->value = LibVarStringValue(v->string); diff --git a/code/botlib/l_precomp.c b/code/botlib/l_precomp.c index ae82981..f0d165d 100644 --- a/code/botlib/l_precomp.c +++ b/code/botlib/l_precomp.c @@ -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; diff --git a/code/botlib/l_script.c b/code/botlib/l_script.c index e782e7f..7419864 100644 --- a/code/botlib/l_script.c +++ b/code/botlib/l_script.c @@ -189,7 +189,7 @@ void PS_CreatePunctuationTable(script_t *script, punctuation_t *punctuations) //sort the punctuations in this table entry on length (longer punctuations first) for (p = script->punctuationtable[(unsigned int) newp->p[0]]; p; p = p->next) { - if (strlen(p->p) < strlen(newp->p)) + if (strlen(p->p) < (int)strlen(newp->p)) { newp->next = p; if (lastp) lastp->next = newp; @@ -797,7 +797,7 @@ int PS_ReadPunctuation(script_t *script, token_t *token) punc = &script->punctuations[i]; #endif //PUNCTABLE p = punc->p; - len = strlen(p); + len = (int)strlen(p); //if the script contains at least as much characters as the punctuation if (script->script_p + len <= script->end_p) { @@ -1265,7 +1265,7 @@ int ScriptSkipTo(script_t *script, char *value) char firstchar; firstchar = *value; - len = strlen(value); + len = (int)strlen(value); do { if (!PS_ReadWhiteSpace(script)) return 0; diff --git a/code/botlib/l_struct.c b/code/botlib/l_struct.c index c628821..b206ee0 100644 --- a/code/botlib/l_struct.c +++ b/code/botlib/l_struct.c @@ -347,7 +347,7 @@ int WriteFloat(FILE *fp, float value) int l; sprintf(buf, "%f", value); - l = strlen(buf); + l = (int)strlen(buf); //strip any trailing zeros while(l-- > 1) { diff --git a/code/cgame/cg_draw.c b/code/cgame/cg_draw.c index 5575aaf..37c44c7 100644 --- a/code/cgame/cg_draw.c +++ b/code/cgame/cg_draw.c @@ -61,7 +61,7 @@ int CG_Text_Width(const char *text, float scale, int limit) { useScale = scale * font->glyphScale; out = 0; if (text) { - len = strlen(text); + len = (int)strlen(text); if (limit > 0 && len > limit) { len = limit; } @@ -98,7 +98,7 @@ int CG_Text_Height(const char *text, float scale, int limit) { useScale = scale * font->glyphScale; max = 0; if (text) { - len = strlen(text); + len = (int)strlen(text); if (limit > 0 && len > limit) { len = limit; } @@ -146,7 +146,7 @@ void CG_Text_Paint(float x, float y, float scale, vec4_t color, const char *text const char *s = text; trap_R_SetColor( color ); memcpy(&newColor[0], &color[0], sizeof(vec4_t)); - len = strlen(text); + len = (int)strlen(text); if (limit > 0 && len > limit) { len = limit; } @@ -243,7 +243,7 @@ static void CG_DrawField (int x, int y, int width, int value) { } Com_sprintf (num, sizeof(num), "%i", value); - l = strlen(num); + l = (int)strlen(num); if (l > width) l = width; x += 2 + CHAR_WIDTH*(width - l); diff --git a/code/cgame/cg_main.c b/code/cgame/cg_main.c index 7212996..1c780f9 100644 --- a/code/cgame/cg_main.c +++ b/code/cgame/cg_main.c @@ -1122,7 +1122,7 @@ void CG_BuildSpectatorString() { Q_strcat(cg.spectatorList, sizeof(cg.spectatorList), va("%s ", cgs.clientinfo[i].name)); } } - i = strlen(cg.spectatorList); + i = (int)strlen(cg.spectatorList); if (i != cg.spectatorLen) { cg.spectatorLen = i; cg.spectatorWidth = -1; diff --git a/code/cgame/cg_scoreboard.c b/code/cgame/cg_scoreboard.c index eb9d40b..092cb67 100644 --- a/code/cgame/cg_scoreboard.c +++ b/code/cgame/cg_scoreboard.c @@ -502,13 +502,13 @@ void CG_DrawOldTourneyScoreboard( void ) { // CG_DrawStringExt( 8, y, "Red Team", color, qtrue, qtrue, GIANT_WIDTH, GIANT_HEIGHT, 0 ); s = va("%i", cg.teamScores[0] ); - CG_DrawStringExt( 632 - GIANT_WIDTH * strlen(s), y, s, color, qtrue, qtrue, GIANT_WIDTH, GIANT_HEIGHT, 0 ); + CG_DrawStringExt( 632 - GIANT_WIDTH * (int)strlen(s), y, s, color, qtrue, qtrue, GIANT_WIDTH, GIANT_HEIGHT, 0 ); y += 64; CG_DrawStringExt( 8, y, "Blue Team", color, qtrue, qtrue, GIANT_WIDTH, GIANT_HEIGHT, 0 ); s = va("%i", cg.teamScores[1] ); - CG_DrawStringExt( 632 - GIANT_WIDTH * strlen(s), y, s, color, qtrue, qtrue, GIANT_WIDTH, GIANT_HEIGHT, 0 ); + CG_DrawStringExt( 632 - GIANT_WIDTH * (int)strlen(s), y, s, color, qtrue, qtrue, GIANT_WIDTH, GIANT_HEIGHT, 0 ); } else { // // free for all scoreboard @@ -524,7 +524,7 @@ void CG_DrawOldTourneyScoreboard( void ) { CG_DrawStringExt( 8, y, ci->name, color, qtrue, qtrue, GIANT_WIDTH, GIANT_HEIGHT, 0 ); s = va("%i", ci->score ); - CG_DrawStringExt( 632 - GIANT_WIDTH * strlen(s), y, s, color, qtrue, qtrue, GIANT_WIDTH, GIANT_HEIGHT, 0 ); + CG_DrawStringExt( 632 - GIANT_WIDTH * (int)strlen(s), y, s, color, qtrue, qtrue, GIANT_WIDTH, GIANT_HEIGHT, 0 ); y += 64; } } diff --git a/code/client/cl_cgame.c b/code/client/cl_cgame.c index 56dc01c..29ab443 100644 --- a/code/client/cl_cgame.c +++ b/code/client/cl_cgame.c @@ -234,7 +234,7 @@ void CL_ConfigstringModified( void ) { continue; // leave with the default empty string } - len = strlen( dup ); + len = (int)strlen( dup ); if ( len + 1 + cl.gameState.dataCount > MAX_GAMESTATE_CHARS ) { Com_Error( ERR_DROP, "MAX_GAMESTATE_CHARS exceeded" ); @@ -308,7 +308,7 @@ rescan: if ( !strcmp( cmd, "bcs1" ) ) { s = Cmd_Argv(2); - if( strlen(bigConfigString) + strlen(s) >= BIG_INFO_STRING ) { + if( (int)strlen(bigConfigString) + (int)strlen(s) >= BIG_INFO_STRING ) { Com_Error( ERR_DROP, "bcs exceeded BIG_INFO_STRING" ); } strcat( bigConfigString, s ); @@ -317,7 +317,7 @@ rescan: if ( !strcmp( cmd, "bcs2" ) ) { s = Cmd_Argv(2); - if( strlen(bigConfigString) + strlen(s) + 1 >= BIG_INFO_STRING ) { + if( (int)strlen(bigConfigString) + (int)strlen(s) + 1 >= BIG_INFO_STRING ) { Com_Error( ERR_DROP, "bcs exceeded BIG_INFO_STRING" ); } strcat( bigConfigString, s ); diff --git a/code/client/cl_cin.c b/code/client/cl_cin.c index 50ff532..4485016 100644 --- a/code/client/cl_cin.c +++ b/code/client/cl_cin.c @@ -990,7 +990,7 @@ static void setupQuad( long xOff, long yOff ) long numQuadCels, i,x,y; byte *temp; - if (xOff == cin.oldXOff && yOff == cin.oldYOff && cinTable[currentHandle].ysize == cin.oldysize && cinTable[currentHandle].xsize == cin.oldxsize) { + if (xOff == cin.oldXOff && yOff == cin.oldYOff && (long)cinTable[currentHandle].ysize == cin.oldysize && (long)cinTable[currentHandle].xsize == cin.oldxsize) { return; } @@ -1430,7 +1430,7 @@ e_status CIN_RunCinematic (int handle) && (cinTable[currentHandle].status == FMV_PLAY) ) { RoQInterrupt(); - if (start != cinTable[currentHandle].startTime) { + if (start != (int)cinTable[currentHandle].startTime) { // we need to use CL_ScaledMilliseconds because of the smp mode calls from the renderer cinTable[currentHandle].tfps = ((((CL_ScaledMilliseconds()*com_timescale->value) - cinTable[currentHandle].startTime)*3)/100); diff --git a/code/client/cl_console.c b/code/client/cl_console.c index a428e3f..e6d6e28 100644 --- a/code/client/cl_console.c +++ b/code/client/cl_console.c @@ -216,7 +216,7 @@ void Con_Dump_f (void) break; } strcat( buffer, "\n" ); - FS_Write(buffer, strlen(buffer), f); + FS_Write(buffer, (int)strlen(buffer), f); } FS_FCloseFile( f ); @@ -618,7 +618,7 @@ void Con_DrawSolidConsole( float frac ) { re.SetColor( g_color_table[ColorIndex(COLOR_RED)] ); - i = strlen( Q3_VERSION ); + i = (int)strlen( Q3_VERSION ); for (x=0 ; xwidthInChars; - len = strlen( edit->buffer ) + 1; + len = (int)strlen( edit->buffer ) + 1; // guarantee that cursor will be visible if ( len <= drawLen ) { @@ -304,7 +304,7 @@ void Field_Paste( field_t *edit ) { } // send as if typed, so insert / overstrike works properly - pasteLen = strlen( cbd ); + pasteLen = (int)strlen( cbd ); for ( i = 0 ; i < pasteLen ; i++ ) { Field_CharEvent( edit, cbd[i] ); } @@ -331,7 +331,7 @@ void Field_KeyDownEvent( field_t *edit, int key ) { return; } - len = strlen( edit->buffer ); + len = (int)strlen( edit->buffer ); if ( key == K_DEL ) { if ( edit->cursor < len ) { @@ -400,7 +400,7 @@ void Field_CharEvent( field_t *edit, int ch ) { return; } - len = strlen( edit->buffer ); + len = (int)strlen( edit->buffer ); if ( ch == 'h' - 'a' + 1 ) { // ctrl-h is backspace if ( edit->cursor > 0 ) { @@ -695,7 +695,7 @@ int Key_StringToKeynum( char *str ) { } // check for hex code - if ( str[0] == '0' && str[1] == 'x' && strlen( str ) == 4) { + if ( str[0] == '0' && str[1] == 'x' && (int)strlen( str ) == 4) { int n1, n2; n1 = str[2]; diff --git a/code/client/cl_main.c b/code/client/cl_main.c index 61dbcc7..dce3175 100644 --- a/code/client/cl_main.c +++ b/code/client/cl_main.c @@ -153,7 +153,7 @@ void CL_ChangeReliableCommand( void ) { r = clc.reliableSequence - (random() * 5); index = clc.reliableSequence & ( MAX_RELIABLE_COMMANDS - 1 ); - l = strlen(clc.reliableCommands[ index ]); + l = (int)strlen(clc.reliableCommands[ index ]); if ( l >= MAX_STRING_CHARS - 1 ) { l = MAX_STRING_CHARS - 2; } @@ -513,7 +513,7 @@ void CL_PlayDemo_f( void ) { arg = Cmd_Argv(1); // check for an extension .dm_?? (?? is protocol) - ext_test = arg + strlen(arg) - 6; + ext_test = arg + (int)strlen(arg) - 6; if ((strlen(arg) > 6) && (ext_test[0] == '.') && ((ext_test[1] == 'd') || (ext_test[1] == 'D')) && ((ext_test[2] == 'm') || (ext_test[2] == 'M')) && (ext_test[3] == '_')) { protocol = atoi(ext_test+4); @@ -909,7 +909,7 @@ void CL_RequestAuthorization( void ) { } else { // only grab the alphanumeric values from the cdkey, to avoid any dashes or spaces j = 0; - l = strlen( cl_cdkey ); + l = (int)strlen( cl_cdkey ); if ( l > 32 ) { l = 32; } @@ -1139,7 +1139,7 @@ void CL_Rcon_f( void ) { } } - NET_SendPacket (NS_CLIENT, strlen(message)+1, message, to); + NET_SendPacket (NS_CLIENT, (int)strlen(message)+1, message, to); } /* @@ -1428,14 +1428,14 @@ void CL_NextDownload(void) { if ( (s = strchr(s, '@')) != NULL ) *s++ = 0; else - s = localName + strlen(localName); // point at the nul byte + s = localName + (int)strlen(localName); // point at the nul byte CL_BeginDownload( localName, remoteName ); clc.downloadRestart = qtrue; // move over the rest - memmove( clc.downloadList, s, strlen(s) + 1); + memmove( clc.downloadList, s, (int)strlen(s) + 1); return; } @@ -2767,7 +2767,7 @@ void CL_ServerStatusResponse( netadr_t from, msg_t *msg ) { } } - len = strlen(serverStatus->string); + len = (int)strlen(serverStatus->string); Com_sprintf(&serverStatus->string[len], sizeof(serverStatus->string)-len, "\\"); if (serverStatus->print) { @@ -2776,7 +2776,7 @@ void CL_ServerStatusResponse( netadr_t from, msg_t *msg ) { } for (i = 0, s = MSG_ReadStringLine( msg ); *s; s = MSG_ReadStringLine( msg ), i++) { - len = strlen(serverStatus->string); + len = (int)strlen(serverStatus->string); Com_sprintf(&serverStatus->string[len], sizeof(serverStatus->string)-len, "\\%s", s); if (serverStatus->print) { @@ -2792,7 +2792,7 @@ void CL_ServerStatusResponse( netadr_t from, msg_t *msg ) { Com_Printf("%-2d %-3d %-3d %s\n", i, score, ping, s ); } } - len = strlen(serverStatus->string); + len = (int)strlen(serverStatus->string); Com_sprintf(&serverStatus->string[len], sizeof(serverStatus->string)-len, "\\"); serverStatus->time = Com_Milliseconds(); @@ -2840,10 +2840,10 @@ void CL_LocalServers_f( void ) { to.port = BigShort( (short)(PORT_SERVER + j) ); to.type = NA_BROADCAST; - NET_SendPacket( NS_CLIENT, strlen( message ), message, to ); + NET_SendPacket( NS_CLIENT, (int)strlen( message ), message, to ); to.type = NA_BROADCAST_IPX; - NET_SendPacket( NS_CLIENT, strlen( message ), message, to ); + NET_SendPacket( NS_CLIENT, (int)strlen( message ), message, to ); } } } @@ -2888,7 +2888,7 @@ void CL_GlobalServers_f( void ) { sprintf( command, "getservers %s", Cmd_Argv(2) ); // tack on keywords - buffptr = command + strlen( command ); + buffptr = command + (int)strlen( command ); count = Cmd_Argc(); for (i=3; i MAX_CONFIGSTRINGS" ); } s = MSG_ReadBigString( msg ); - len = strlen( s ); + len = (int)strlen( s ); if ( len + 1 + cl.gameState.dataCount > MAX_GAMESTATE_CHARS ) { Com_Error( ERR_DROP, "MAX_GAMESTATE_CHARS exceeded" ); diff --git a/code/client/cl_scrn.c b/code/client/cl_scrn.c index a8da4ed..4d90c8f 100644 --- a/code/client/cl_scrn.c +++ b/code/client/cl_scrn.c @@ -339,7 +339,7 @@ void SCR_DrawDemoRecording( void ) { pos = FS_FTell( clc.demofile ); sprintf( string, "RECORDING %s: %ik", clc.demoName, pos / 1024 ); - SCR_DrawStringExt( 320 - strlen( string ) * 4, 20, 8, string, g_color_table[7], qtrue ); + SCR_DrawStringExt( 320 - (int)strlen( string ) * 4, 20, 8, string, g_color_table[7], qtrue ); } diff --git a/code/client/snd_dma.c b/code/client/snd_dma.c index aae87ec..85aeae5 100644 --- a/code/client/snd_dma.c +++ b/code/client/snd_dma.c @@ -397,7 +397,7 @@ sfxHandle_t S_RegisterSound( const char *name, qboolean compressed ) { return 0; } - if ( strlen( name ) >= MAX_QPATH ) { + if ( (int)strlen( name ) >= MAX_QPATH ) { Com_Printf( "Sound name exceeds MAX_QPATH\n" ); return 0; } diff --git a/code/game/ai_dmq3.c b/code/game/ai_dmq3.c index c373df8..d77359e 100644 --- a/code/game/ai_dmq3.c +++ b/code/game/ai_dmq3.c @@ -1492,19 +1492,19 @@ char *EasyClientName(int client, char *buf, int size) { for (i = 0; name[i]; i++) name[i] &= 127; //remove all spaces for (ptr = strstr(name, " "); ptr; ptr = strstr(name, " ")) { - memmove(ptr, ptr+1, strlen(ptr+1)+1); + memmove(ptr, ptr+1, (int)strlen(ptr+1)+1); } //check for [x] and ]x[ clan names str1 = strstr(name, "["); str2 = strstr(name, "]"); if (str1 && str2) { - if (str2 > str1) memmove(str1, str2+1, strlen(str2+1)+1); - else memmove(str2, str1+1, strlen(str1+1)+1); + if (str2 > str1) memmove(str1, str2+1, (int)strlen(str2+1)+1); + else memmove(str2, str1+1, (int)strlen(str1+1)+1); } //remove Mr prefix if ((name[0] == 'm' || name[0] == 'M') && (name[1] == 'r' || name[1] == 'R')) { - memmove(name, name+2, strlen(name+2)+1); + memmove(name, name+2, (int)strlen(name+2)+1); } //only allow lower case alphabet characters ptr = name; @@ -1519,7 +1519,7 @@ char *EasyClientName(int client, char *buf, int size) { ptr++; } else { - memmove(ptr, ptr+1, strlen(ptr + 1)+1); + memmove(ptr, ptr+1, (int)strlen(ptr + 1)+1); } } strncpy(buf, name, size-1); diff --git a/code/game/ai_main.c b/code/game/ai_main.c index cd6dbc9..588f834 100644 --- a/code/game/ai_main.c +++ b/code/game/ai_main.c @@ -990,19 +990,19 @@ int BotAI(int client, float thinktime) { { /*ConfigStringModified*/ } else if (!Q_stricmp(buf, "print")) { //remove first and last quote from the chat message - memmove(args, args+1, strlen(args)); + memmove(args, args+1, (int)strlen(args)); args[strlen(args)-1] = '\0'; trap_BotQueueConsoleMessage(bs->cs, CMS_NORMAL, args); } else if (!Q_stricmp(buf, "chat")) { //remove first and last quote from the chat message - memmove(args, args+1, strlen(args)); + memmove(args, args+1, (int)strlen(args)); args[strlen(args)-1] = '\0'; trap_BotQueueConsoleMessage(bs->cs, CMS_CHAT, args); } else if (!Q_stricmp(buf, "tchat")) { //remove first and last quote from the chat message - memmove(args, args+1, strlen(args)); + memmove(args, args+1, (int)strlen(args)); args[strlen(args)-1] = '\0'; trap_BotQueueConsoleMessage(bs->cs, CMS_CHAT, args); } diff --git a/code/game/bg_lib.c b/code/game/bg_lib.c index bf1ac1e..db2a1c9 100644 --- a/code/game/bg_lib.c +++ b/code/game/bg_lib.c @@ -195,7 +195,7 @@ loop: SWAPINIT(a, es); // bk001211 - gcc errors on compiling strcpy: parse error before `__extension__' #if defined ( Q3_VM ) -size_t strlen( const char *string ) { +int strlen( const char *string ) { const char *s; s = string; diff --git a/code/game/bg_lib.h b/code/game/bg_lib.h index d6deb60..80d0e68 100644 --- a/code/game/bg_lib.h +++ b/code/game/bg_lib.h @@ -54,7 +54,7 @@ void srand( unsigned seed ); int rand( void ); // String functions -size_t strlen( const char *string ); +int strlen( const char *string ); char *strcat( char *strDestination, const char *strSource ); char *strcpy( char *strDestination, const char *strSource ); int strcmp( const char *string1, const char *string2 ); diff --git a/code/game/g_arenas.c b/code/game/g_arenas.c index d9cf4d5..77084b9 100644 --- a/code/game/g_arenas.c +++ b/code/game/g_arenas.c @@ -122,11 +122,11 @@ void UpdateTournamentInfo( void ) { #endif } - msglen = strlen( msg ); + msglen = (int)strlen( msg ); for( i = 0; i < level.numNonSpectatorClients; i++ ) { n = level.sortedClients[i]; Com_sprintf( buf, sizeof(buf), " %i %i %i", n, level.clients[n].ps.persistant[PERS_RANK], level.clients[n].ps.persistant[PERS_SCORE] ); - buflen = strlen( buf ); + buflen = (int)strlen( buf ); if( msglen + buflen + 1 >= sizeof(msg) ) { break; } diff --git a/code/game/g_bot.c b/code/game/g_bot.c index 1987cfa..32a48e4 100644 --- a/code/game/g_bot.c +++ b/code/game/g_bot.c @@ -108,7 +108,7 @@ int G_ParseInfos( char *buf, int max, char *infos[] ) { Info_SetValueForKey( info, key, token ); } //NOTE: extra space for arena number - infos[count] = G_Alloc(strlen(info) + strlen("\\num\\") + strlen(va("%d", MAX_ARENAS)) + 1); + infos[count] = G_Alloc((int)strlen(info) + (int)strlen("\\num\\") + (int)strlen(va("%d", MAX_ARENAS)) + 1); if (infos[count]) { strcpy(infos[count], info); count++; @@ -173,7 +173,7 @@ static void G_LoadArenas( void ) { numdirs = trap_FS_GetFileList("scripts", ".arena", dirlist, 1024 ); dirptr = dirlist; for (i = 0; i < numdirs; i++, dirptr += dirlen+1) { - dirlen = strlen(dirptr); + dirlen = (int)strlen(dirptr); strcpy(filename, "scripts/"); strcat(filename, dirptr); G_LoadArenasFromFile(filename); @@ -911,7 +911,7 @@ static void G_LoadBots( void ) { numdirs = trap_FS_GetFileList("scripts", ".bot", dirlist, 1024 ); dirptr = dirlist; for (i = 0; i < numdirs; i++, dirptr += dirlen+1) { - dirlen = strlen(dirptr); + dirlen = (int)strlen(dirptr); strcpy(filename, "scripts/"); strcat(filename, dirptr); G_LoadBotsFromFile(filename); diff --git a/code/game/g_cmds.c b/code/game/g_cmds.c index 8773676..3fee6c9 100644 --- a/code/game/g_cmds.c +++ b/code/game/g_cmds.c @@ -75,7 +75,7 @@ void DeathmatchScoreboardMessage( gentity_t *ent ) { cl->ps.persistant[PERS_ASSIST_COUNT], perfect, cl->ps.persistant[PERS_CAPTURES]); - j = strlen(entry); + j = (int)strlen(entry); if (stringlength + j > 1024) break; strcpy (string + stringlength, entry); @@ -134,7 +134,7 @@ char *ConcatArgs( int start ) { c = trap_Argc(); for ( i = start ; i < c ; i++ ) { trap_Argv( i, arg, sizeof( arg ) ); - tlen = strlen( arg ); + tlen = (int)strlen( arg ); if ( len + tlen >= MAX_STRING_CHARS - 1 ) { break; } @@ -1401,7 +1401,7 @@ void Cmd_CallTeamVote_f( gentity_t *ent ) { for ( i = 2; i < trap_Argc(); i++ ) { if (i > 2) strcat(arg2, " "); - trap_Argv( i, &arg2[strlen(arg2)], sizeof( arg2 ) - strlen(arg2) ); + trap_Argv( i, &arg2[strlen(arg2)], sizeof( arg2 ) - (int)strlen(arg2) ); } if( strchr( arg1, ';' ) || strchr( arg2, ';' ) ) { diff --git a/code/game/g_main.c b/code/game/g_main.c index 821ab96..46b9b5b 100644 --- a/code/game/g_main.c +++ b/code/game/g_main.c @@ -1100,7 +1100,7 @@ void QDECL G_LogPrintf( const char *fmt, ... ) { return; } - trap_FS_Write( string, strlen( string ), level.logFile ); + trap_FS_Write( string, (int)strlen( string ), level.logFile ); } /* diff --git a/code/game/g_spawn.c b/code/game/g_spawn.c index 0739e4e..b85db6f 100644 --- a/code/game/g_spawn.c +++ b/code/game/g_spawn.c @@ -318,7 +318,7 @@ char *G_NewString( const char *string ) { char *newb, *new_p; int i,l; - l = strlen(string) + 1; + l = (int)strlen(string) + 1; newb = G_Alloc( l ); @@ -488,7 +488,7 @@ char *G_AddSpawnVarToken( const char *string ) { int l; char *dest; - l = strlen( string ); + l = (int)strlen( string ); if ( level.numSpawnVarChars + l + 1 > MAX_SPAWN_VARS_CHARS ) { G_Error( "G_AddSpawnVarToken: MAX_SPAWN_CHARS" ); } diff --git a/code/game/g_team.c b/code/game/g_team.c index fbdf586..6da3235 100644 --- a/code/game/g_team.c +++ b/code/game/g_team.c @@ -1108,7 +1108,7 @@ void TeamplayInfoMessage( gentity_t *ent ) { // level.sortedClients[i], player->client->pers.teamState.location, h, a, i, player->client->pers.teamState.location, h, a, player->client->ps.weapon, player->s.powerups); - j = strlen(entry); + j = (int)strlen(entry); if (stringlength + j > sizeof(string)) break; strcpy (string + stringlength, entry); diff --git a/code/game/q_shared.c b/code/game/q_shared.c index afb1a25..3863389 100644 --- a/code/game/q_shared.c +++ b/code/game/q_shared.c @@ -79,7 +79,7 @@ void COM_DefaultExtension (char *path, int maxSize, const char *extension ) { // if path doesn't have a .EXT, append extension // (extension should include the .) // - src = path + strlen(path) - 1; + src = path + (int)strlen(path) - 1; while (*src != '/' && src != path) { if ( *src == '.' ) { @@ -814,7 +814,7 @@ char *Q_strupr( char *s1 ) { void Q_strcat( char *dest, int size, const char *src ) { int l1; - l1 = strlen( dest ); + l1 = (int)strlen( dest ); if ( l1 >= size ) { Com_Error( ERR_FATAL, "Q_strcat: already overflowed" ); } @@ -942,7 +942,7 @@ char *Info_ValueForKey( const char *s, const char *key ) { return ""; } - if ( strlen( s ) >= BIG_INFO_STRING ) { + if ( (int)strlen( s ) >= BIG_INFO_STRING ) { Com_Error( ERR_DROP, "Info_ValueForKey: oversize infostring" ); } @@ -1033,7 +1033,7 @@ void Info_RemoveKey( char *s, const char *key ) { char value[MAX_INFO_VALUE]; char *o; - if ( strlen( s ) >= MAX_INFO_STRING ) { + if ( (int)strlen( s ) >= MAX_INFO_STRING ) { Com_Error( ERR_DROP, "Info_RemoveKey: oversize infostring" ); } @@ -1088,7 +1088,7 @@ void Info_RemoveKey_Big( char *s, const char *key ) { char value[BIG_INFO_VALUE]; char *o; - if ( strlen( s ) >= BIG_INFO_STRING ) { + if ( (int)strlen( s ) >= BIG_INFO_STRING ) { Com_Error( ERR_DROP, "Info_RemoveKey_Big: oversize infostring" ); } @@ -1163,7 +1163,7 @@ Changes or adds a key/value pair void Info_SetValueForKey( char *s, const char *key, const char *value ) { char newi[MAX_INFO_STRING]; - if ( strlen( s ) >= MAX_INFO_STRING ) { + if ( (int)strlen( s ) >= MAX_INFO_STRING ) { Com_Error( ERR_DROP, "Info_SetValueForKey: oversize infostring" ); } @@ -1191,7 +1191,7 @@ void Info_SetValueForKey( char *s, const char *key, const char *value ) { Com_sprintf (newi, sizeof(newi), "\\%s\\%s", key, value); - if (strlen(newi) + strlen(s) > MAX_INFO_STRING) + if (strlen(newi) + (int)strlen(s) > MAX_INFO_STRING) { Com_Printf ("Info string length exceeded\n"); return; @@ -1211,7 +1211,7 @@ Changes or adds a key/value pair void Info_SetValueForKey_Big( char *s, const char *key, const char *value ) { char newi[BIG_INFO_STRING]; - if ( strlen( s ) >= BIG_INFO_STRING ) { + if ( (int)strlen( s ) >= BIG_INFO_STRING ) { Com_Error( ERR_DROP, "Info_SetValueForKey: oversize infostring" ); } @@ -1239,7 +1239,7 @@ void Info_SetValueForKey_Big( char *s, const char *key, const char *value ) { Com_sprintf (newi, sizeof(newi), "\\%s\\%s", key, value); - if (strlen(newi) + strlen(s) > BIG_INFO_STRING) + if (strlen(newi) + (int)strlen(s) > BIG_INFO_STRING) { Com_Printf ("BIG Info string length exceeded\n"); return; diff --git a/code/jpeg-6/jmemmgr.c b/code/jpeg-6/jmemmgr.c index dc3e1c7..cc85636 100644 --- a/code/jpeg-6/jmemmgr.c +++ b/code/jpeg-6/jmemmgr.c @@ -303,7 +303,7 @@ alloc_small (j_common_ptr cinfo, int pool_id, size_t sizeofobject) if (slop < MIN_SLOP) /* give up when it gets real small */ out_of_memory(cinfo, 2); /* jpeg_get_small failed */ } - mem->total_space_allocated += min_request + slop; + mem->total_space_allocated += (int)min_request + (int)slop; /* Success, initialize the new pool header and add to end of list */ hdr_ptr->hdr.next = NULL; hdr_ptr->hdr.bytes_used = 0; @@ -363,7 +363,7 @@ alloc_large (j_common_ptr cinfo, int pool_id, size_t sizeofobject) SIZEOF(large_pool_hdr)); if (hdr_ptr == NULL) out_of_memory(cinfo, 4); /* jpeg_get_large failed */ - mem->total_space_allocated += sizeofobject + SIZEOF(large_pool_hdr); + mem->total_space_allocated += (int)sizeofobject + (int)SIZEOF(large_pool_hdr); /* Success, initialize the new pool header and add to list */ hdr_ptr->hdr.next = mem->large_list[pool_id]; @@ -973,7 +973,7 @@ free_pool (j_common_ptr cinfo, int pool_id) lhdr_ptr->hdr.bytes_left + SIZEOF(large_pool_hdr); jpeg_free_large(cinfo, (void FAR *) lhdr_ptr, space_freed); - mem->total_space_allocated -= space_freed; + mem->total_space_allocated -= (int)space_freed; lhdr_ptr = next_lhdr_ptr; } @@ -987,7 +987,7 @@ free_pool (j_common_ptr cinfo, int pool_id) shdr_ptr->hdr.bytes_left + SIZEOF(small_pool_hdr); jpeg_free_small(cinfo, (void *) shdr_ptr, space_freed); - mem->total_space_allocated -= space_freed; + mem->total_space_allocated -= (int)space_freed; shdr_ptr = next_shdr_ptr; } } diff --git a/code/jpeg-6/jmemnobs.c b/code/jpeg-6/jmemnobs.c index ea7ead7..ca73638 100644 --- a/code/jpeg-6/jmemnobs.c +++ b/code/jpeg-6/jmemnobs.c @@ -30,7 +30,7 @@ GLOBAL void * jpeg_get_small (j_common_ptr cinfo, size_t sizeofobject) { - return (void *) ri.Malloc(sizeofobject); + return (void *) ri.Malloc((int)sizeofobject); } GLOBAL void @@ -50,7 +50,7 @@ jpeg_free_small (j_common_ptr cinfo, void * object, size_t sizeofobject) GLOBAL void FAR * jpeg_get_large (j_common_ptr cinfo, size_t sizeofobject) { - return (void FAR *) ri.Malloc(sizeofobject); + return (void FAR *) ri.Malloc((int)sizeofobject); } GLOBAL void diff --git a/code/q3_ui/ui_atoms.c b/code/q3_ui/ui_atoms.c index ae4cbb9..299af1d 100644 --- a/code/q3_ui/ui_atoms.c +++ b/code/q3_ui/ui_atoms.c @@ -748,13 +748,13 @@ void UI_DrawString( int x, int y, const char* str, int style, vec4_t color ) { case UI_CENTER: // center justify at x - len = strlen(str); + len = (int)strlen(str); x = x - len*charw/2; break; case UI_RIGHT: // right justify at x - len = strlen(str); + len = (int)strlen(str); x = x - len*charw; break; diff --git a/code/q3_ui/ui_cdkey.c b/code/q3_ui/ui_cdkey.c index e9ed1e5..d4a0772 100644 --- a/code/q3_ui/ui_cdkey.c +++ b/code/q3_ui/ui_cdkey.c @@ -91,7 +91,7 @@ UI_CDKeyMenu_PreValidateKey static int UI_CDKeyMenu_PreValidateKey( const char *key ) { char ch; - if( strlen( key ) != 16 ) { + if( (int)strlen( key ) != 16 ) { return 1; } diff --git a/code/q3_ui/ui_connect.c b/code/q3_ui/ui_connect.c index 5226407..cc5b7c2 100644 --- a/code/q3_ui/ui_connect.c +++ b/code/q3_ui/ui_connect.c @@ -40,11 +40,11 @@ static void UI_ReadableSize ( char *buf, int bufsize, int value ) { if (value > 1024*1024*1024 ) { // gigs Com_sprintf( buf, bufsize, "%d", value / (1024*1024*1024) ); - Com_sprintf( buf+strlen(buf), bufsize-strlen(buf), ".%02d GB", + Com_sprintf( buf+(int)strlen(buf), bufsize-(int)strlen(buf), ".%02d GB", (value % (1024*1024*1024))*100 / (1024*1024*1024) ); } else if (value > 1024*1024 ) { // megs Com_sprintf( buf, bufsize, "%d", value / (1024*1024) ); - Com_sprintf( buf+strlen(buf), bufsize-strlen(buf), ".%02d MB", + Com_sprintf( buf+(int)strlen(buf), bufsize-(int)strlen(buf), ".%02d MB", (value % (1024*1024))*100 / (1024*1024) ); } else if (value > 1024 ) { // kilos Com_sprintf( buf, bufsize, "%d KB", value / 1024 ); diff --git a/code/q3_ui/ui_demo2.c b/code/q3_ui/ui_demo2.c index f6f6f66..f4dbf97 100644 --- a/code/q3_ui/ui_demo2.c +++ b/code/q3_ui/ui_demo2.c @@ -243,7 +243,7 @@ static void Demos_MenuInit( void ) { s_demos.list.itemnames[i] = demoname; // strip extension - len = strlen( demoname ); + len = (int)strlen( demoname ); if (!Q_stricmp(demoname + len - 4,".dm3")) demoname[len-4] = '\0'; diff --git a/code/q3_ui/ui_gameinfo.c b/code/q3_ui/ui_gameinfo.c index b73a18f..720e3a5 100644 --- a/code/q3_ui/ui_gameinfo.c +++ b/code/q3_ui/ui_gameinfo.c @@ -123,7 +123,7 @@ int UI_ParseInfos( char *buf, int max, char *infos[] ) { Info_SetValueForKey( info, key, token ); } //NOTE: extra space for arena number - infos[count] = UI_Alloc(strlen(info) + strlen("\\num\\") + strlen(va("%d", MAX_ARENAS)) + 1); + infos[count] = UI_Alloc((int)strlen(info) + (int)strlen("\\num\\") + (int)strlen(va("%d", MAX_ARENAS)) + 1); if (infos[count]) { strcpy(infos[count], info); count++; @@ -191,7 +191,7 @@ static void UI_LoadArenas( void ) { numdirs = trap_FS_GetFileList("scripts", ".arena", dirlist, 1024 ); dirptr = dirlist; for (i = 0; i < numdirs; i++, dirptr += dirlen+1) { - dirlen = strlen(dirptr); + dirlen = (int)strlen(dirptr); strcpy(filename, "scripts/"); strcat(filename, dirptr); UI_LoadArenasFromFile(filename); @@ -378,7 +378,7 @@ static void UI_LoadBots( void ) { numdirs = trap_FS_GetFileList("scripts", ".bot", dirlist, 1024 ); dirptr = dirlist; for (i = 0; i < numdirs; i++, dirptr += dirlen+1) { - dirlen = strlen(dirptr); + dirlen = (int)strlen(dirptr); strcpy(filename, "scripts/"); strcat(filename, dirptr); UI_LoadBotsFromFile(filename); diff --git a/code/q3_ui/ui_menu.c b/code/q3_ui/ui_menu.c index 6722435..c0448a0 100644 --- a/code/q3_ui/ui_menu.c +++ b/code/q3_ui/ui_menu.c @@ -246,12 +246,12 @@ static qboolean UI_TeamArenaExists( void ) { numdirs = trap_FS_GetFileList( "$modlist", "", dirlist, sizeof(dirlist) ); dirptr = dirlist; for( i = 0; i < numdirs; i++ ) { - dirlen = strlen( dirptr ) + 1; + dirlen = (int)strlen( dirptr ) + 1; descptr = dirptr + dirlen; if (Q_stricmp(dirptr, "missionpack") == 0) { return qtrue; } - dirptr += dirlen + strlen(descptr) + 1; + dirptr += dirlen + (int)strlen(descptr) + 1; } return qfalse; } diff --git a/code/q3_ui/ui_mfield.c b/code/q3_ui/ui_mfield.c index b94c515..0d096c6 100644 --- a/code/q3_ui/ui_mfield.c +++ b/code/q3_ui/ui_mfield.c @@ -39,7 +39,7 @@ void MField_Draw( mfield_t *edit, int x, int y, int style, vec4_t color ) { char str[MAX_STRING_CHARS]; drawLen = edit->widthInChars; - len = strlen( edit->buffer ) + 1; + len = (int)strlen( edit->buffer ) + 1; // guarantee that cursor will be visible if ( len <= drawLen ) { @@ -96,12 +96,12 @@ void MField_Draw( mfield_t *edit, int x, int y, int style, vec4_t color ) { if (style & UI_CENTER) { - len = strlen(str); + len = (int)strlen(str); x = x - len*charw/2; } else if (style & UI_RIGHT) { - len = strlen(str); + len = (int)strlen(str); x = x - len*charw; } @@ -120,7 +120,7 @@ void MField_Paste( mfield_t *edit ) { trap_GetClipboardData( pasteBuffer, 64 ); // send as if typed, so insert / overstrike works properly - pasteLen = strlen( pasteBuffer ); + pasteLen = (int)strlen( pasteBuffer ); for ( i = 0 ; i < pasteLen ; i++ ) { MField_CharEvent( edit, pasteBuffer[i] ); } @@ -145,7 +145,7 @@ void MField_KeyDownEvent( mfield_t *edit, int key ) { return; } - len = strlen( edit->buffer ); + len = (int)strlen( edit->buffer ); if ( key == K_DEL || key == K_KP_DEL ) { if ( edit->cursor < len ) { @@ -217,7 +217,7 @@ void MField_CharEvent( mfield_t *edit, int ch ) { return; } - len = strlen( edit->buffer ); + len = (int)strlen( edit->buffer ); if ( ch == 'h' - 'a' + 1 ) { // ctrl-h is backspace if ( edit->cursor > 0 ) { @@ -312,7 +312,7 @@ void MenuField_Init( menufield_s* m ) { } if (m->generic.name) { - l = (strlen( m->generic.name )+1) * w; + l = ((int)strlen( m->generic.name )+1) * w; } else { l = 0; diff --git a/code/q3_ui/ui_mods.c b/code/q3_ui/ui_mods.c index a7d32fb..348c9d6 100644 --- a/code/q3_ui/ui_mods.c +++ b/code/q3_ui/ui_mods.c @@ -100,8 +100,8 @@ static void UI_Mods_ParseInfos( char *modDir, char *modDesc ) { Q_strncpyz( s_mods.descriptionPtr, modDesc, 48 ); s_mods.list.itemnames[s_mods.list.numitems] = s_mods.descriptionPtr; - s_mods.descriptionPtr += strlen( s_mods.descriptionPtr ) + 1; - s_mods.fs_gamePtr += strlen( s_mods.fs_gamePtr ) + 1; + s_mods.descriptionPtr += (int)strlen( s_mods.descriptionPtr ) + 1; + s_mods.fs_gamePtr += (int)strlen( s_mods.fs_gamePtr ) + 1; s_mods.list.numitems++; } @@ -132,7 +132,7 @@ static void UI_Mods_LoadModsFromFile( char *filename ) { buf[len] = 0; trap_FS_FCloseFile( f ); - len = strlen( filename ); + len = (int)strlen( filename ); if( !Q_stricmp(filename + len - 4,".mod") ) { filename[len-4] = '\0'; } @@ -167,10 +167,10 @@ static void UI_Mods_LoadMods( void ) { numdirs = trap_FS_GetFileList( "$modlist", "", dirlist, sizeof(dirlist) ); dirptr = dirlist; for( i = 0; i < numdirs; i++ ) { - dirlen = strlen( dirptr ) + 1; + dirlen = (int)strlen( dirptr ) + 1; descptr = dirptr + dirlen; UI_Mods_ParseInfos( dirptr, descptr); - dirptr += dirlen + strlen(descptr) + 1; + dirptr += dirlen + (int)strlen(descptr) + 1; } trap_Print( va( "%i mods parsed\n", s_mods.list.numitems ) ); diff --git a/code/q3_ui/ui_playermodel.c b/code/q3_ui/ui_playermodel.c index 444385e..5be137d 100644 --- a/code/q3_ui/ui_playermodel.c +++ b/code/q3_ui/ui_playermodel.c @@ -331,7 +331,7 @@ static void PlayerModel_PicEvent( void* ptr, int event ) // get model and strip icon_ modelnum = s_playermodel.modelpage*MAX_MODELSPERPAGE + i; - buffptr = s_playermodel.modelnames[modelnum] + strlen("models/players/"); + buffptr = s_playermodel.modelnames[modelnum] + (int)strlen("models/players/"); pdest = strstr(buffptr,"icon_"); if (pdest) { @@ -347,7 +347,7 @@ static void PlayerModel_PicEvent( void* ptr, int event ) Q_strupr( s_playermodel.modelname.string ); // seperate the skin name - maxlen = strlen(pdest+5)+1; + maxlen = (int)strlen(pdest+5)+1; if (maxlen > 16) maxlen = 16; Q_strncpyz( s_playermodel.skinname.string, pdest+5, maxlen ); @@ -410,7 +410,7 @@ static void PlayerModel_BuildList( void ) dirptr = dirlist; for (i=0; i 16) maxlen = 16; Q_strncpyz( s_playermodel.skinname.string, pdest+5, maxlen ); diff --git a/code/q3_ui/ui_preferences.c b/code/q3_ui/ui_preferences.c index 4b62f5c..aaa35d8 100644 --- a/code/q3_ui/ui_preferences.c +++ b/code/q3_ui/ui_preferences.c @@ -262,7 +262,7 @@ static void Preferences_MenuInit( void ) { s_preferences.crosshair.generic.id = ID_CROSSHAIR; s_preferences.crosshair.generic.top = y - 4; s_preferences.crosshair.generic.bottom = y + 20; - s_preferences.crosshair.generic.left = PREFERENCES_X_POS - ( ( strlen(s_preferences.crosshair.generic.name) + 1 ) * SMALLCHAR_WIDTH ); + s_preferences.crosshair.generic.left = PREFERENCES_X_POS - ( ( (int)strlen(s_preferences.crosshair.generic.name) + 1 ) * SMALLCHAR_WIDTH ); s_preferences.crosshair.generic.right = PREFERENCES_X_POS + 48; y += BIGCHAR_HEIGHT+2+4; diff --git a/code/q3_ui/ui_qmenu.c b/code/q3_ui/ui_qmenu.c index 868f827..af58b91 100644 --- a/code/q3_ui/ui_qmenu.c +++ b/code/q3_ui/ui_qmenu.c @@ -372,7 +372,7 @@ static void Action_Init( menuaction_s *a ) // calculate bounds if (a->generic.name) - len = strlen(a->generic.name); + len = (int)strlen(a->generic.name); else len = 0; @@ -438,7 +438,7 @@ static void RadioButton_Init( menuradiobutton_s *rb ) // calculate bounds if (rb->generic.name) - len = strlen(rb->generic.name); + len = (int)strlen(rb->generic.name); else len = 0; @@ -549,7 +549,7 @@ static void Slider_Init( menuslider_s *s ) // calculate bounds if (s->generic.name) - len = strlen(s->generic.name); + len = (int)strlen(s->generic.name); else len = 0; @@ -766,7 +766,7 @@ static void SpinControl_Init( menulist_s *s ) { const char* str; if (s->generic.name) - len = strlen(s->generic.name) * SMALLCHAR_WIDTH; + len = (int)strlen(s->generic.name) * SMALLCHAR_WIDTH; else len = 0; @@ -775,7 +775,7 @@ static void SpinControl_Init( menulist_s *s ) { len = s->numitems = 0; while ( (str = s->itemnames[s->numitems]) != 0 ) { - l = strlen(str); + l = (int)strlen(str); if (l > len) len = l; diff --git a/code/q3_ui/ui_sppostgame.c b/code/q3_ui/ui_sppostgame.c index 6f5d29d..e9ece76 100644 --- a/code/q3_ui/ui_sppostgame.c +++ b/code/q3_ui/ui_sppostgame.c @@ -484,7 +484,7 @@ static void Prepname( int index ) { trap_GetConfigString( CS_PLAYERS + postgameMenuInfo.clientNums[index], info, MAX_INFO_STRING ); Q_strncpyz( name, Info_ValueForKey( info, "n" ), sizeof(name) ); Q_CleanStr( name ); - len = strlen( name ); + len = (int)strlen( name ); while( len && UI_ProportionalStringWidth( name ) > 256 ) { len--; diff --git a/code/q3_ui/ui_startserver.c b/code/q3_ui/ui_startserver.c index 401f687..777a079 100644 --- a/code/q3_ui/ui_startserver.c +++ b/code/q3_ui/ui_startserver.c @@ -1347,7 +1347,7 @@ static void ServerOptions_MenuInit( qboolean multiplayer ) { s_serveroptions.botSkill.generic.type = MTYPE_SPINCONTROL; s_serveroptions.botSkill.generic.flags = QMF_PULSEIFFOCUS|QMF_SMALLFONT; s_serveroptions.botSkill.generic.name = "Bot Skill: "; - s_serveroptions.botSkill.generic.x = 32 + (strlen(s_serveroptions.botSkill.generic.name) + 2 ) * SMALLCHAR_WIDTH; + s_serveroptions.botSkill.generic.x = 32 + ((int)strlen(s_serveroptions.botSkill.generic.name) + 2 ) * SMALLCHAR_WIDTH; s_serveroptions.botSkill.generic.y = y; s_serveroptions.botSkill.itemnames = botSkill_list; s_serveroptions.botSkill.curvalue = 1; diff --git a/code/q3_ui/ui_video.c b/code/q3_ui/ui_video.c index 6c16bba..523546e 100644 --- a/code/q3_ui/ui_video.c +++ b/code/q3_ui/ui_video.c @@ -208,7 +208,7 @@ static void UI_DriverInfo_Menu( void ) // safety length strings for display for (i=0; i 32) { s_driverinfo.strings[i][len-1] = '>'; s_driverinfo.strings[i][len] = '\0'; diff --git a/code/qcommon/cmd.c b/code/qcommon/cmd.c index 0f1178b..dd9ab9a 100644 --- a/code/qcommon/cmd.c +++ b/code/qcommon/cmd.c @@ -88,7 +88,7 @@ Adds command text at the end of the buffer, does NOT add a final \n void Cbuf_AddText( const char *text ) { int l; - l = strlen (text); + l = (int)strlen (text); if (cmd_text.cursize + l >= cmd_text.maxsize) { @@ -112,7 +112,7 @@ void Cbuf_InsertText( const char *text ) { int len; int i; - len = strlen( text ) + 1; + len = (int)strlen( text ) + 1; if ( len + cmd_text.cursize > cmd_text.maxsize ) { Com_Printf( "Cbuf_InsertText overflowed\n" ); return; @@ -143,7 +143,7 @@ void Cbuf_ExecuteText (int exec_when, const char *text) switch (exec_when) { case EXEC_NOW: - if (text && strlen(text) > 0) { + if (text && (int)strlen(text) > 0) { Cmd_ExecuteString (text); } else { Cbuf_Execute(); diff --git a/code/qcommon/common.c b/code/qcommon/common.c index f5ddabb..422314c 100644 --- a/code/qcommon/common.c +++ b/code/qcommon/common.c @@ -150,7 +150,7 @@ void QDECL Com_Printf( const char *fmt, ... ) { va_end (argptr); if ( rd_buffer ) { - if ((strlen (msg) + strlen(rd_buffer)) > (rd_buffersize - 1)) { + if ((strlen (msg) + (int)strlen(rd_buffer)) > (rd_buffersize - 1)) { rd_flush(rd_buffer); *rd_buffer = 0; } @@ -193,7 +193,7 @@ void QDECL Com_Printf( const char *fmt, ... ) { opening_qconsole = qfalse; } if ( logfile && FS_Initialized()) { - FS_Write(msg, strlen(msg), logfile); + FS_Write(msg, (int)strlen(msg), logfile); } } } @@ -525,7 +525,7 @@ Com_StringContains char *Com_StringContains(char *str1, char *str2, int casesensitive) { int len, i, j; - len = strlen(str1) - strlen(str2); + len = (int)strlen(str1) - (int)strlen(str2); for (i = 0; i <= len; i++, str1++) { for (j = 0; str2[j]; j++) { if (casesensitive) { @@ -569,7 +569,7 @@ int Com_Filter(char *filter, char *name, int casesensitive) if (strlen(buf)) { ptr = Com_StringContains(name, buf, casesensitive); if (!ptr) return qfalse; - name = ptr + strlen(buf); + name = ptr + (int)strlen(buf); } } else if (*filter == '?') { @@ -1062,7 +1062,7 @@ void Z_LogZoneHeap( memzone_t *zone, char *name ) { return; size = allocSize = numBlocks = 0; Com_sprintf(buf, sizeof(buf), "\r\n================\r\n%s log\r\n================\r\n", name); - FS_Write(buf, strlen(buf), logfile); + FS_Write(buf, (int)strlen(buf), logfile); for (block = zone->blocklist.next ; block->next != &zone->blocklist; block = block->next) { if (block->tag) { #ifdef ZONE_DEBUG @@ -1078,7 +1078,7 @@ void Z_LogZoneHeap( memzone_t *zone, char *name ) { } dump[j] = '\0'; Com_sprintf(buf, sizeof(buf), "size = %8d: %s, line: %d (%s) [%s]\r\n", block->d.allocSize, block->d.file, block->d.line, block->d.label, dump); - FS_Write(buf, strlen(buf), logfile); + FS_Write(buf, (int)strlen(buf), logfile); allocSize += block->d.allocSize; #endif size += block->size; @@ -1092,9 +1092,9 @@ void Z_LogZoneHeap( memzone_t *zone, char *name ) { allocSize = numBlocks * sizeof(memblock_t); // + 32 bit alignment #endif Com_sprintf(buf, sizeof(buf), "%d %s memory in %d blocks\r\n", size, name, numBlocks); - FS_Write(buf, strlen(buf), logfile); + FS_Write(buf, (int)strlen(buf), logfile); Com_sprintf(buf, sizeof(buf), "%d %s memory overhead\r\n", size - allocSize, name); - FS_Write(buf, strlen(buf), logfile); + FS_Write(buf, (int)strlen(buf), logfile); } /* @@ -1148,7 +1148,7 @@ char *CopyString( const char *in ) { return ((char *)&numberstring[in[0]-'0']) + sizeof(memblock_t); } } - out = S_Malloc (strlen(in)+1); + out = S_Malloc ((int)strlen(in)+1); strcpy (out, in); return out; } @@ -1417,19 +1417,19 @@ void Hunk_Log( void) { size = 0; numBlocks = 0; Com_sprintf(buf, sizeof(buf), "\r\n================\r\nHunk log\r\n================\r\n"); - FS_Write(buf, strlen(buf), logfile); + FS_Write(buf, (int)strlen(buf), logfile); for (block = hunkblocks ; block; block = block->next) { #ifdef HUNK_DEBUG Com_sprintf(buf, sizeof(buf), "size = %8d: %s, line: %d (%s)\r\n", block->size, block->file, block->line, block->label); - FS_Write(buf, strlen(buf), logfile); + FS_Write(buf, (int)strlen(buf), logfile); #endif size += block->size; numBlocks++; } Com_sprintf(buf, sizeof(buf), "%d Hunk memory\r\n", size); - FS_Write(buf, strlen(buf), logfile); + FS_Write(buf, (int)strlen(buf), logfile); Com_sprintf(buf, sizeof(buf), "%d hunk blocks\r\n", numBlocks); - FS_Write(buf, strlen(buf), logfile); + FS_Write(buf, (int)strlen(buf), logfile); } /* @@ -1450,7 +1450,7 @@ void Hunk_SmallLog( void) { size = 0; numBlocks = 0; Com_sprintf(buf, sizeof(buf), "\r\n================\r\nHunk Small log\r\n================\r\n"); - FS_Write(buf, strlen(buf), logfile); + FS_Write(buf, (int)strlen(buf), logfile); for (block = hunkblocks; block; block = block->next) { if (block->printed) { continue; @@ -1469,15 +1469,15 @@ void Hunk_SmallLog( void) { } #ifdef HUNK_DEBUG Com_sprintf(buf, sizeof(buf), "size = %8d: %s, line: %d (%s)\r\n", locsize, block->file, block->line, block->label); - FS_Write(buf, strlen(buf), logfile); + FS_Write(buf, (int)strlen(buf), logfile); #endif size += block->size; numBlocks++; } Com_sprintf(buf, sizeof(buf), "%d Hunk memory\r\n", size); - FS_Write(buf, strlen(buf), logfile); + FS_Write(buf, (int)strlen(buf), logfile); Com_sprintf(buf, sizeof(buf), "%d hunk blocks\r\n", numBlocks); - FS_Write(buf, strlen(buf), logfile); + FS_Write(buf, (int)strlen(buf), logfile); } /* @@ -3191,7 +3191,7 @@ FindMatches static void FindMatches( const char *s ) { int i; - if ( Q_stricmpn( s, completionString, strlen( completionString ) ) ) { + if ( Q_stricmpn( s, completionString, (int)strlen( completionString ) ) ) { return; } matchCount++; @@ -3215,7 +3215,7 @@ PrintMatches =============== */ static void PrintMatches( const char *s ) { - if ( !Q_stricmpn( s, shortestMatch, strlen( shortestMatch ) ) ) { + if ( !Q_stricmpn( s, shortestMatch, (int)strlen( shortestMatch ) ) ) { Com_Printf( " %s\n", s ); } } @@ -3250,7 +3250,7 @@ static void ConcatRemaining( const char *src, const char *start ) { return; } - str += strlen(start); + str += (int)strlen(start); Q_strcat( completionField->buffer, sizeof( completionField->buffer ), str); } @@ -3278,7 +3278,7 @@ void Field_CompleteCommand( field_t *field ) { matchCount = 0; shortestMatch[0] = 0; - if ( strlen( completionString ) == 0 ) { + if ( (int)strlen( completionString ) == 0 ) { return; } @@ -3298,13 +3298,13 @@ void Field_CompleteCommand( field_t *field ) { } else { ConcatRemaining( temp.buffer, completionString ); } - completionField->cursor = strlen( completionField->buffer ); + completionField->cursor = (int)strlen( completionField->buffer ); return; } // multiple matches, complete to shortest Com_sprintf( completionField->buffer, sizeof( completionField->buffer ), "\\%s", shortestMatch ); - completionField->cursor = strlen( completionField->buffer ); + completionField->cursor = (int)strlen( completionField->buffer ); ConcatRemaining( temp.buffer, completionString ); Com_Printf( "]%s\n", completionField->buffer ); diff --git a/code/qcommon/cvar.c b/code/qcommon/cvar.c index 8b38712..16e00d5 100644 --- a/code/qcommon/cvar.c +++ b/code/qcommon/cvar.c @@ -534,7 +534,7 @@ void Cvar_Set_f( void ) { combined[0] = 0; l = 0; for ( i = 2 ; i < c ; i++ ) { - len = strlen ( Cmd_Argv( i ) + 1 ); + len = (int)strlen ( Cmd_Argv( i ) + 1 ); if ( l + len >= MAX_STRING_TOKENS - 2 ) { break; } @@ -868,10 +868,10 @@ void Cvar_Update( vmCvar_t *vmCvar ) { } vmCvar->modificationCount = cv->modificationCount; // bk001129 - mismatches. - if ( strlen(cv->string)+1 > MAX_CVAR_VALUE_STRING ) + if ( (int)strlen(cv->string)+1 > MAX_CVAR_VALUE_STRING ) Com_Error( ERR_DROP, "Cvar_Update: src %s length %d exceeds MAX_CVAR_VALUE_STRING", cv->string, - strlen(cv->string), + (int)strlen(cv->string), sizeof(vmCvar->string) ); // bk001212 - Q_strncpyz guarantees zero padding and dest[MAX_CVAR_VALUE_STRING-1]==0 // bk001129 - paranoia. Never trust the destination string. diff --git a/code/qcommon/files.c b/code/qcommon/files.c index 23ce2ca..87db4d2 100644 --- a/code/qcommon/files.c +++ b/code/qcommon/files.c @@ -1094,7 +1094,7 @@ int FS_FOpenFileRead( const char *filename, fileHandle_t *file, qboolean uniqueF // shaders, txt, arena files by themselves do not count as a reference as // these are loaded from all pk3s // from every pk3 file.. - l = strlen( filename ); + l = (int)strlen( filename ); if ( !(pak->referenced & FS_GENERAL_REF)) { if ( Q_stricmp(filename + l - 7, ".shader") != 0 && Q_stricmp(filename + l - 4, ".txt") != 0 && @@ -1161,7 +1161,7 @@ int FS_FOpenFileRead( const char *filename, fileHandle_t *file, qboolean uniqueF // if we are running restricted, the only files we // will allow to come from the directory are .cfg files - l = strlen( filename ); + l = (int)strlen( filename ); // FIXME TTimo I'm not sure about the fs_numServerPaks test // if you are using FS_ReadFile to find out if a file exists, // this test can make the search fail although the file is in the directory @@ -1172,7 +1172,7 @@ int FS_FOpenFileRead( const char *filename, fileHandle_t *file, qboolean uniqueF if ( Q_stricmp( filename + l - 4, ".cfg" ) // for config files && Q_stricmp( filename + l - 5, ".menu" ) // menu files && Q_stricmp( filename + l - 5, ".game" ) // menu files - && Q_stricmp( filename + l - strlen(demoExt), demoExt ) // menu files + && Q_stricmp( filename + l - (int)strlen(demoExt), demoExt ) // menu files && Q_stricmp( filename + l - 4, ".dat" ) ) { // for journal files continue; } @@ -1189,7 +1189,7 @@ int FS_FOpenFileRead( const char *filename, fileHandle_t *file, qboolean uniqueF if ( Q_stricmp( filename + l - 4, ".cfg" ) // for config files && Q_stricmp( filename + l - 5, ".menu" ) // menu files && Q_stricmp( filename + l - 5, ".game" ) // menu files - && Q_stricmp( filename + l - strlen(demoExt), demoExt ) // menu files + && Q_stricmp( filename + l - (int)strlen(demoExt), demoExt ) // menu files && Q_stricmp( filename + l - 4, ".dat" ) ) { // for journal files fs_fakeChkSum = random(); } @@ -1273,7 +1273,7 @@ int FS_Read( void *buffer, int len, fileHandle_t f ) { tries = 0; while (remaining) { block = remaining; - read = fread (buf, 1, block, fsh[f].handleFiles.file.o); + read = (int)fread (buf, 1, block, fsh[f].handleFiles.file.o); if (read == 0) { // we might have been trying to read from a CD, which // sometimes returns a 0 read on windows @@ -1326,7 +1326,7 @@ int FS_Write( const void *buffer, int len, fileHandle_t h ) { tries = 0; while (remaining) { block = remaining; - written = fwrite (buf, 1, block, f); + written = (int)fwrite (buf, 1, block, f); if (written == 0) { if (!tries) { tries = 1; @@ -1358,7 +1358,7 @@ void QDECL FS_Printf( fileHandle_t h, const char *fmt, ... ) { Q_vsnprintf (msg, sizeof(msg), fmt, argptr); va_end (argptr); - FS_Write(msg, strlen(msg), h); + FS_Write(msg, (int)strlen(msg), h); } /* @@ -1707,7 +1707,7 @@ static pack_t *FS_LoadZipFile( char *zipfile, const char *basename ) if (err != UNZ_OK) { break; } - len += strlen(filename_inzip) + 1; + len += (int)strlen(filename_inzip) + 1; unzGoToNextFile(uf); } @@ -1734,7 +1734,7 @@ static pack_t *FS_LoadZipFile( char *zipfile, const char *basename ) Q_strncpyz( pack->pakBasename, basename, sizeof( pack->pakBasename ) ); // strip .pk3 if needed - if ( strlen( pack->pakBasename ) > 4 && !Q_stricmp( pack->pakBasename + strlen( pack->pakBasename ) - 4, ".pk3" ) ) { + if ( (int)strlen( pack->pakBasename ) > 4 && !Q_stricmp( pack->pakBasename + (int)strlen( pack->pakBasename ) - 4, ".pk3" ) ) { pack->pakBasename[strlen( pack->pakBasename ) - 4] = 0; } @@ -1755,7 +1755,7 @@ static pack_t *FS_LoadZipFile( char *zipfile, const char *basename ) hash = FS_HashFileName(filename_inzip, pack->hashSize); buildBuffer[i].name = namePtr; strcpy( buildBuffer[i].name, filename_inzip ); - namePtr += strlen(filename_inzip) + 1; + namePtr += (int)strlen(filename_inzip) + 1; // store the file position in the zip unzGetCurrentFileInfoPosition(uf, &buildBuffer[i].pos); // @@ -1863,11 +1863,11 @@ char **FS_ListFilteredFiles( const char *path, const char *extension, char *filt extension = ""; } - pathLength = strlen( path ); + pathLength = (int)strlen( path ); if ( path[pathLength-1] == '\\' || path[pathLength-1] == '/' ) { pathLength--; } - extensionLength = strlen( extension ); + extensionLength = (int)strlen( extension ); nfiles = 0; FS_ReturnPath(path, zpath, &pathDepth); @@ -1910,7 +1910,7 @@ char **FS_ListFilteredFiles( const char *path, const char *extension, char *filt } // check for extension match - length = strlen( name ); + length = (int)strlen( name ); if ( length < extensionLength ) { continue; } @@ -2018,7 +2018,7 @@ int FS_GetFileList( const char *path, const char *extension, char *listbuf, int pFiles = FS_ListFiles(path, extension, &nFiles); for (i =0; i < nFiles; i++) { - nLen = strlen(pFiles[i]) + 1; + nLen = (int)strlen(pFiles[i]) + 1; if (nTotal + nLen + 1 < bufsize) { strcpy(listbuf, pFiles[i]); listbuf += nLen; @@ -2184,7 +2184,7 @@ int FS_GetModList( char *listbuf, int bufsize ) { } if (nPaks > 0) { - nLen = strlen(name) + 1; + nLen = (int)strlen(name) + 1; // nLen is the length of the mod path // we need to see if there is a description available descPath[0] = '\0'; @@ -2195,7 +2195,7 @@ int FS_GetModList( char *listbuf, int bufsize ) { FILE *file; file = FS_FileForHandle(descHandle); Com_Memset( descPath, 0, sizeof( descPath ) ); - nDescLen = fread(descPath, 1, 48, file); + nDescLen = (int)fread(descPath, 1, 48, file); if (nDescLen >= 0) { descPath[nDescLen] = '\0'; } @@ -2203,7 +2203,7 @@ int FS_GetModList( char *listbuf, int bufsize ) { } else { strcpy(descPath, name); } - nDescLen = strlen(descPath) + 1; + nDescLen = (int)strlen(descPath) + 1; if (nTotal + nLen + 1 + nDescLen + 1 < bufsize) { strcpy(listbuf, name); @@ -2490,7 +2490,7 @@ static void FS_AddGameDirectory( const char *path, const char *dir ) { // find all pak files in this directory pakfile = FS_BuildOSPath( path, dir, "" ); - pakfile[ strlen(pakfile) - 1 ] = 0; // strip the trailing slash + pakfile[ (int)strlen(pakfile) - 1 ] = 0; // strip the trailing slash pakfiles = Sys_ListFiles( pakfile, ".pk3", NULL, &numfiles, qfalse ); @@ -3012,7 +3012,7 @@ const char *FS_ReferencedPakChecksums( void ) { for ( search = fs_searchpaths ; search ; search = search->next ) { // is the element a pak file? if ( search->pack ) { - if (search->pack->referenced || Q_stricmpn(search->pack->pakGamename, BASEGAME, strlen(BASEGAME))) { + if (search->pack->referenced || Q_stricmpn(search->pack->pakGamename, BASEGAME, (int)strlen(BASEGAME))) { Q_strcat( info, sizeof( info ), va("%i ", search->pack->checksum ) ); } } @@ -3094,7 +3094,7 @@ const char *FS_ReferencedPakNames( void ) { if (*info) { Q_strcat(info, sizeof( info ), " " ); } - if (search->pack->referenced || Q_stricmpn(search->pack->pakGamename, BASEGAME, strlen(BASEGAME))) { + if (search->pack->referenced || Q_stricmpn(search->pack->pakGamename, BASEGAME, (int)strlen(BASEGAME))) { Q_strcat( info, sizeof( info ), search->pack->pakGamename ); Q_strcat( info, sizeof( info ), "/" ); Q_strcat( info, sizeof( info ), search->pack->pakBasename ); diff --git a/code/qcommon/msg.c b/code/qcommon/msg.c index 0d8ff17..a6d0852 100644 --- a/code/qcommon/msg.c +++ b/code/qcommon/msg.c @@ -307,7 +307,7 @@ void MSG_WriteString( msg_t *sb, const char *s ) { int l,i; char string[MAX_STRING_CHARS]; - l = strlen( s ); + l = (int)strlen( s ); if ( l >= MAX_STRING_CHARS ) { Com_Printf( "MSG_WriteString: MAX_STRING_CHARS" ); MSG_WriteData (sb, "", 1); @@ -333,7 +333,7 @@ void MSG_WriteBigString( msg_t *sb, const char *s ) { int l,i; char string[BIG_INFO_STRING]; - l = strlen( s ); + l = (int)strlen( s ); if ( l >= BIG_INFO_STRING ) { Com_Printf( "MSG_WriteString: BIG_INFO_STRING" ); MSG_WriteData (sb, "", 1); diff --git a/code/qcommon/net_chan.c b/code/qcommon/net_chan.c index b8a9bc1..ecf32fe 100644 --- a/code/qcommon/net_chan.c +++ b/code/qcommon/net_chan.c @@ -660,7 +660,7 @@ void QDECL NET_OutOfBandPrint( netsrc_t sock, netadr_t adr, const char *format, va_end( argptr ); // send the datagram - NET_SendPacket( sock, strlen( string ), string, adr ); + NET_SendPacket( sock, (int)strlen( string ), string, adr ); } /* diff --git a/code/qcommon/vm.c b/code/qcommon/vm.c index c48aedd..36564a0 100644 --- a/code/qcommon/vm.c +++ b/code/qcommon/vm.c @@ -264,7 +264,7 @@ void VM_LoadSymbols( vm_t *vm ) { Com_Printf( "WARNING: incomplete line at end of file\n" ); break; } - chars = strlen( token ); + chars = (int)strlen( token ); sym = Hunk_Alloc( sizeof( *sym ) + chars, h_high ); *prev = sym; prev = &sym->next; @@ -723,7 +723,7 @@ int QDECL VM_Call( vm_t *vm, int callnum, ... ) { } va_end(ap); - r = VM_CallInterpreted( vm, &a ); + r = VM_CallInterpreted( vm, &a.callnum ); } if ( oldVM != NULL ) // bk001220 - assert(currentVM!=NULL) for oldVM==NULL diff --git a/code/qcommon/vm_x86.c b/code/qcommon/vm_x86.c index d20a15d..62183cd 100644 --- a/code/qcommon/vm_x86.c +++ b/code/qcommon/vm_x86.c @@ -21,6 +21,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ // vm_x86.c -- load time compiler and execution environment for x86 +; // to shut up compiler in x64 + #ifndef _WIN64 #include "vm_local.h" diff --git a/code/renderer/tr_backend.c b/code/renderer/tr_backend.c index b467afb..226a01e 100644 --- a/code/renderer/tr_backend.c +++ b/code/renderer/tr_backend.c @@ -555,7 +555,7 @@ void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs ) { backEnd.pc.c_surfaces += numDrawSurfs; for (i = 0, drawSurf = drawSurfs ; i < numDrawSurfs ; i++, drawSurf++) { - if ( drawSurf->sort == oldSort ) { + if ( (int)drawSurf->sort == oldSort ) { // fast path, same as previous sort rb_surfaceTable[ *drawSurf->surface ]( drawSurf->surface ); continue; diff --git a/code/renderer/tr_bsp.c b/code/renderer/tr_bsp.c index 33e6cfb..ab02f6d 100644 --- a/code/renderer/tr_bsp.c +++ b/code/renderer/tr_bsp.c @@ -1729,7 +1729,7 @@ void R_LoadEntities( lump_t *l ) { // check for remapping of shaders for vertex lighting s = "vertexremapshader"; - if (!Q_strncmp(keyname, s, strlen(s)) ) { + if (!Q_strncmp(keyname, s, (int)strlen(s)) ) { s = strchr(value, ';'); if (!s) { ri.Printf( PRINT_WARNING, "WARNING: no semi colon in vertexshaderremap '%s'\n", value ); @@ -1743,7 +1743,7 @@ void R_LoadEntities( lump_t *l ) { } // check for remapping of shaders s = "remapshader"; - if (!Q_strncmp(keyname, s, strlen(s)) ) { + if (!Q_strncmp(keyname, s, (int)strlen(s)) ) { s = strchr(value, ';'); if (!s) { ri.Printf( PRINT_WARNING, "WARNING: no semi colon in shaderremap '%s'\n", value ); diff --git a/code/renderer/tr_image.c b/code/renderer/tr_image.c index 27fdd3a..b5778a5 100644 --- a/code/renderer/tr_image.c +++ b/code/renderer/tr_image.c @@ -874,7 +874,7 @@ static void LoadBMP( const char *name, byte **pic, int *width, int *height ) { ri.Error( ERR_DROP, "LoadBMP: only Windows-style BMP files supported (%s)\n", name ); } - if ( bmpHeader.fileSize != length ) + if ( (int)bmpHeader.fileSize != length ) { ri.Error( ERR_DROP, "LoadBMP: header size does not match file size (%d vs. %d) (%s)\n", bmpHeader.fileSize, length, name ); } @@ -1655,7 +1655,7 @@ void term_destination (j_compress_ptr cinfo) { my_dest_ptr dest = (my_dest_ptr) cinfo->dest; size_t datacount = dest->size - dest->pub.free_in_buffer; - hackSize = datacount; + hackSize = (int)datacount; } @@ -1811,7 +1811,7 @@ void R_LoadImage( const char *name, byte **pic, int *width, int *height ) { *width = 0; *height = 0; - len = strlen(name); + len = (int)strlen(name); if (len<5) { return; } @@ -1821,7 +1821,7 @@ void R_LoadImage( const char *name, byte **pic, int *width, int *height ) { if (!*pic) { // char altname[MAX_QPATH]; // try jpg in place of tga strcpy( altname, name ); - len = strlen( altname ); + len = (int)strlen( altname ); altname[len-3] = 'j'; altname[len-2] = 'p'; altname[len-1] = 'g'; @@ -1886,7 +1886,7 @@ image_t *R_FindImageFile( const char *name, qboolean mipmap, qboolean allowPicmi char altname[MAX_QPATH]; // copy the name int len; // strcpy( altname, name ); // - len = strlen( altname ); // + len = (int)strlen( altname ); // altname[len-3] = toupper(altname[len-3]); // and try upper case extension for unix systems altname[len-2] = toupper(altname[len-2]); // altname[len-1] = toupper(altname[len-1]); // @@ -2371,7 +2371,7 @@ qhandle_t RE_RegisterSkin( const char *name ) { return 0; } - if ( strlen( name ) >= MAX_QPATH ) { + if ( (int)strlen( name ) >= MAX_QPATH ) { Com_Printf( "Skin name exceeds MAX_QPATH\n" ); return 0; } @@ -2403,7 +2403,7 @@ qhandle_t RE_RegisterSkin( const char *name ) { R_SyncRenderThread(); // If not a .skin file, load as a single shader - if ( strcmp( name + strlen( name ) - 5, ".skin" ) ) { + if ( strcmp( name + (int)strlen( name ) - 5, ".skin" ) ) { skin->numSurfaces = 1; skin->surfaces[0] = ri.Hunk_Alloc( sizeof(skin->surfaces[0]), h_low ); skin->surfaces[0]->shader = R_FindShader( name, LIGHTMAP_NONE, qtrue ); diff --git a/code/renderer/tr_model.c b/code/renderer/tr_model.c index f6fcac4..bf4f2e2 100644 --- a/code/renderer/tr_model.c +++ b/code/renderer/tr_model.c @@ -92,7 +92,7 @@ qhandle_t RE_RegisterModel( const char *name ) { return 0; } - if ( strlen( name ) >= MAX_QPATH ) { + if ( (int)strlen( name ) >= MAX_QPATH ) { Com_Printf( "Model name exceeds MAX_QPATH\n" ); return 0; } @@ -313,7 +313,7 @@ static qboolean R_LoadMD3 (model_t *mod, int lod, void *buffer, const char *mod_ // strip off a trailing _1 or _2 // this is a crutch for q3data being a mess - j = strlen( surf->name ); + j = (int)strlen( surf->name ); if ( j > 2 && surf->name[j-2] == '_' ) { surf->name[j-2] = 0; } diff --git a/code/renderer/tr_shade.c b/code/renderer/tr_shade.c index 0c1feed..d80d8d5 100644 --- a/code/renderer/tr_shade.c +++ b/code/renderer/tr_shade.c @@ -87,7 +87,7 @@ static void R_DrawStripElements( int numIndexes, const glIndex_t *indexes, void if ( !even ) { // check previous triangle to see if we're continuing a strip - if ( ( indexes[i+0] == last[2] ) && ( indexes[i+1] == last[1] ) ) + if ( ( (int)indexes[i+0] == last[2] ) && ( (int)indexes[i+1] == last[1] ) ) { element( indexes[i+2] ); c_vertexes++; @@ -115,7 +115,7 @@ static void R_DrawStripElements( int numIndexes, const glIndex_t *indexes, void else { // check previous triangle to see if we're continuing a strip - if ( ( last[2] == indexes[i+1] ) && ( last[0] == indexes[i+0] ) ) + if ( ( last[2] == (int)indexes[i+1] ) && ( last[0] == (int)indexes[i+0] ) ) { element( indexes[i+2] ); c_vertexes++; diff --git a/code/renderer/tr_shade_calc.c b/code/renderer/tr_shade_calc.c index 79d25f2..89faf0e 100644 --- a/code/renderer/tr_shade_calc.c +++ b/code/renderer/tr_shade_calc.c @@ -296,7 +296,7 @@ void DeformText( const char *text ) { VectorScale( width, height[2] * -0.75f, width ); // determine the starting position - len = strlen( text ); + len = (int)strlen( text ); VectorMA( origin, (len-1), width, origin ); // clear the shader indexes @@ -511,8 +511,8 @@ static void Autosprite2Deform( void ) { // we need to see which direction this edge // is used to determine direction of projection for ( k = 0 ; k < 5 ; k++ ) { - if ( tess.indexes[ indexes + k ] == i + edgeVerts[nums[j]][0] - && tess.indexes[ indexes + k + 1 ] == i + edgeVerts[nums[j]][1] ) { + if ( (int)tess.indexes[ indexes + k ] == i + edgeVerts[nums[j]][0] + && (int)tess.indexes[ indexes + k + 1 ] == i + edgeVerts[nums[j]][1] ) { break; } } diff --git a/code/renderer/tr_shader.c b/code/renderer/tr_shader.c index 88cd682..cfbf57e 100644 --- a/code/renderer/tr_shader.c +++ b/code/renderer/tr_shader.c @@ -2652,7 +2652,7 @@ way to ask for different implicit lighting modes (vertex, lightmap, etc) qhandle_t RE_RegisterShaderLightMap( const char *name, int lightmapIndex ) { shader_t *sh; - if ( strlen( name ) >= MAX_QPATH ) { + if ( (int)strlen( name ) >= MAX_QPATH ) { Com_Printf( "Shader name exceeds MAX_QPATH\n" ); return 0; } @@ -2686,7 +2686,7 @@ way to ask for different implicit lighting modes (vertex, lightmap, etc) qhandle_t RE_RegisterShader( const char *name ) { shader_t *sh; - if ( strlen( name ) >= MAX_QPATH ) { + if ( (int)strlen( name ) >= MAX_QPATH ) { Com_Printf( "Shader name exceeds MAX_QPATH\n" ); return 0; } @@ -2716,7 +2716,7 @@ For menu graphics that should never be picmiped qhandle_t RE_RegisterShaderNoMip( const char *name ) { shader_t *sh; - if ( strlen( name ) >= MAX_QPATH ) { + if ( (int)strlen( name ) >= MAX_QPATH ) { Com_Printf( "Shader name exceeds MAX_QPATH\n" ); return 0; } diff --git a/code/server/sv_ccmds.c b/code/server/sv_ccmds.c index 03bd2c9..ef5e56d 100644 --- a/code/server/sv_ccmds.c +++ b/code/server/sv_ccmds.c @@ -567,7 +567,7 @@ static void SV_Status_f( void ) { // TTimo adding a ^7 to reset the color // NOTE: colored names in status breaks the padding (WONTFIX) Com_Printf ("^7"); - l = 16 - strlen(cl->name); + l = 16 - (int)strlen(cl->name); for (j=0 ; jnetchan.remoteAddress ); Com_Printf ("%s", s); - l = 22 - strlen(s); + l = 22 - (int)strlen(s); for (j=0 ; juserinfo, "handicap"); if (strlen(val)) { i = atoi(val); - if (i<=0 || i>100 || strlen(val) > 4) { + if (i<=0 || i>100 || (int)strlen(val) > 4) { Info_SetValueForKey( cl->userinfo, "handicap", "100" ); } } diff --git a/code/server/sv_init.c b/code/server/sv_init.c index e3a89a6..df08bdb 100644 --- a/code/server/sv_init.c +++ b/code/server/sv_init.c @@ -64,7 +64,7 @@ void SV_SetConfigstring (int index, const char *val) { continue; } - len = strlen( val ); + len = (int)strlen( val ); if( len >= maxChunkSize ) { int sent = 0; int remaining = len; diff --git a/code/server/sv_main.c b/code/server/sv_main.c index d5b7353..2190468 100644 --- a/code/server/sv_main.c +++ b/code/server/sv_main.c @@ -100,7 +100,7 @@ int SV_ReplacePendingServerCommands( client_t *client, const char *cmd ) { for ( i = client->reliableSent+1; i <= client->reliableSequence; i++ ) { index = i & ( MAX_RELIABLE_COMMANDS - 1 ); // - if ( !Q_strncmp(cmd, client->reliableCommands[ index ], strlen("cs")) ) { + if ( !Q_strncmp(cmd, client->reliableCommands[ index ], (int)strlen("cs")) ) { sscanf(cmd, "cs %i", &csnum1); sscanf(client->reliableCommands[ index ], "cs %i", &csnum2); if ( csnum1 == csnum2 ) { @@ -343,7 +343,7 @@ void SVC_Status( netadr_t from ) { ps = SV_GameClientNum( i ); Com_sprintf (player, sizeof(player), "%i %i \"%s\"\n", ps->persistant[PERS_SCORE], cl->ping, cl->name); - playerLength = strlen(player); + playerLength = (int)strlen(player); if (statusLength + playerLength >= sizeof(status) ) { break; // can't hold any more } diff --git a/code/win32/vs/props/shared.props b/code/win32/vs/props/shared.props index 8a6cc9f..8bafe08 100644 --- a/code/win32/vs/props/shared.props +++ b/code/win32/vs/props/shared.props @@ -10,6 +10,9 @@ + + _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + \ No newline at end of file diff --git a/code/win32/win_main.c b/code/win32/win_main.c index 01f2796..d4744f4 100644 --- a/code/win32/win_main.c +++ b/code/win32/win_main.c @@ -75,7 +75,7 @@ void Spk_Printf (const char *text, ...) va_start (argptr,text); vsprintf (buf, text, argptr); - write(fh, buf, strlen(buf)); + write(fh, buf, (int)strlen(buf)); _commit(fh); va_end (argptr); @@ -266,8 +266,8 @@ void Sys_ListFilteredFiles( const char *basedir, char *subdirs, char *filter, ch static qboolean strgtr(const char *s0, const char *s1) { int l0, l1, i; - l0 = strlen(s0); - l1 = strlen(s1); + l0 = (int)strlen(s0); + l1 = (int)strlen(s1); if (l1sa_family = AF_IPX; ((struct sockaddr_ipx *)sadr)->sa_socket = 0; copy[2] = 0; @@ -468,7 +468,7 @@ NET_IPSocket int NET_IPSocket( char *net_interface, int port ) { SOCKET newsocket; struct sockaddr_in address; - qboolean _true = qtrue; + u_long _true = qtrue; int i = 1; int err; @@ -623,8 +623,8 @@ void NET_OpenSocks( int port ) { int plen; // build the request - ulen = strlen( net_socksUsername->string ); - plen = strlen( net_socksPassword->string ); + ulen = (int)strlen( net_socksUsername->string ); + plen = (int)strlen( net_socksPassword->string ); buf[0] = 1; // username/password authentication version buf[1] = ulen; diff --git a/code/win32/win_syscon.c b/code/win32/win_syscon.c index f381973..dd914cf 100644 --- a/code/win32/win_syscon.c +++ b/code/win32/win_syscon.c @@ -114,7 +114,7 @@ static LONG WINAPI ConWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPara if ( ( com_dedicated && com_dedicated->integer ) ) { cmdString = CopyString( "quit" ); - Sys_QueEvent( 0, SE_CONSOLE, 0, 0, strlen( cmdString ) + 1, cmdString ); + Sys_QueEvent( 0, SE_CONSOLE, 0, 0, (int)strlen( cmdString ) + 1, cmdString ); } else if ( s_wcd.quitOnClose ) { @@ -177,7 +177,7 @@ static LONG WINAPI ConWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPara else { cmdString = CopyString( "quit" ); - Sys_QueEvent( 0, SE_CONSOLE, 0, 0, strlen( cmdString ) + 1, cmdString ); + Sys_QueEvent( 0, SE_CONSOLE, 0, 0, (int)strlen( cmdString ) + 1, cmdString ); } } else if ( wParam == CLEAR_ID ) @@ -276,7 +276,7 @@ LONG WINAPI InputLineWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam if ( wParam == 13 ) { GetWindowText( s_wcd.hwndInputLine, inputBuffer, sizeof( inputBuffer ) ); - strncat( s_wcd.consoleText, inputBuffer, sizeof( s_wcd.consoleText ) - strlen( s_wcd.consoleText ) - 5 ); + strncat( s_wcd.consoleText, inputBuffer, sizeof( s_wcd.consoleText ) - (int)strlen( s_wcd.consoleText ) - 5 ); strcat( s_wcd.consoleText, "\n" ); SetWindowText( s_wcd.hwndInputLine, "" ); @@ -507,9 +507,9 @@ void Conbuf_AppendText( const char *pMsg ) // // if the message is REALLY long, use just the last portion of it // - if ( strlen( pMsg ) > CONSOLE_BUFFER_SIZE - 1 ) + if ( (int)strlen( pMsg ) > CONSOLE_BUFFER_SIZE - 1 ) { - msg = pMsg + strlen( pMsg ) - CONSOLE_BUFFER_SIZE + 1; + msg = pMsg + (int)strlen( pMsg ) - CONSOLE_BUFFER_SIZE + 1; } else {