fixed several warnings that appear with -std=gnu99 -pedantic

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9049 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/cl_gecko.c b/cl_gecko.c
index 90d25a04b241a997f496166cae0d2e40bf4c52c6..d17bf9641e9c7bd7e0764b344ca05e58631a715b 100644 (file)
--- a/cl_gecko.c
+++ b/cl_gecko.c
@@ -325,7 +325,7 @@ OSGK_DERIVEDTYPE(OSGK_ScriptObjectTemplate);
 typedef enum OSGK_ScriptResult
 {
   srSuccess = 0,
-  srFailed = 0x80004005L /* actually NS_ERROR_FAILURE */
+  srFailed = (int)0x80004005L /* actually NS_ERROR_FAILURE */
 } OSGK_ScriptResult;
 
 typedef struct OSGK_ScriptObjectCreateParams_s

diff --git a/cl_main.c b/cl_main.c
index 768b2004b9d4ff95e250453d769e1e7b6189bfdf..0cb016a842b007468bba7595d6df6149184da3ee 100644 (file)
--- a/cl_main.c
+++ b/cl_main.c
@@ -1918,7 +1918,7 @@ void CL_Locs_FreeNode(cl_locnode_t *node)
                        return;
                }
        }
-       Con_Printf("CL_Locs_FreeNode: no such node! (%p)\n", node);
+       Con_Printf("CL_Locs_FreeNode: no such node! (%p)\n", (void *)node);
 }
 
 void CL_Locs_AddNode(vec3_t mins, vec3_t maxs, const char *name)

diff --git a/cl_particles.c b/cl_particles.c
index ead812f1a5dd470e68f17d128876710954648d93..bf4f83dffc6836a5b8af773aa419225439e2991e 100644 (file)
--- a/cl_particles.c
+++ b/cl_particles.c
@@ -446,7 +446,7 @@ void CL_Particles_LoadEffectInfo(void)
                CL_Particles_ParseEffectInfo((const char *)filedata, (const char *)filedata + filesize);
                Mem_Free(filedata);
        }
