Source formatted

1 files changed, 129 insertions, 130 deletions

diff --git a/tools/src/h5format_convert/h5format_convert.c b/tools/src/h5format_convert/h5format_convert.c
index e60097b..203ad2b 100644
--- a/tools/src/h5format_convert/h5format_convert.c
+++ b/tools/src/h5format_convert/h5format_convert.c
@@ -15,7 +15,6 @@
  * Programmer:  Vailin Choi; Feb 2015
  */
 
-
 /*
  * We include the private header file so we can get to the uniform
  * programming environment it declares.
@@ -29,42 +28,39 @@
 /* Name of tool */
 #define PROGRAMNAME "h5format_convert"
 
-static char *fname_g = NULL;
-static char *dname_g = NULL;
-static int dset_g = FALSE;
-static int noop_g = FALSE;
-static int verbose_g = 0;
+static char *fname_g   = NULL;
+static char *dname_g   = NULL;
+static int   dset_g    = FALSE;
+static int   noop_g    = FALSE;
+static int   verbose_g = 0;
 
 /*
  * Command-line options: The user can specify short or long-named
  * parameters.
  */
-static const char *s_opts = "hVvd:n";
-static struct long_options l_opts[] = {
-        { "help", no_arg, 'h' },
-        { "hel", no_arg, 'h'},
-        { "he", no_arg, 'h'},
-        { "version", no_arg, 'V' },
-        { "version", no_arg, 'V' },
-        { "versio", no_arg, 'V' },
-        { "versi", no_arg, 'V' },
-        { "vers", no_arg, 'V' },
-        { "verbose", no_arg, 'v' },
-        { "verbos", no_arg, 'v' },
-        { "verbo", no_arg, 'v' },
-        { "verb", no_arg, 'v' },
-        { "dname", require_arg, 'd' },
-        { "dnam", require_arg, 'd' },
-        { "dna", require_arg, 'd' },
-        { "dn", require_arg, 'd' },
-        { "noop", no_arg, 'n' },
-        { "noo", no_arg, 'n' },
-        { "no", no_arg, 'n' },
-        { "enable-error-stack", no_arg, 'E' },
-        { NULL, 0, '\0' }
-};
-
-
+static const char *        s_opts   = "hVvd:n";
+static struct long_options l_opts[] = {{"help", no_arg, 'h'},
+                                       {"hel", no_arg, 'h'},
+                                       {"he", no_arg, 'h'},
+                                       {"version", no_arg, 'V'},
+                                       {"version", no_arg, 'V'},
+                                       {"versio", no_arg, 'V'},
+                                       {"versi", no_arg, 'V'},
+                                       {"vers", no_arg, 'V'},
+                                       {"verbose", no_arg, 'v'},
+                                       {"verbos", no_arg, 'v'},
+                                       {"verbo", no_arg, 'v'},
+                                       {"verb", no_arg, 'v'},
+                                       {"dname", require_arg, 'd'},
+                                       {"dnam", require_arg, 'd'},
+                                       {"dna", require_arg, 'd'},
+                                       {"dn", require_arg, 'd'},
+                                       {"noop", no_arg, 'n'},
+                                       {"noo", no_arg, 'n'},
+                                       {"no", no_arg, 'n'},
+                                       {"enable-error-stack", no_arg, 'E'},
+                                       {NULL, 0, '\0'}};
+
 /*-------------------------------------------------------------------------
  * Function: usage
  *
@@ -74,7 +70,8 @@ static struct long_options l_opts[] = {
  *
  *-------------------------------------------------------------------------
  */
