Remove -Wno-pedantic

[xonotic/netradiant.git] / libs / picomodel / lwo / lwo2.c

diff --git a/libs/picomodel/lwo/lwo2.c b/libs/picomodel/lwo/lwo2.c
index 1a1d7601b8acea7bc1bca1fd637c70cd006de045..5299d29718b5fcaaa2bced92aac0d7353bf8ddd8 100644 (file)
--- a/libs/picomodel/lwo/lwo2.c
+++ b/libs/picomodel/lwo/lwo2.c
@@ -11,7 +11,7 @@
 #include "lwo2.h"
 
 /* disable warnings */
-#ifdef _WIN32
+#ifdef WIN32
 #pragma warning( disable:4018 )                /* signed/unsigned mismatch */
 #endif
 
@@ -30,7 +30,7 @@ void lwFreeLayer( lwLayer *layer ){
                }
                lwFreePoints( &layer->point );
                lwFreePolygons( &layer->polygon );
-               lwListFree( layer->vmap, lwFreeVMap );
+               lwListFree(layer->vmap, (void (*)(void *)) lwFreeVMap);
                _pico_free( layer );
        }
 }
@@ -45,10 +45,10 @@ void lwFreeLayer( lwLayer *layer ){
 
 void lwFreeObject( lwObject *object ){
        if ( object ) {
-               lwListFree( object->layer, lwFreeLayer );
-               lwListFree( object->env, lwFreeEnvelope );
-               lwListFree( object->clip, lwFreeClip );
-               lwListFree( object->surf, lwFreeSurface );
+               lwListFree(object->layer, (void (*)(void *)) lwFreeLayer);
+               lwListFree(object->env, (void (*)(void *)) lwFreeEnvelope);
+               lwListFree(object->clip, (void (*)(void *)) lwFreeClip);
+               lwListFree(object->surf, (void (*)(void *)) lwFreeSurface);
                lwFreeTags( &object->taglist );
                _pico_free( object );
        }
@@ -76,12 +76,12 @@ void lwFreeObject( lwObject *object ){
    If you don't need this information, failID and failpos can be NULL.
    ====================================================================== */
 
-lwObject *lwGetObject( char *filename, picoMemStream_t *fp, unsigned int *failID, int *failpos ){
+lwObject *lwGetObject( const char *filename, picoMemStream_t *fp, unsigned int *failID, int *failpos ){
        lwObject *object;
        lwLayer *layer;
        lwNode *node;
-       unsigned int id, formsize, type, cksize;
-       int i, rlen;
+       unsigned int id, formsize, type;
+       int i, rlen, cksize;
 
        /* open the file */
 
@@ -154,7 +154,7 @@ lwObject *lwGetObject( char *filename, picoMemStream_t *fp, unsigned int *failID
                                if ( !layer ) {
                                        goto Fail;
                                }
-                               lwListAdd( &object->layer, layer );
+                               lwListAdd( (void **) &object->layer, layer );
                        }
                        object->nlayers++;
 
@@ -199,7 +199,7 @@ lwObject *lwGetObject( char *filename, picoMemStream_t *fp, unsigned int *failID
                        if ( !node ) {
                                goto Fail;
                        }
-                       lwListAdd( &layer->vmap, node );
+                       lwListAdd( (void **) &layer->vmap, node );
                        layer->nvmaps++;
                        break;
 
@@ -234,7 +234,7 @@ lwObject *lwGetObject( char *filename, picoMemStream_t *fp, unsigned int *failID
                        if ( !node ) {
                                goto Fail;
                        }
-                       lwListAdd( &object->env, node );
+                       lwListAdd( (void **) &object->env, node );
                        object->nenvs++;
                        break;
 
@@ -243,7 +243,7 @@ lwObject *lwGetObject( char *filename, picoMemStream_t *fp, unsigned int *failID
                        if ( !node ) {
                                goto Fail;
                        }
-                       lwListAdd( &object->clip, node );
+                       lwListAdd( (void **) &object->clip, node );
                        object->nclips++;
                        break;
 
@@ -252,7 +252,7 @@ lwObject *lwGetObject( char *filename, picoMemStream_t *fp, unsigned int *failID
                        if ( !node ) {
                                goto Fail;
                        }
-                       lwListAdd( &object->surf, node );
+                       lwListAdd( (void **) &object->surf, node );
                        object->nsurfs++;
                        break;
 
@@ -266,7 +266,7 @@ lwObject *lwGetObject( char *filename, picoMemStream_t *fp, unsigned int *failID
 
                /* end of the file? */
 
-               if ( formsize <= _pico_memstream_tell( fp ) - 8 ) {
+               if ( formsize <= (unsigned int) ( _pico_memstream_tell( fp ) - 8 ) ) {
                        break;
                }
 
@@ -320,8 +320,8 @@ Fail:
        return NULL;
 }
 
-int lwValidateObject( char *filename, picoMemStream_t *fp, unsigned int *failID, int *failpos ){
-       unsigned int id, formsize, type;
+int lwValidateObject( const char *filename, picoMemStream_t *fp, unsigned int *failID, int *failpos ){
+       unsigned int id, type;
 
        /* open the file */
 
@@ -333,7 +333,7 @@ int lwValidateObject( char *filename, picoMemStream_t *fp, unsigned int *failID,
 
        set_flen( 0 );
        id       = getU4( fp );
-       formsize = getU4( fp );
+       /* formsize = */ getU4( fp );
        type     = getU4( fp );
        if ( 12 != get_flen() ) {
                return PICO_PMV_ERROR_SIZE;