Source formatted

1 files changed, 94 insertions, 102 deletions

diff --git a/tools/src/h5import/h5import.h b/tools/src/h5import/h5import.h
index 00c41f6..405d953 100644
--- a/tools/src/h5import/h5import.h
+++ b/tools/src/h5import/h5import.h
@@ -25,116 +25,109 @@
  */
 #define FILNAME 0
 /* filename */
-#define OPT_o   1
+#define OPT_o 1
 /* output filename */
-#define OPT_c   2   /* configuration filename */
-#define OPT_h   3   /* request for explanation */
-#define OPT_d   4   /* dimensions */
-#define OPT_p   5   /* pathname */
-#define OPT_t   6   /* data type */
-#define OPT_s   7   /* data size */
-#define ERR    20  /* invalid token */
-
-#define MAX_GROUPS_IN_PATH  20
+#define OPT_c 2  /* configuration filename */
+#define OPT_h 3  /* request for explanation */
+#define OPT_d 4  /* dimensions */
+#define OPT_p 5  /* pathname */
+#define OPT_t 6  /* data type */
+#define OPT_s 7  /* data size */
+#define ERR   20 /* invalid token */
+
+#define MAX_GROUPS_IN_PATH   20
 #define MAX_PATH_NAME_LENGTH 255
-#define NUM_KEYS 15
-#define MIN_NUM_DIMENSION  1
-#define MAX_NUM_DIMENSION  32
-#define BASE_10 10
-
-#define PATH             0
-#define INPUT_CLASS      1
-#define INPUT_SIZE       2
-#define RANK             3
-#define DIM              4
-#define OUTPUT_CLASS     5
-#define OUTPUT_SIZE      6
-#define OUTPUT_ARCH      7
-#define OUTPUT_B_ORDER   8
-#define CHUNK            9
-#define COMPRESS         10
-#define COMPRESS_PARAM   11
-#define EXTERNALSTORE    12
-#define EXTEND           13
-#define INPUT_B_ORDER    14
+#define NUM_KEYS             15
+#define MIN_NUM_DIMENSION    1
+#define MAX_NUM_DIMENSION    32
+#define BASE_10              10
+
+#define PATH           0
+#define INPUT_CLASS    1
+#define INPUT_SIZE     2
+#define RANK           3
+#define DIM            4
+#define OUTPUT_CLASS   5
+#define OUTPUT_SIZE    6
+#define OUTPUT_ARCH    7
+#define OUTPUT_B_ORDER 8
+#define CHUNK          9
+#define COMPRESS       10
+#define COMPRESS_PARAM 11
+#define EXTERNALSTORE  12
+#define EXTEND         13
+#define INPUT_B_ORDER  14
 
 /* data types */