-static void usage(const char *prog)
+static void
+usage(const char *prog)
 {
     HDfprintf(stdout, "usage: %s [OPTIONS] file_name\n", prog);
     HDfprintf(stdout, "  OPTIONS\n");
@@ -118,7 +115,7 @@ parse_command_line(int argc, const char **argv)
 {
     int opt;
 
-     /* no arguments */
+    /* no arguments */
     if (argc == 1) {
         usage(h5tools_getprogname());
         h5tools_setstatus(EXIT_FAILURE);
@@ -127,7 +124,7 @@ parse_command_line(int argc, const char **argv)
 
     /* parse command line options */
     while ((opt = get_option(argc, argv, s_opts, l_opts)) != EOF) {
-        switch((char) opt) {
+        switch ((char)opt) {
             case 'h':
                 usage(h5tools_getprogname());
                 h5tools_setstatus(EXIT_SUCCESS);
@@ -143,9 +140,9 @@ parse_command_line(int argc, const char **argv)
                 break;
 
             case 'd': /* -d dname */
-                if(opt_arg != NULL && *opt_arg)
+                if (opt_arg != NULL && *opt_arg)
                     dname_g = HDstrdup(opt_arg);
-                if(dname_g == NULL) {
+                if (dname_g == NULL) {
                     h5tools_setstatus(EXIT_FAILURE);
                     error_msg("No dataset name\n", opt_arg);
                     usage(h5tools_getprogname());
@@ -168,7 +165,7 @@ parse_command_line(int argc, const char **argv)
                 goto error;
                 break;
         } /* switch */
-    } /* while */
+    }     /* while */
 
     if (argc <= opt_ind) {
         error_msg("missing file name\n");
@@ -179,13 +176,13 @@ parse_command_line(int argc, const char **argv)
 
     fname_g = HDstrdup(argv[opt_ind]);
 
-    return(0);
+    return (0);
 
 error:
-    return(-1); ;
+    return (-1);
+    ;
 } /* parse_command_line() */
 
-
 /*-------------------------------------------------------------------------
  * Function: leave
  *
@@ -224,134 +221,138 @@ leave(int ret)
 static int
 convert(hid_t fid, const char *dname)
 {
-    hid_t dcpl = H5I_INVALID_HID;
-    hid_t did = H5I_INVALID_HID;
-    H5D_layout_t layout_type;
+    hid_t             dcpl = H5I_INVALID_HID;
+    hid_t             did  = H5I_INVALID_HID;
+    H5D_layout_t      layout_type;
     H5D_chunk_index_t idx_type;
 
     /* Open the dataset */
-    if((did = H5Dopen2(fid, dname, H5P_DEFAULT)) < 0) {
+    if ((did = H5Dopen2(fid, dname, H5P_DEFAULT)) < 0) {
         error_msg("unable to open dataset \"%s\"\n", dname);
         h5tools_setstatus(EXIT_FAILURE);
         goto error;
     }
-    else if(verbose_g)
+    else if (verbose_g)
         HDfprintf(stdout, "Open the dataset\n");
 
     /* Get the dataset's creation property list */
-    if((dcpl = H5Dget_create_plist(did)) < 0) {
+    if ((dcpl = H5Dget_create_plist(did)) < 0) {
         error_msg("unable to get the dataset creation property list\n");
         h5tools_setstatus(EXIT_FAILURE);
         goto error;
     }
 
     /* Get the dataset's layout */
-    if((layout_type = H5Pget_layout(dcpl)) < 0) {
+    if ((layout_type = H5Pget_layout(dcpl)) < 0) {
         error_msg("unable to get the dataset layout type\n");
         h5tools_setstatus(EXIT_FAILURE);
         goto error;
     }
-    else if(verbose_g)
+    else if (verbose_g)
         HDfprintf(stdout, "Retrieve the dataset's layout\n");
 
-    switch(layout_type) {
-    case H5D_CHUNKED:
-        if(verbose_g)
-            HDfprintf(stdout, "Dataset is a chunked dataset\n");
-
-        /* Get the dataset's chunk indexing type */
-        if(H5Dget_chunk_index_type(did, &idx_type) < 0) {
-            error_msg("unable to get the chunk indexing type for \"%s\"\n", dname);
-            h5tools_setstatus(EXIT_FAILURE);
-            goto error;
-        }
-        else if(verbose_g)
-            HDfprintf(stdout, "Retrieve the dataset's chunk indexing type\n");
+    switch (layout_type) {
+        case H5D_CHUNKED:
+            if (verbose_g)
+                HDfprintf(stdout, "Dataset is a chunked dataset\n");
 
-        if(idx_type == H5D_CHUNK_IDX_BTREE) {
-            if(verbose_g)
-                HDfprintf(stdout, "Dataset's chunk indexing type is already version 1 B-tree: no further action\n");
-            h5tools_setstatus(EXIT_SUCCESS);
+            /* Get the dataset's chunk indexing type */
+            if (H5Dget_chunk_index_type(did, &idx_type) < 0) {
+                error_msg("unable to get the chunk indexing type for \"%s\"\n", dname);
+                h5tools_setstatus(EXIT_FAILURE);
+                goto error;
+            }
+            else if (verbose_g)
+                HDfprintf(stdout, "Retrieve the dataset's chunk indexing type\n");
+
+            if (idx_type == H5D_CHUNK_IDX_BTREE) {
+                if (verbose_g)
+                    HDfprintf(
+                        stdout,
+                        "Dataset's chunk indexing type is already version 1 B-tree: no further action\n");
+                h5tools_setstatus(EXIT_SUCCESS);
+                goto done;
+            }
+            else if (verbose_g)
+                HDfprintf(stdout, "Dataset's chunk indexing type is not version 1 B-tree\n");
+
+            break;
+
+        case H5D_CONTIGUOUS:
+            if (verbose_g)
+                HDfprintf(stdout, "Dataset is a contiguous dataset: downgrade layout version as needed\n");
+            break;
+
+        case H5D_COMPACT:
+            if (verbose_g)
+                HDfprintf(stdout, "Dataset is a compact dataset: downgrade layout version as needed\n");
+            break;
+
+        case H5D_VIRTUAL:
+            if (verbose_g)
+                HDfprintf(stdout, "No further action for virtual dataset\n");
             goto done;
-        }
-        else if (verbose_g)
-            HDfprintf(stdout, "Dataset's chunk indexing type is not version 1 B-tree\n");
-
-        break;
 
-    case H5D_CONTIGUOUS:
-        if(verbose_g)
-            HDfprintf(stdout, "Dataset is a contiguous dataset: downgrade layout version as needed\n");
-        break;
-
-    case H5D_COMPACT:
-        if(verbose_g)
-            HDfprintf(stdout, "Dataset is a compact dataset: downgrade layout version as needed\n");
-        break;
-
-    case H5D_VIRTUAL:
-        if(verbose_g)
-            HDfprintf(stdout, "No further action for virtual dataset\n");
-        goto done;
-
-    case H5D_NLAYOUTS:
-    case H5D_LAYOUT_ERROR:
-    default:
-        error_msg("unknown layout type for \"%s\"\n", dname);
-        h5tools_setstatus(EXIT_FAILURE);
-        goto error;
+        case H5D_NLAYOUTS:
+        case H5D_LAYOUT_ERROR:
+        default:
+            error_msg("unknown layout type for \"%s\"\n", dname);
+            h5tools_setstatus(EXIT_FAILURE);
+            goto error;
 
     } /* end switch */
 
     /* No further action if it is a noop */
-    if(noop_g) {
-        if(verbose_g)
+    if (noop_g) {
+        if (verbose_g)
             HDfprintf(stdout, "Not converting the dataset\n");
         h5tools_setstatus(EXIT_SUCCESS);
         goto done;
     }
 
-    if(verbose_g)
+    if (verbose_g)
         HDfprintf(stdout, "Converting the dataset...\n");
 
     /* Downgrade the dataset */
-    if(H5Dformat_convert(did) < 0) {
+    if (H5Dformat_convert(did) < 0) {
         error_msg("unable to downgrade dataset \"%s\"\n", dname);
         h5tools_setstatus(EXIT_FAILURE);
         goto error;
     }
-    else if(verbose_g)
+    else if (verbose_g)
         HDfprintf(stdout, "Done\n");
 
 done:
     /* Close the dataset */
-    if(H5Dclose(did) < 0) {
+    if (H5Dclose(did) < 0) {
         error_msg("unable to close dataset \"%s\"\n", dname);
         h5tools_setstatus(EXIT_FAILURE);
         goto error;
     }
-    else if(verbose_g)
+    else if (verbose_g)
         HDfprintf(stdout, "Close the dataset\n");
 
     /* Close the dataset creation property list */
-    if(H5Pclose(dcpl) < 0) {
+    if (H5Pclose(dcpl) < 0) {
         error_msg("unable to close dataset creation property list\n");
         h5tools_setstatus(EXIT_FAILURE);
         goto error;
     }
-    else if(verbose_g)
+    else if (verbose_g)
         HDprintf("Close the dataset creation property list\n");
 
     return 0;
 
 error:
-    if(verbose_g)
+    if (verbose_g)
         HDfprintf(stdout, "Error encountered\n");
 
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         H5Pclose(dcpl);
         H5Dclose(did);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
 
     return -1;
 } /* convert() */
@@ -372,14 +373,14 @@ convert_dsets_cb(const char *path, const H5O_info2_t *oi, const char *already_vi
     hid_t fid = *(hid_t *)_fid;
 
     /* If the object has already been seen then just return */
-    if(NULL == already_visited) {
-        if(oi->type == H5O_TYPE_DATASET) {
-            if(verbose_g)
+    if (NULL == already_visited) {
+        if (oi->type == H5O_TYPE_DATASET) {
+            if (verbose_g)
                 HDfprintf(stdout, "Going to process dataset:%s...\n", path);
-            if(convert(fid, path) < 0)
+            if (convert(fid, path) < 0)
                 goto error;
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     return 0;
 
@@ -387,7 +388,6 @@ error:
     return -1;
 } /* end convert_dsets_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function: main
  *
@@ -411,41 +411,41 @@ main(int argc, const char *argv[])
     h5tools_init();
 
     /* Parse command line options */
-    if(parse_command_line(argc, argv) < 0)
+    if (parse_command_line(argc, argv) < 0)
         goto done;
-    else if(verbose_g)
+    else if (verbose_g)
         HDfprintf(stdout, "Process command line options\n");
 
-    if(noop_g && verbose_g)
+    if (noop_g && verbose_g)
         HDfprintf(stdout, "It is noop...\n");
 
     /* enable error reporting if command line option */
     h5tools_error_report();
 
     /* Open the HDF5 file */
-    if((fid = h5tools_fopen(fname_g, H5F_ACC_RDWR, H5P_DEFAULT, FALSE, NULL, 0)) < 0) {
+    if ((fid = h5tools_fopen(fname_g, H5F_ACC_RDWR, H5P_DEFAULT, FALSE, NULL, 0)) < 0) {
         error_msg("unable to open file \"%s\"\n", fname_g);
         h5tools_setstatus(EXIT_FAILURE);
         goto done;
     }
-    else if(verbose_g)
+    else if (verbose_g)
         HDfprintf(stdout, "Open the file %s\n", fname_g);
 
-    if(dset_g) { /* Convert a specified dataset in the file */
-        if(verbose_g)
+    if (dset_g) { /* Convert a specified dataset in the file */
+        if (verbose_g)
             HDfprintf(stdout, "Going to process dataset: %s...\n", dname_g);
-        if(convert(fid, dname_g) < 0)
+        if (convert(fid, dname_g) < 0)
             goto done;
     }
     else { /* Convert all datasets in the file */
-        if(verbose_g)
+        if (verbose_g)
             HDfprintf(stdout, "Processing all datasets in the file...\n");
-        if(h5trav_visit(fid, "/", TRUE, TRUE, convert_dsets_cb, NULL, &fid, H5O_INFO_BASIC) < 0)
+        if (h5trav_visit(fid, "/", TRUE, TRUE, convert_dsets_cb, NULL, &fid, H5O_INFO_BASIC) < 0)
             goto done;
     } /* end else */
 
-    if(verbose_g) {
-        if(noop_g) {
+    if (verbose_g) {
+        if (noop_g) {
             HDfprintf(stdout, "Not processing the file's superblock...\n");
             h5tools_setstatus(EXIT_SUCCESS);
             goto done;
@@ -454,7 +454,7 @@ main(int argc, const char *argv[])
     } /* end if */
 
     /* Process superblock */
-    if(H5Fformat_convert(fid) < 0) {
+    if (H5Fformat_convert(fid) < 0) {
         error_msg("unable to convert file's superblock\"%s\"\n", fname_g);
         h5tools_setstatus(EXIT_FAILURE);
         goto done;
@@ -462,22 +462,21 @@ main(int argc, const char *argv[])
 
 done:
     /* Close the file */
-    if(fid >= 0) {
-        if(H5Fclose(fid) < 0) {
+    if (fid >= 0) {
+        if (H5Fclose(fid) < 0) {
             error_msg("unable to close file \"%s\"\n", fname_g);
             h5tools_setstatus(EXIT_FAILURE);
         }
-        else if(verbose_g) {
+        else if (verbose_g) {
             HDfprintf(stdout, "Close the file\n");
         }
-    }  /* end if */
+    } /* end if */
 
-    if(fname_g)
+    if (fname_g)
         HDfree(fname_g);
-    if(dname_g)
+    if (dname_g)
         HDfree(dname_g);
 
     leave(h5tools_getstatus());
 
 } /* end main() */
-