-};
+}
 
 /*
 ===============

diff --git a/clvm_cmds.c b/clvm_cmds.c
index 5af7205ce4d6a9f9e38897bc7ac4c919df3ef24a..ccef8d5ee0502e4559031e8cdfe8ff7ecf032702 100644 (file)
--- a/clvm_cmds.c
+++ b/clvm_cmds.c
@@ -2182,7 +2182,7 @@ int CL_GetTagIndex (prvm_edict_t *e, const char *tagname)
                return Mod_Alias_GetTagIndexForName(model, (int)e->fields.client->skin, tagname);
        else
                return -1;
-};
+}
 
 int CL_GetExtendedTagInfo (prvm_edict_t *e, int tagindex, int *parentindex, const char **tagname, matrix4x4_t *tag_localmatrix)
 {

diff --git a/gl_backend.c b/gl_backend.c
index 8e00108cbb92b5549e6f7be20fcc837c0b60de18..89b789c30c66a30673e4398ea5131f77198accf1 100644 (file)
--- a/gl_backend.c
+++ b/gl_backend.c
@@ -1091,7 +1091,7 @@ void R_Mesh_Draw(int firstvertex, int numvertices, int firsttriangle, int numtri
        if (numvertices < 3 || numtriangles < 1)
        {
                if (numvertices < 0 || numtriangles < 0 || developer.integer >= 100)
-                       Con_Printf("R_Mesh_Draw(%d, %d, %d, %d, %8p, %8p, %i, %i);\n", firstvertex, numvertices, firsttriangle, numtriangles, element3i, element3s, bufferobject3i, bufferobject3s);
+                       Con_Printf("R_Mesh_Draw(%d, %d, %d, %d, %8p, %8p, %i, %i);\n", firstvertex, numvertices, firsttriangle, numtriangles, (void *)element3i, (void *)element3s, bufferobject3i, bufferobject3s);
                return;
        }
        if (!gl_mesh_prefer_short_elements.integer)

diff --git a/gl_textures.c b/gl_textures.c
index fe13aca500ea487f28821db2deb3aa87fe648aed..f86ee1f6c1a2be6f9f3a8084faea7b91f744047c 100644 (file)
--- a/gl_textures.c
+++ b/gl_textures.c
@@ -556,7 +556,7 @@ void R_TextureStats_Print(qboolean printeach, qboolean printpool, qboolean print
                                Con_Printf("%c%4i%c%c%4i%c %s %s %s %s\n", isloaded ? '[' : ' ', (glsize + 1023) / 1024, isloaded ? ']' : ' ', glt->inputtexels ? '[' : ' ', (glt->inputdatasize + 1023) / 1024, glt->inputtexels ? ']' : ' ', isloaded ? "loaded" : "      ", (glt->flags & TEXF_MIPMAP) ? "mip" : "   ", (glt->flags & TEXF_ALPHA) ? "alpha" : "     ", glt->identifier);
                }
                if (printpool)
-                       Con_Printf("texturepool %10p total: %i (%.3fMB, %.3fMB original), uploaded %i (%.3fMB, %.3fMB original), upload on demand %i (%.3fMB, %.3fMB original)\n", pool, pooltotal, pooltotalt / 1048576.0, pooltotalp / 1048576.0, poolloaded, poolloadedt / 1048576.0, poolloadedp / 1048576.0, pooltotal - poolloaded, (pooltotalt - poolloadedt) / 1048576.0, (pooltotalp - poolloadedp) / 1048576.0);
+                       Con_Printf("texturepool %10p total: %i (%.3fMB, %.3fMB original), uploaded %i (%.3fMB, %.3fMB original), upload on demand %i (%.3fMB, %.3fMB original)\n", (void *)pool, pooltotal, pooltotalt / 1048576.0, pooltotalp / 1048576.0, poolloaded, poolloadedt / 1048576.0, poolloadedp / 1048576.0, pooltotal - poolloaded, (pooltotalt - poolloadedt) / 1048576.0, (pooltotalp - poolloadedp) / 1048576.0);
                sumtotal += pooltotal;
                sumtotalt += pooltotalt;
                sumtotalp += pooltotalp;

diff --git a/host_cmd.c b/host_cmd.c
index b3b7b9bb0a8e45e720f31da697c870a7d6cc2f1d..949c4802cda10906b1ab76b66150a95ceac4a2f1 100644 (file)
--- a/host_cmd.c
+++ b/host_cmd.c
@@ -2660,7 +2660,7 @@ void Host_Packet_f (void) // credit: taken from QuakeWorld
 
        in = Cmd_Argv(2);
        out = send+4;
-       send[0] = send[1] = send[2] = send[3] = 0xff;
+       send[0] = send[1] = send[2] = send[3] = -1;
 
        l = (int)strlen (in);
        for (i=0 ; i<l ; i++)

diff --git a/image_png.c b/image_png.c
index 593bb59419b63a2c495694a7f9780010ff1d7de5..c7acf47947ab91be2c15e47c5efd7c990b5f68f3 100644 (file)
--- a/image_png.c
+++ b/image_png.c
@@ -32,7 +32,7 @@
 
 static void                            (*qpng_set_sig_bytes)           (void*, int);
 static int                             (*qpng_sig_cmp)                         (const unsigned char*, size_t, size_t);
-static void*                   (*qpng_create_read_struct)      (const char*, void*, void*, void*);
+static void*                   (*qpng_create_read_struct)      (const char*, void*, void(*)(void *png, const char *message), void(*)(void *png, const char *message));
 static void*                   (*qpng_create_info_struct)      (void*);
 static void                            (*qpng_read_info)                       (void*, void*);
 static void                            (*qpng_set_expand)                      (void*);
@@ -45,7 +45,7 @@ static void                           (*qpng_read_update_info)        (void*, void*);
 static void                            (*qpng_read_image)                      (void*, unsigned char**);
 static void                            (*qpng_read_end)                        (void*, void*);
 static void                            (*qpng_destroy_read_struct)     (void**, void**, void**);
-static void                            (*qpng_set_read_fn)                     (void*, void*, void*);
+static void                            (*qpng_set_read_fn)                     (void*, void*, void(*)(void *png, unsigned char *data, size_t length));
 static unsigned int            (*qpng_get_valid)                       (void*, void*, unsigned int);
 static unsigned int            (*qpng_get_rowbytes)            (void*, void*);
 static unsigned char   (*qpng_get_channels)            (void*, void*);
@@ -238,7 +238,7 @@ unsigned char *PNG_LoadImage_BGRA (const unsigned char *raw, int filesize)
 
        if(qpng_sig_cmp(raw, 0, filesize))
                return NULL;
-       png = (void *)qpng_create_read_struct(PNG_LIBPNG_VER_STRING, 0, (void *)PNG_error_fn, (void *)PNG_warning_fn);
+       png = (void *)qpng_create_read_struct(PNG_LIBPNG_VER_STRING, 0, PNG_error_fn, PNG_warning_fn);
        if(!png)
                return NULL;
 
@@ -288,7 +288,7 @@ unsigned char *PNG_LoadImage_BGRA (const unsigned char *raw, int filesize)
        //my_png.Interlace      = 0;
        //my_png.Compression    = 0;
        //my_png.Filter         = 0;
-       qpng_set_read_fn(png, ioBuffer, (void *)PNG_fReadData);
+       qpng_set_read_fn(png, ioBuffer, PNG_fReadData);
        qpng_read_info(png, pnginfo);
        qpng_get_IHDR(png, pnginfo, &my_png.Width, &my_png.Height,&my_png.BitDepth, &my_png.ColorType, &my_png.Interlace, &my_png.Compression, &my_png.Filter);
 

diff --git a/menu.c b/menu.c
index f1190de89e9cd639b2af4901962dde4394b2a7d2..936e0d70a6a7eaf5a5ad72148c94e597b3d677c1 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -3177,7 +3177,7 @@ static int M_ChooseQuitMessage(int request)
                break;
        }
        return 0;
-};
+}
 
 void M_Menu_Quit_f (void)
 {

diff --git a/model_brush.c b/model_brush.c
index 6049834bbdfcdbb8f260777a71bd5d7bf8ac3590..612caa2da10b794f48917897d2787ffa39413903 100644 (file)
--- a/model_brush.c
+++ b/model_brush.c
@@ -2611,7 +2611,7 @@ static void Mod_Q1BSP_LoadLeafs(lump_t *l)
 
                out->firstleafsurface = loadmodel->brush.data_leafsurfaces + (unsigned short)LittleShort(in->firstmarksurface);
                out->numleafsurfaces = (unsigned short)LittleShort(in->nummarksurfaces);
-               if (out->firstleafsurface < 0 || (unsigned short)LittleShort(in->firstmarksurface) + out->numleafsurfaces > loadmodel->brush.num_leafsurfaces)
+               if ((unsigned short)LittleShort(in->firstmarksurface) + out->numleafsurfaces > loadmodel->brush.num_leafsurfaces)
                {
                        Con_Printf("Mod_Q1BSP_LoadLeafs: invalid leafsurface range %i:%i outside range %i:%i\n", (int)(out->firstleafsurface - loadmodel->brush.data_leafsurfaces), (int)(out->firstleafsurface + out->numleafsurfaces - loadmodel->brush.data_leafsurfaces), 0, loadmodel->brush.num_leafsurfaces);
                        out->firstleafsurface = NULL;

diff --git a/netconn.c b/netconn.c
index fc2b34c320f6b368047fe5f4fb584bc312cdd69b..1820db4c3674ae898081b2aa88a505c9ae86a377 100755 (executable)
--- a/netconn.c
+++ b/netconn.c
@@ -554,11 +554,11 @@ int NetConn_Read(lhnetsocket_t *mysocket, void *data, int maxlength, lhnetaddres
                if (length > 0)
                {
                        LHNETADDRESS_ToString(peeraddress, addressstring2, sizeof(addressstring2), true);
-                       Con_Printf("LHNET_Read(%p (%s), %p, %i, %p) = %i from %s:\n", mysocket, addressstring, data, maxlength, peeraddress, length, addressstring2);
+                       Con_Printf("LHNET_Read(%p (%s), %p, %i, %p) = %i from %s:\n", (void *)mysocket, addressstring, (void *)data, maxlength, (void *)peeraddress, length, addressstring2);
                        Com_HexDumpToConsole((unsigned char *)data, length);
                }
                else
-                       Con_Printf("LHNET_Read(%p (%s), %p, %i, %p) = %i\n", mysocket, addressstring, data, maxlength, peeraddress, length);
+                       Con_Printf("LHNET_Read(%p (%s), %p, %i, %p) = %i\n", (void *)mysocket, addressstring, (void *)data, maxlength, (void *)peeraddress, length);
        }
        return length;
 }
@@ -577,7 +577,7 @@ int NetConn_Write(lhnetsocket_t *mysocket, const void *data, int length, const l
                char addressstring[128], addressstring2[128];
                LHNETADDRESS_ToString(LHNET_AddressFromSocket(mysocket), addressstring, sizeof(addressstring), true);
                LHNETADDRESS_ToString(peeraddress, addressstring2, sizeof(addressstring2), true);
-               Con_Printf("LHNET_Write(%p (%s), %p, %i, %p (%s)) = %i%s\n", mysocket, addressstring, data, length, peeraddress, addressstring2, length, ret == length ? "" : " (ERROR)");
+               Con_Printf("LHNET_Write(%p (%s), %p, %i, %p (%s)) = %i%s\n", (void *)mysocket, addressstring, (void *)data, length, (void *)peeraddress, addressstring2, length, ret == length ? "" : " (ERROR)");
                Com_HexDumpToConsole((unsigned char *)data, length);
        }
        return ret;

diff --git a/svvm_cmds.c b/svvm_cmds.c
index 19837c3d22b1d579b59bf1c118e4dd1bd476177b..f870319a612e9900a7b662ef8ccef35c4431adf8 100644 (file)
--- a/svvm_cmds.c
+++ b/svvm_cmds.c
@@ -2793,7 +2793,7 @@ static void VM_SV_gettagindex (void)
                                Con_Printf("gettagindex(entity #%i): tag \"%s\" not found\n", PRVM_NUM_FOR_EDICT(ent), tag_name);
        }
        PRVM_G_FLOAT(OFS_RETURN) = tag_index;
-};
+}
 
 //vector(entity ent, float tagindex) gettaginfo;
 static void VM_SV_gettaginfo (void)

diff --git a/vid_sdl.c b/vid_sdl.c
index 5fd6230bc5f380007b764a94bb727229cadfc440..2ab7be84cb6f65b809c6fb80f493b9d9eac510d9 100644 (file)
--- a/vid_sdl.c
+++ b/vid_sdl.c
@@ -537,7 +537,7 @@ static void VID_SetIcon()
 
        for(i = 0; i < colors; ++i)
        {
-               int r, g, b;
+               unsigned int r, g, b;
                char idx;
 
                if(sscanf(idata[i+1], "%c c #%02x%02x%02x", &idx, &r, &g, &b) != 4)

diff --git a/world.c b/world.c
index a9192494a5535e31cb2b25fc5668aa2dd846cbd5..52e25354c374d79043b0494f51677a9d37700e86 100644 (file)
--- a/world.c
+++ b/world.c
@@ -235,7 +235,7 @@ void World_LinkEdict_AreaGrid(world_t *world, prvm_edict_t *ent)
 
        if (entitynumber <= 0 || entitynumber >= prog->max_edicts || PRVM_EDICT_NUM(entitynumber) != ent)
        {
-               Con_Printf ("SV_LinkEdict_AreaGrid: invalid edict %p (edicts is %p, edict compared to prog->edicts is %i)\n", ent, prog->edicts, entitynumber);
+               Con_Printf ("SV_LinkEdict_AreaGrid: invalid edict %p (edicts is %p, edict compared to prog->edicts is %i)\n", (void *)ent, (void *)prog->edicts, entitynumber);
                return;
        }
 

diff --git a/zone.c b/zone.c
index 74bc06e1837e44f0b35e27bfaaa0afb0dca34ca0..1db8359b0ca0c8000c476cccc6bb347a3713f2a2 100644 (file)
--- a/zone.c
+++ b/zone.c
@@ -601,7 +601,7 @@ void Mem_PrintStats(void)
        {
                if ((pool->flags & POOLFLAG_TEMP) && pool->chain)
                {
-                       Con_Printf("Memory pool %p has sprung a leak totalling %lu bytes (%.3fMB)!  Listing contents...\n", pool, (unsigned long)pool->totalsize, pool->totalsize / 1048576.0);
+                       Con_Printf("Memory pool %p has sprung a leak totalling %lu bytes (%.3fMB)!  Listing contents...\n", (void *)pool, (unsigned long)pool->totalsize, pool->totalsize / 1048576.0);
                        for (mem = pool->chain;mem;mem = mem->next)
                                Con_Printf("%10lu bytes allocated at %s:%i\n", (unsigned long)mem->size, mem->filename, mem->fileline);
                }