[svn-r12314] Purpose:

    Code cleanup

Description:
    Big clean up on high-level library code, including:
        - Removing include of HDF5 private header file(!)
        - Reduce number of compiler warnings
        - Untangle header files, etc.

Platforms tested:
    FreeBSD 4.11 (sleipnir) w/C++
    Linux 2.4/64 (mir) w/C++ & FORTRAN

1 files changed, 4 insertions, 4 deletions

diff --git a/hl/tools/gif2h5/gif2hdf.c b/hl/tools/gif2h5/gif2hdf.c
index 2863b4b..8627548 100644
--- a/hl/tools/gif2h5/gif2hdf.c
+++ b/hl/tools/gif2h5/gif2hdf.c
@@ -52,8 +52,8 @@ main(int argv , char *argc[])
         return(-1);
     }
 
-    strncpy(GIFFileName , argc[1] , VSNAMELENMAX - 1);
-    strncpy(HDFFileName , argc[2] , VSNAMELENMAX - 1);
+    strncpy(GIFFileName , argc[1] , (size_t)(VSNAMELENMAX - 1));
+    strncpy(HDFFileName , argc[2] , (size_t)(VSNAMELENMAX - 1));
     GIFFileName[VSNAMELENMAX - 1] = '\0';
     HDFFileName[VSNAMELENMAX - 1] = '\0';
 
@@ -77,7 +77,7 @@ main(int argv , char *argc[])
         exit (-1);
     }
 
-    if (fread(MemGif,(size_t)filesize,1,fpGif) != 1) {
+    if (fread(MemGif,(size_t)filesize,(size_t)1,fpGif) != 1) {
         printf("Corrupted Input File");
         exit(-1);
     }
@@ -101,7 +101,7 @@ main(int argv , char *argc[])
      * Call WriteHDF from here. Go ahead and change WriteHDF to write whatever
      * format you want
      */
-    if (WriteHDF(GifMemoryStruct , argc[2] , argc[1]))
+    if (WriteHDF(GifMemoryStruct , argc[2]))
         printf("HDF Write Error\n\n");
 
     /* Free all buffers */