Changeset 172:c81b9091035e

Timestamp:

05/17/08 12:49:09 (2 years ago)

Author:

mdoison@…

Branch:

default

Message:

* Fix x86_64 compilation warnings (delroth)

Location:

src

Files:

• game/bg_alloc.c (modified) (1 diff)
• game/g_admin.c (modified) (8 diffs)
• game/g_cmds.c (modified) (2 diffs)
• game/g_local.h (modified) (1 diff)
• game/g_session.c (modified) (2 diffs)
• tools/lcc/cpp/tokens.c (modified) (1 diff)

src/game/bg_alloc.c

@@ -51 +51 @@
 
   freeMemNode_t *fmn, *prev, *next, *smallest;
-  int allocsize, smallestsize;
+  size_t allocsize, smallestsize;
   char *endptr;
   int *ptr;
 
-  allocsize = ( size + sizeof(int) + ROUNDBITS ) & ~ROUNDBITS;    // Round to 32-byte boundary
+  allocsize = ((size_t)( size + sizeof(int) + ROUNDBITS )) & ~ROUNDBITS;    // Round to 32-byte boundary
   ptr = NULL;
 

src/game/g_admin.c

@@ -843 +843 @@
       {
         G_DecolorString( g_admin_levels[ j ]->name, lname );
-        Com_sprintf( lname_fmt, sizeof( lname_fmt ), "%%%is",
+        Com_sprintf( lname_fmt, sizeof( lname_fmt ), "%%%zds",
           ( admin_level_maxname + strlen( g_admin_levels[ j ]->name )
             - strlen( lname ) ) );
@@ -901 +901 @@
       {
         G_DecolorString( g_admin_levels[ j ]->name, lname );
-        Com_sprintf( lname_fmt, sizeof( lname_fmt ), "%%%is",
+        Com_sprintf( lname_fmt, sizeof( lname_fmt ), "%%%zds",
           ( admin_level_maxname + strlen( g_admin_levels[ j ]->name )
             - strlen( lname ) ) );
@@ -2653 +2653 @@
         {
           G_DecolorString( lname, lname2 );
-          Com_sprintf( lname_fmt, sizeof( lname_fmt ), "%%%is",
+          Com_sprintf( lname_fmt, sizeof( lname_fmt ), "%%%zds",
             ( admin_level_maxname + strlen( lname ) - strlen( lname2 ) ) );
           Com_sprintf( lname2, sizeof( lname2 ), lname_fmt, lname );
@@ -2833 +2833 @@
 
     G_DecolorString( g_admin_bans[ i ]->name, n1 );
-    Com_sprintf( name_fmt, sizeof( name_fmt ), "%%%is",
+    Com_sprintf( name_fmt, sizeof( name_fmt ), "%%%zds",
       ( max_name + strlen( g_admin_bans[ i ]->name ) - strlen( n1 ) ) );
     Com_sprintf( n1, sizeof( n1 ), name_fmt, g_admin_bans[ i ]->name );
 
     G_DecolorString( g_admin_bans[ i ]->banner, n2 );
-    Com_sprintf( banner_fmt, sizeof( banner_fmt ), "%%%is",
+    Com_sprintf( banner_fmt, sizeof( banner_fmt ), "%%%zds",
       ( max_banner + strlen( g_admin_bans[ i ]->banner ) - strlen( n2 ) ) );
     Com_sprintf( n2, sizeof( n2 ), banner_fmt, g_admin_bans[ i ]->banner );
@@ -3227 +3227 @@
   }
   
-  trap_SendConsoleCommand( EXEC_APPEND,va( "!setlevel %d %d;",ent - g_entities, level) );
+  trap_SendConsoleCommand( EXEC_APPEND,va( "!setlevel %td %d;",ent - g_entities, level) );
   ClientUserinfoChanged( ent - g_entities );
   
@@ -3262 +3262 @@
     return qfalse;
   }
-  trap_SendConsoleCommand( EXEC_APPEND,va( "!setlevel %d %d;",ent - g_entities, level) );
+  trap_SendConsoleCommand( EXEC_APPEND,va( "!setlevel %td %d;",ent - g_entities, level) );
   ClientUserinfoChanged( ent - g_entities );
   
@@ -3988 +3988 @@
                   ( repeat > 1 ) ? "x" : "", ( repeat > 1 ) ? va( "%d ", repeat ) : "",
                   ( ID ) ? "#" : "", ( ID ) ? va( "%d ", ptr->ID ) : "",
-                  ( builder ) ? "-" : "", ( builder ) ? va( "%d ", builder - g_entities ) : "", 
+                  ( builder ) ? "-" : "", ( builder ) ? va( "%td ", builder - g_entities ) : "", 
                   ( team == TEAM_ALIENS ) ? "a " : ( team == TEAM_HUMANS ) ? "h " : "" );
               ADMP( va( "^3!revert: ^7revert aborted: reverting this %s would conflict with "
@@ -4016 +4016 @@
               ( repeat > 1 ) ? "x" : "", ( repeat > 1 ) ? va( "%d ", repeat ) : "",
               ( ID ) ? "#" : "", ( ID ) ? va( "%d ", ptr->ID ) : "",
-              ( builder ) ? "-" : "", ( builder ) ? va( "%d ", builder - g_entities ) : "", 
+              ( builder ) ? "-" : "", ( builder ) ? va( "%td ", builder - g_entities ) : "", 
               ( team == TEAM_ALIENS ) ? "a " : ( team == TEAM_HUMANS ) ? "h " : "" );
           ADMP( va( "^3!revert: ^7revert aborted: reverting this %s would "

src/game/g_cmds.c

@@ -1251 +1251 @@
     case VOICE_CHAN_LOCAL:
       trap_SendServerCommand( -1, va(
-        "voice %d %d %d %d \"%s\"\n",
+        "voice %td %d %d %d \"%s\"\n",
         ent-g_entities, vchan, cmdNum, trackNum, arg ) );
       break;
     case VOICE_CHAN_TEAM:
       G_TeamCommand( ent->client->pers.teamSelection, va(
-        "voice %d %d %d %d \"%s\"\n",
+        "voice %td %d %d %d \"%s\"\n",
         ent-g_entities, vchan, cmdNum, trackNum, arg ) );
       break;
@@ -3883 +3883 @@
     Q_strcat( str, sizeof( str ), tmpent->client->pers.netname );
     trap_SendServerCommand( pids[ i ], va(
-      "chat \"%s^%c -> ^7%s^7: (%d recipients): ^%c%s^7\" %i",
+      "chat \"%s^%c -> ^7%s^7: (%d recipients): ^%c%s^7\" %td",
       ( ent ) ? ent->client->pers.netname : "Console",
       color,

src/game/g_local.h

@@ -1111 +1111 @@
 extern  gentity_t       g_entities[ MAX_GENTITIES ];
 
-#define FOFS(x) ((int)&(((gentity_t *)0)->x))
+#define FOFS(x) ((long)&(((gentity_t *)0)->x))
 
 extern  vmCvar_t  g_dedicated;

src/game/g_session.c

@@ -55 +55 @@
     );
 
-  var = va( "session%i", client - level.clients );
+  var = va( "session%td", client - level.clients );
 
   trap_Cvar_Set( var, s );
@@ -74 +74 @@
   int restartTeam;
 
-  var = va( "session%i", client - level.clients );
+  var = va( "session%td", client - level.clients );
   trap_Cvar_VariableStringBuffer( var, s, sizeof(s) );
 

src/tools/lcc/cpp/tokens.c

@@ -268 +268 @@
                 fprintf(stderr, "%s ", str);
         if (tp<trp->bp || tp>trp->lp)
-                fprintf(stderr, "(tp offset %d) ", tp-trp->bp);
+                fprintf(stderr, "(tp offset %td) ", tp-trp->bp);
         for (tp=trp->bp; tp<trp->lp && tp<trp->bp+32; tp++) {
                 if (tp->type!=NL) {