1 files changed, 25 insertions, 38 deletions

diff --git a/hl/tools/gif2h5/gif2hdf.c b/hl/tools/gif2h5/gif2hdf.c
index 8a9e971..9220655 100644
--- a/hl/tools/gif2h5/gif2hdf.c
+++ b/hl/tools/gif2h5/gif2hdf.c
@@ -1,16 +1,13 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 #include <string.h>
 #include <stdio.h>
@@ -20,11 +17,10 @@
 #include "h5tools.h"
 #include "h5tools_utils.h"
 
-
 int
-main(int argv , char *argc[])
+main(int argv, char *argc[])
 {
-    GIFTOMEM GifMemoryStruct;
+    GIFTOMEM     GifMemoryStruct;
     GIFIMAGEDESC gifImageDesc;
 
     FILE *fpGif;
@@ -33,8 +29,8 @@ main(int argv , char *argc[])
     long i, ImageCount;
     long filesize;
 
-    BYTE *MemGif;
-    BYTE *StartPos;
+    GIFBYTE *MemGif;
+    GIFBYTE *StartPos;
 
     char *GIFFileName;
     char *HDFFileName;
@@ -53,11 +49,9 @@ main(int argv , char *argc[])
     /* Initialize h5tools lib */
     h5tools_init();
 
-    if ( argc[1] && (strcmp("-V",argc[1])==0) )
-    {
+    if (argc[1] && (strcmp("-V", argc[1]) == 0)) {
         print_version("gif2h5");
         exit(EXIT_SUCCESS);
-
     }
 
     if (argv < 3) {
@@ -70,30 +64,30 @@ main(int argv , char *argc[])
     GIFFileName = argc[1];
     HDFFileName = argc[2];
 
-    if (!(fpGif = fopen(GIFFileName,"rb"))) {
+    if (!(fpGif = fopen(GIFFileName, "rb"))) {
         printf("Unable to open GIF file for reading.\n");
         exit(EXIT_FAILURE);
     }
 
     /* Get the whole file into memory. Mem's much faster than I/O */
-    fseek(fpGif, 0L , 2);
+    fseek(fpGif, 0L, 2);
     filesize = ftell(fpGif);
-    fseek(fpGif, 0L , 0);
+    fseek(fpGif, 0L, 0);
 
     if (filesize == 0)
         printf("File Size Zero");
 
-    if (!(MemGif = StartPos = (BYTE *)malloc((size_t)filesize))) {
+    if (!(MemGif = StartPos = (GIFBYTE *)malloc((size_t)filesize))) {
         printf("Out of memory");
         exit(EXIT_FAILURE);
     }
 
-    if (fread(MemGif,(size_t)filesize,1,fpGif) != 1) {
+    if (fread(MemGif, (size_t)filesize, 1, fpGif) != 1) {
         printf("Corrupted Input File");
         exit(EXIT_FAILURE);
     }
 
-    fseek(fpGif,0L,0);
+    fseek(fpGif, 0L, 0);
 
     /*
      * Call Gif2Mem and break the whole file into parts.  Gif2Mem also calls
@@ -102,8 +96,8 @@ main(int argv , char *argc[])
     Gif2Mem(MemGif, &GifMemoryStruct);
 
     if (ferror(fpGif)) {
-            printf("File Stream Error\n\n");
-            exit(EXIT_FAILURE);
+        printf("File Stream Error\n\n");
+        exit(EXIT_FAILURE);
     }
 
     fclose(fpGif);
@@ -112,54 +106,47 @@ main(int argv , char *argc[])
      * Call WriteHDF from here. Go ahead and change WriteHDF to write whatever
      * format you want
      */
-    if (WriteHDF(GifMemoryStruct , HDFFileName))
+    if (WriteHDF(GifMemoryStruct, HDFFileName))
         printf("HDF Write Error\n\n");
 
     /* Free all buffers */
     /* replacing int32 with long */
     ImageCount = (long)((GifMemoryStruct.GifHeader)->ImageCount);
 
-    for(i = 0; i < ImageCount ; i++) {
+    for (i = 0; i < ImageCount; i++) {
         gifImageDesc = *(GifMemoryStruct.GifImageDesc[i]);
 
         if (gifImageDesc.Image != NULL)
             free(gifImageDesc.Image);
 
-        if (GifMemoryStruct.GifImageDesc[i] != NULL)
-        {
+        if (GifMemoryStruct.GifImageDesc[i] != NULL) {
             free(GifMemoryStruct.GifImageDesc[i]);
             GifMemoryStruct.GifImageDesc[i] = NULL;
         }
 
-        if (GifMemoryStruct.GifGraphicControlExtension[i] != NULL)
-        {
+        if (GifMemoryStruct.GifGraphicControlExtension[i] != NULL) {
             free(GifMemoryStruct.GifGraphicControlExtension[i]);
             GifMemoryStruct.GifGraphicControlExtension[i] = NULL;
         }
     }
 
     free(StartPos);
-    if (GifMemoryStruct.GifHeader != NULL)
-    {
+    if (GifMemoryStruct.GifHeader != NULL) {
         free(GifMemoryStruct.GifHeader);
         GifMemoryStruct.GifHeader = NULL;
     }
-    if (GifMemoryStruct.GifApplicationExtension != NULL)
-    {
+    if (GifMemoryStruct.GifApplicationExtension != NULL) {
         free(GifMemoryStruct.GifApplicationExtension);
         GifMemoryStruct.GifApplicationExtension = NULL;
     }
-    if (GifMemoryStruct.GifImageDesc != NULL)
-    {
+    if (GifMemoryStruct.GifImageDesc != NULL) {
         free(GifMemoryStruct.GifImageDesc);
         GifMemoryStruct.GifImageDesc = NULL;
     }
-    if (GifMemoryStruct.GifGraphicControlExtension != NULL)
-    {
+    if (GifMemoryStruct.GifGraphicControlExtension != NULL) {
         free(GifMemoryStruct.GifGraphicControlExtension);
         GifMemoryStruct.GifGraphicControlExtension = NULL;
     }
 
-
     return EXIT_SUCCESS;
 }