-#define H5DT_INT8      signed char
-#define H5DT_INT16     short
-#define H5DT_INT32     int
-#define H5DT_FLOAT32   float
-#define H5DT_FLOAT64   double
-#define VOIDP          void*
-#define H5DT_UINT8     unsigned char
-#define H5DT_UINT16    unsigned short
-#define H5DT_UINT32    unsigned int
-#define H5DT_INT64     long long
-#define H5DT_UINT64    unsigned H5DT_INT64
-
-struct path_info
-{
+#define H5DT_INT8    signed char
+#define H5DT_INT16   short
+#define H5DT_INT32   int
+#define H5DT_FLOAT32 float
+#define H5DT_FLOAT64 double
+#define VOIDP        void *
+#define H5DT_UINT8   unsigned char
+#define H5DT_UINT16  unsigned short
+#define H5DT_UINT32  unsigned int
+#define H5DT_INT64   long long
+#define H5DT_UINT64  unsigned H5DT_INT64
+
+struct path_info {
     char group[MAX_GROUPS_IN_PATH][MAX_PATH_NAME_LENGTH];
-    int count;
+    int  count;
 };
 
-struct Input
-{
-    int h5dumpInput;
+struct Input {
+    int              h5dumpInput;
     struct path_info path;
-    int inputClass;
-    int inputSize;
-    int inputArchitecture;
-    int inputByteOrder;
-    int rank;
-    hsize_t* sizeOfDimension;
-    int outputClass;
-    int outputSize;
-    int outputArchitecture;
-    int outputByteOrder;
-    hsize_t* sizeOfChunk;
-    hsize_t* maxsizeOfDimension;
-    int compressionType;
-    int compressionParam;
-    char *externFilename;
-    VOIDP data;
-    int configOptionVector[NUM_KEYS];
+    int              inputClass;
+    int              inputSize;
+    int              inputArchitecture;
+    int              inputByteOrder;
+    int              rank;
+    hsize_t *        sizeOfDimension;
+    int              outputClass;
+    int              outputSize;
+    int              outputArchitecture;
+    int              outputByteOrder;
+    hsize_t *        sizeOfChunk;
+    hsize_t *        maxsizeOfDimension;
+    int              compressionType;
+    int              compressionParam;
+    char *           externFilename;
+    VOIDP            data;
+    int              configOptionVector[NUM_KEYS];
 };
 
-struct infilesformat
-{
-    char datafile[MAX_PATH_NAME_LENGTH];
-    char configfile[MAX_PATH_NAME_LENGTH];
+struct infilesformat {
+    char         datafile[MAX_PATH_NAME_LENGTH];
+    char         configfile[MAX_PATH_NAME_LENGTH];
     struct Input in;
-    int config; /* Configfile present? No - 0. Yes - 1 */
+    int          config; /* Configfile present? No - 0. Yes - 1 */
 };
 
-struct Options
-{
-    struct infilesformat  infiles[30];  /* structure to hold the list of input file names. Limited to 30*/
-    char   outfile[256];  /* output file name */
-    int    fcount;       /* number of input files */
+struct Options {
+    struct infilesformat infiles[30];  /* structure to hold the list of input file names. Limited to 30*/
+    char                 outfile[256]; /* output file name */
+    int                  fcount;       /* number of input files */
 };
 
-char keytable[NUM_KEYS][30] = {
-        "PATH",
-        "INPUT-CLASS",
-        "INPUT-SIZE",
-        "RANK",
-        "DIMENSION-SIZES",
-        "OUTPUT-CLASS",
-        "OUTPUT-SIZE",
-        "OUTPUT-ARCHITECTURE",
-        "OUTPUT-BYTE-ORDER",
-        "CHUNKED-DIMENSION-SIZES",
-        "COMPRESSION-TYPE",
-        "COMPRESSION-PARAM",
-        "EXTERNAL-STORAGE",
-        "MAXIMUM-DIMENSIONS",
-        "INPUT-BYTE-ORDER"
-};
-
-static int  state_table[15][8] =
-{
+char keytable[NUM_KEYS][30] = {"PATH",
+                               "INPUT-CLASS",
+                               "INPUT-SIZE",
+                               "RANK",
+                               "DIMENSION-SIZES",
+                               "OUTPUT-CLASS",
+                               "OUTPUT-SIZE",
+                               "OUTPUT-ARCHITECTURE",
+                               "OUTPUT-BYTE-ORDER",
+                               "CHUNKED-DIMENSION-SIZES",
+                               "COMPRESSION-TYPE",
+                               "COMPRESSION-PARAM",
+                               "EXTERNAL-STORAGE",
+                               "MAXIMUM-DIMENSIONS",
+                               "INPUT-BYTE-ORDER"};
+
+static int state_table[15][8] = {
     /* token ordering: FILNAME      OPT_o   OPT_c  OPT_h  OPT_d  OPT_p  OPT_t  OPT_s   */
 
     /* state 0: start */
@@ -189,12 +182,11 @@ static int  state_table[15][8] =
  *  Function declarations for h5import
  *
  */
-void  usage(char *);
-void  setDefaultValues(struct Input *in, int count);
-void  help(char *);
-
-hid_t       createOutputDataType(struct Input *in);
-hid_t       createInputDataType(struct Input *in);
+void usage(char *);
+void setDefaultValues(struct Input *in, int count);
+void help(char *);
 
-#endif  /* H5IMPORT_H__ */
+hid_t createOutputDataType(struct Input *in);
+hid_t createInputDataType(struct Input *in);
 
+#endif /* H5IMPORT_H__ */