[svn-r4978] Purpose:

    Code cleanup
Description:
    Cleanup compiler warnings found by the SGI compiler and gcc 3.0
Platforms tested:
    FreeBSD 4.5 w/gcc 3.0 (hack) && IRIX64 (modi4)

2 files changed, 8 insertions, 6 deletions

diff --git a/tools/gifconv/hdf2gif.c b/tools/gifconv/hdf2gif.c
index cc7bab4..40051dc 100644
--- a/tools/gifconv/hdf2gif.c
+++ b/tools/gifconv/hdf2gif.c
@@ -22,9 +22,6 @@
 #define MAX_FILE_LEN            256
 #define MAX_NUMBER_IMAGES       50
 
-extern int hdfWriteGIF(FILE *fp, BYTE *pic, int ptype, int w, int h,
-                       BYTE *rmap, BYTE *gmap, BYTE *bmap, BYTE *pc2ncmap,
-                       int numcols, int colorstyle, int BitsPerPixel);
 int EndianOrder;
 
 #ifdef NOT_USED
@@ -67,7 +64,6 @@ int main(int argc , char **argv)
 
     /* reference variables */
     int has_local_palette;  /* treated as a flag */
-    int loop_times;         /* number of times to loop, treat it as yes/no */
 
     BYTE* b;
 
@@ -304,10 +300,8 @@ int main(int argc , char **argv)
             /* Write out the GIF header and logical screen descriptor */
             if (n_images > 1) {
                 fwrite("GIF89a", 1, 6, fpGif);  /* the GIF magic number */
-                loop_times = 0;
             } else {
                 fwrite("GIF87a", 1, 6, fpGif);  /* the GIF magic number */
-                loop_times = 1;
             }
 
             putword(RWidth, fpGif);             /* screen descriptor */
diff --git a/tools/gifconv/hdfgifwr.c b/tools/gifconv/hdfgifwr.c
index 9804098..0ce13be 100644
--- a/tools/gifconv/hdfgifwr.c
+++ b/tools/gifconv/hdfgifwr.c
@@ -101,6 +101,14 @@ int hdfWriteGIF(FILE *fp, byte *pic, int ptype, int w, int h, byte *rmap,
     int i;
     byte *pic8 = pic;
 
+    /* Shut compiler up... */
+    ptype=ptype;
+    rmap=rmap;
+    gmap=gmap;
+    bmap=bmap;
+    numcols=numcols;
+    colorstyle=colorstyle;
+
 #ifdef UNUSED
     Interlace = 0;
     Background = 0;