Urre admits he was inebriated and his judgment hencely impaired when he suggested...

[xonotic/darkplaces.git] / prvm_cmds.c

diff --git a/prvm_cmds.c b/prvm_cmds.c
index 8e07db729d6cc20b8c113c7995d5b6957a6b1c81..fbb54af8c51edbd360552703c9a8e2203c42da5b 100644 (file)
--- a/prvm_cmds.c
+++ b/prvm_cmds.c
@@ -76,7 +76,7 @@ static qboolean checkextension(const char *name)
 {
        int len;
        char *e, *start;
-       len = strlen(name);
+       len = (int)strlen(name);
 
        for (e = prog->extensionstring;*e;e++)
        {
@@ -87,11 +87,8 @@ static qboolean checkextension(const char *name)
                start = e;
                while (*e && *e != ' ')
                        e++;
-               if (e - start == len)
-                       if (!strncasecmp(start, name, len))
-                       {
-                               return true;
-                       }
+               if ((e - start) == len && !strncasecmp(start, name, len))
+                       return true;
        }
        return false;
 }
@@ -545,7 +542,7 @@ VM_cvar_defstring
 const string   VM_cvar_defstring (string)
 ========================
 */
-void VM_cvar_defstring (void) 
+void VM_cvar_defstring (void)
 {
        char *out;
        const char *name;
@@ -1698,7 +1695,7 @@ void VM_fputs(void)
                return;
        }
        VM_VarString(1, string, sizeof(string));
-       if ((stringlength = strlen(string)))
+       if ((stringlength = (int)strlen(string)))
                FS_Write(VM_FILES[filenum], string, stringlength);
        if (developer.integer)
                Con_Printf("fputs: %s: %s\n", PRVM_NAME, string);
@@ -1873,7 +1870,7 @@ int num_tokens = 0;
 char *tokens[256], tokenbuf[4096];
 void VM_tokenize (void)
 {
-       int pos;
+       size_t pos;
        const char *p;
 
        VM_SAFEPARMCOUNT(1,VM_tokenize);