Develop clang 13 format (#1933)

* Update format source to clang 13

* More format changes

7 files changed, 28 insertions, 28 deletions

diff --git a/hl/tools/gif2h5/decompress.c b/hl/tools/gif2h5/decompress.c
index ca33f86..9d55ab8 100644
--- a/hl/tools/gif2h5/decompress.c
+++ b/hl/tools/gif2h5/decompress.c
@@ -17,7 +17,7 @@
 
 GIFWORD       iWIDE, iHIGH, eWIDE, eHIGH, expand, numcols, strip, nostrip;
 unsigned long cols[256];
-char *        cmd;
+char         *cmd;
 
 FILE *fp;
 
diff --git a/hl/tools/gif2h5/gif.h b/hl/tools/gif2h5/gif.h
index 5ea8633..b193d8d 100644
--- a/hl/tools/gif2h5/gif.h
+++ b/hl/tools/gif2h5/gif.h
@@ -133,12 +133,12 @@ typedef struct _GifCommentExtension {
 **           extension.
 */
 typedef struct _GifToMem {
-    GIFHEAD *           GifHeader;
-    GIFIMAGEDESC **     GifImageDesc;
+    GIFHEAD            *GifHeader;
+    GIFIMAGEDESC      **GifImageDesc;
     GIFGRAPHICCONTROL **GifGraphicControlExtension;
-    GIFPLAINTEXT **     GifPlainTextExtension;
-    GIFAPPLICATION **   GifApplicationExtension;
-    GIFCOMMENT **       GifCommentExtension;
+    GIFPLAINTEXT      **GifPlainTextExtension;
+    GIFAPPLICATION    **GifApplicationExtension;
+    GIFCOMMENT        **GifCommentExtension;
 } GIFTOMEM;
 
 /*
diff --git a/hl/tools/gif2h5/gif2mem.c b/hl/tools/gif2h5/gif2mem.c
index 44e18e0..82cb15b 100644
--- a/hl/tools/gif2h5/gif2mem.c
+++ b/hl/tools/gif2h5/gif2mem.c
@@ -42,11 +42,11 @@ Gif2Mem(GIFBYTE *MemGif, GIFTOMEM *GifMemoryStruct)
      * The gif structure outline for passing data to memory is given in gif.h.
      * These pointers are redundant, should take them out in ver. 2
      */
-    GIFHEAD *           gifHead;           /* GIF Header structure            */
-    GIFIMAGEDESC **     gifImageDesc;      /* Logical Image Descriptor struct */
-    GIFPLAINTEXT **     gifPlainText;      /* Plain Text Extension structure  */
-    GIFAPPLICATION **   gifApplication;    /* Application Extension structure */
-    GIFCOMMENT **       gifComment;        /* Comment Extension structure     */
+    GIFHEAD            *gifHead;           /* GIF Header structure            */
+    GIFIMAGEDESC      **gifImageDesc;      /* Logical Image Descriptor struct */
+    GIFPLAINTEXT      **gifPlainText;      /* Plain Text Extension structure  */
+    GIFAPPLICATION    **gifApplication;    /* Application Extension structure */
+    GIFCOMMENT        **gifComment;        /* Comment Extension structure     */
     GIFGRAPHICCONTROL **gifGraphicControl; /* Graphic Control Extension strct */
 
     GIFWORD  i;          /* Loop counter                                 */
diff --git a/hl/tools/gif2h5/gifread.c b/hl/tools/gif2h5/gifread.c
index 3a6bcae..3e1a477 100644
--- a/hl/tools/gif2h5/gifread.c
+++ b/hl/tools/gif2h5/gifread.c
@@ -54,7 +54,7 @@ GetByte(const GIFBYTE *MemGif)
  *           otherwise 0 if no error occurred.
  */
 int
-ReadGifHeader(GIFHEAD * GifHead, /* Pointer to GIF header structure  */
+ReadGifHeader(GIFHEAD  *GifHead, /* Pointer to GIF header structure  */
               GIFBYTE **MemGif2) /* GIF image file input FILE stream */
 {
     GIFWORD i;         /* Loop counter                                */
@@ -121,7 +121,7 @@ ReadGifHeader(GIFHEAD * GifHead, /* Pointer to GIF header structure  */
 */
 int
 ReadGifImageDesc(GIFIMAGEDESC *GifImageDesc, /* Pointer to GIF image descriptor structure  */
-                 GIFBYTE **    MemGif2       /* GIF image file input FILE stream           */
+                 GIFBYTE     **MemGif2       /* GIF image file input FILE stream           */
 )
 {
     GIFWORD i;               /* Loop counter                               */
@@ -210,7 +210,7 @@ ReadGifImageDesc(GIFIMAGEDESC *GifImageDesc, /* Pointer to GIF image descriptor
 */
 int
 ReadGifGraphicControl(GIFGRAPHICCONTROL *GifGraphicControl, /* Pointer to GC Extension structure */
-                      GIFBYTE **         MemGif2            /* GIF image file input FILE stream  */
+                      GIFBYTE          **MemGif2            /* GIF image file input FILE stream  */
 )
 {
     int i;
@@ -233,7 +233,7 @@ ReadGifGraphicControl(GIFGRAPHICCONTROL *GifGraphicControl, /* Pointer to GC Ext
 */
 int
 ReadGifPlainText(GIFPLAINTEXT *GifPlainText, /* Pointer to Plain Text Extension structure */
-                 GIFBYTE **    MemGif2       /* GIF image file input FILE stream          */
+                 GIFBYTE     **MemGif2       /* GIF image file input FILE stream          */
 )
 {
     int i;
@@ -270,7 +270,7 @@ ReadGifPlainText(GIFPLAINTEXT *GifPlainText, /* Pointer to Plain Text Extension
 */
 int
 ReadGifApplication(GIFAPPLICATION *GifApplication, /* Pointer to Application Extension structure */
-                   GIFBYTE **      MemGif2         /* GIF image file input FILE stream           */
+                   GIFBYTE       **MemGif2         /* GIF image file input FILE stream           */
 )
 {
     int i;
@@ -306,7 +306,7 @@ ReadGifApplication(GIFAPPLICATION *GifApplication, /* Pointer to Application Ext
 */
 int
 ReadGifComment(GIFCOMMENT *GifComment, /* Pointer to GIF Comment Extension structure */
-               GIFBYTE **  MemGif2     /* GIF image file input FILE stream           */
+               GIFBYTE   **MemGif2     /* GIF image file input FILE stream           */
 )
 {
 
@@ -331,7 +331,7 @@ ReadGifComment(GIFCOMMENT *GifComment, /* Pointer to GIF Comment Extension struc
 */
 static GIFBYTE *
 ReadDataSubBlocks(GIFBYTE **MemGif2, /* GIF image file input FILE stream              */
-                  GIFWORD * DSize)
+                  GIFWORD  *DSize)
 {
     GIFBYTE *ptr1;     /* Pointer used to "walk the heap"               */
     GIFBYTE *ptr2;     /* Pointer used to mark the top of the heap      */
diff --git a/hl/tools/gif2h5/hdfgifwr.c b/hl/tools/gif2h5/hdfgifwr.c
index 7126da9..313606f 100644
--- a/hl/tools/gif2h5/hdfgifwr.c
+++ b/hl/tools/gif2h5/hdfgifwr.c
@@ -83,7 +83,7 @@ static int maxbits = XV_BITS;         /* user settable max # bits/code */
 static int maxcode;                   /* maximum code, given n_bits */
 static int maxmaxcode = 1 << XV_BITS; /* NEVER generate this */
 
-static count_int *     htab;
+static count_int      *htab;
 static unsigned short *codetab;
 
 #define HashTabOf(i) htab[i]
diff --git a/hl/tools/h5watch/extend_dset.c b/hl/tools/h5watch/extend_dset.c
index 7756506..6fb06a4 100644
--- a/hl/tools/h5watch/extend_dset.c
+++ b/hl/tools/h5watch/extend_dset.c
@@ -82,8 +82,8 @@ extend_dset_two(const char *file, char *dname, int action1, int action2)
     hsize_t  cur_dims[2]; /* current dimension sizes                          */
     size_t   dtype_size;  /* size of the dataset's datatype                   */
     unsigned num_elmts;   /* number of elements in the dataset                */
-    int *    ibuf = NULL; /* buffer for storing retrieved elements (integer)  */
-    set_t *  cbuf = NULL; /* buffer for storing retrieved elements (compound) */
+    int     *ibuf = NULL; /* buffer for storing retrieved elements (integer)  */
+    set_t   *cbuf = NULL; /* buffer for storing retrieved elements (compound) */
 
     /* Allocate memory */
     if (NULL == (ibuf = (int *)HDcalloc(TEST_BUF_SIZE, sizeof(int))))
@@ -236,8 +236,8 @@ extend_dset_one(const char *file, char *dname, int action)
     hsize_t offset[1];   /* starting offsets of appended data                */
     hsize_t count[1];    /* dimension sizes of appended data                 */
     size_t  dtype_size;  /* size of the dataset's datatype                   */
-    int *   ibuf = NULL; /* buffer for storing retrieved elements (integer)  */
-    set_t * cbuf = NULL; /* buffer for storing retrieved elements (compound) */
+    int    *ibuf = NULL; /* buffer for storing retrieved elements (integer)  */
+    set_t  *cbuf = NULL; /* buffer for storing retrieved elements (compound) */
 
     /* Allocate memory */
     if (NULL == (ibuf = (int *)HDcalloc(TEST_BUF_SIZE, sizeof(int))))
diff --git a/hl/tools/h5watch/h5watch.c b/hl/tools/h5watch/h5watch.c
index 5a6fe6f..29aa87e 100644
--- a/hl/tools/h5watch/h5watch.c
+++ b/hl/tools/h5watch/h5watch.c
@@ -28,9 +28,9 @@
  *    This tool uses H5LD_memb_t data structure declared in H5LDprivate.h
  */
 
-const char *         progname         = "h5watch"; /* tool name */
-static char *        g_list_of_fields = NULL;      /* command line input for "list_of_fields" */
-static char *        g_dup_fields     = NULL;      /* copy of "list_of_fields" */
+const char          *progname         = "h5watch"; /* tool name */
+static char         *g_list_of_fields = NULL;      /* command line input for "list_of_fields" */
+static char         *g_dup_fields     = NULL;      /* copy of "list_of_fields" */
 static H5LD_memb_t **g_listv          = NULL;      /* vector info for "list_of_fields" */
 
 static hbool_t  g_monitor_size_only = FALSE; /* monitor changes in dataset dimension sizes */
@@ -58,7 +58,7 @@ static void   parse_command_line(int argc, const char *const *argv);
  * The long-named ones can be partially spelled. When
  * adding more, make sure that they don't clash with each other.
  */
-static const char *           s_opts   = "?";
+static const char            *s_opts   = "?";
 static struct h5_long_options l_opts[] = {{"help", no_arg, 'h'},         {"hel", no_arg, 'h'},
                                           {"dim", no_arg, 'd'},          {"di", no_arg, 'd'},
                                           {"label", no_arg, 'l'},        {"labe", no_arg, 'l'},
@@ -498,7 +498,7 @@ check_dataset(hid_t fid, char *dsetname)
     hsize_t      cur_dims[H5S_MAX_RANK]; /* size of dataspace dimensions */
     hsize_t      max_dims[H5S_MAX_RANK]; /* maximum size of dataspace dimensions */
     hbool_t      unlim_max_dims = FALSE; /* whether dataset has unlimited or max. dimension setting */
-    void *       edata;
+    void        *edata;
     H5E_auto2_t  func;
     H5D_layout_t layout;
     herr_t       ret_value = SUCCEED; /* Return value */