[svn-r22169] Description:

    Clean up formatting and whitespace.

Tested on:
    Mac OSX/64 10.7.3 (amazon) w/debug
    (too minor to require h5committest)

1 files changed, 137 insertions, 144 deletions

diff --git a/tools/h5stat/h5stat.c b/tools/h5stat/h5stat.c
index e206f4f..99ea688 100644
--- a/tools/h5stat/h5stat.c
+++ b/tools/h5stat/h5stat.c
@@ -99,17 +99,17 @@ typedef struct iter_t {
     hsize_t attrs_heap_storage_size;    /* fractal heap size for attributes (1.8) */
     hsize_t SM_hdr_storage_size;        /* header size for SOHM table (1.8) */
     hsize_t SM_index_storage_size;      /* index (btree & list) size for SOHM table (1.8) */
-    hsize_t SM_heap_storage_size;  /* fractal heap size for SOHM table (1.8) */
-    hsize_t super_size;            /* superblock size */
-    hsize_t super_ext_size;       /* superblock extension size */
-    hsize_t ublk_size;         /* user block size (if exists) */
-    H5F_file_space_type_t  fs_strategy;  /* File space management strategy */
-    hsize_t fs_threshold;    /* Free-space section threshold */
-    hsize_t free_space;                  /* amount of freespace in the file */
-    hsize_t free_hdr;                  /* size of free space manager metadata in the file */
+    hsize_t SM_heap_storage_size;       /* fractal heap size for SOHM table (1.8) */
+    hsize_t super_size;                 /* superblock size */
+    hsize_t super_ext_size;             /* superblock extension size */
+    hsize_t ublk_size;                  /* user block size (if exists) */
+    H5F_file_space_type_t fs_strategy;  /* File space management strategy */
+    hsize_t fs_threshold;               /* Free-space section threshold */
+    hsize_t free_space;                 /* amount of freespace in the file */
+    hsize_t free_hdr;                   /* size of free space manager metadata in the file */
     unsigned long num_small_sects[SIZE_SMALL_SECTS];   /* Size of small free-space sections */
-    unsigned sect_nbins;               /* Number of bins for free-space section sizes */
-    unsigned long *sect_bins;          /* Pointer to array of bins for free-space section sizes */
+    unsigned sect_nbins;                /* Number of bins for free-space section sizes */
+    unsigned long *sect_bins;           /* Pointer to array of bins for free-space section sizes */
     hsize_t datasets_index_storage_size;/* meta size for chunked dataset's indexing type */
     hsize_t datasets_heap_storage_size; /* heap size for dataset with external storage */
     unsigned long nexternal;            /* Number of external files for a dataset */
@@ -120,11 +120,11 @@ typedef struct iter_t {
 static int        display_all = TRUE;
 
 /* Enable the printing of selected statistics */
-static int        display_file = FALSE;    /* display file information */
-static int        display_group = FALSE;  /* display groups information */
-static int        display_dset = FALSE;    /* display datasets information */
+static int        display_file = FALSE;     /* display file information */
+static int        display_group = FALSE;    /* display groups information */
+static int        display_dset = FALSE;     /* display datasets information */
 static int        display_dset_dtype_meta = FALSE;  /* display datasets' datatype information */
-static int        display_attr = FALSE;    /* display attributes information */
+static int        display_attr = FALSE;     /* display attributes information */
 static int        display_free_sections = FALSE;    /* display free space information */
 static int        display_summary = FALSE;  /* display summary of file space information */
 
@@ -283,7 +283,7 @@ ceil_log10(unsigned long x)
     } /* end while */
 
     return(ret);
-}
+} /* ceil_log10() */
 
 
 /*-------------------------------------------------------------------------
@@ -481,7 +481,7 @@ dataset_stats(iter_t *iter, const char *name, const H5O_info_t *oi)
     /* Object header's total size for H5D_COMPACT layout includes raw data size */
     /* "storage" also includes H5D_COMPACT raw data size */
     if(lout == H5D_COMPACT)
-  iter->dset_ohdr_info.total_size -= storage;
+        iter->dset_ohdr_info.total_size -= storage;
 
     /* Track the layout type for dataset */
     (iter->dset_layouts[lout])++;
@@ -495,7 +495,7 @@ dataset_stats(iter_t *iter, const char *name, const H5O_info_t *oi)
         iter->nexternal += (unsigned long)num_ext;
         iter->dset_external_storage_size += (unsigned long)storage;
     } else
-  iter->dset_storage_size += storage;
+        iter->dset_storage_size += storage;
 
     /* Gather dataspace statistics */
     sid = H5Dget_space(did);
@@ -602,6 +602,7 @@ dataset_stats(iter_t *iter, const char *name, const H5O_info_t *oi)
      return 0;
 }  /* end dataset_stats() */
 
+
 /*-------------------------------------------------------------------------
  * Function: datatype_stats
  *
@@ -791,11 +792,6 @@ freespace_stats(hid_t fid, iter_t *iter)
  * Programmer: Elena Pourmal
  *             Saturday, August 12, 2006
  *
- * Modifications:
- *  Vailin Choi; October 2009
- *  Turn on display_group_metadata, display_dset_metadata
- *  Add 'S' & 's' for printing free space info (previous checkin)
- *
  *-------------------------------------------------------------------------
  */
 static struct handler_t *
@@ -812,103 +808,103 @@ 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) {
-        case 'h':
-            usage(h5tools_getprogname());
-            h5tools_setstatus(EXIT_SUCCESS);
-            if (hand) {
-                for (i = 0; i < argc; i++)
-                    if(hand[i].obj) {
-                        free(hand[i].obj);
-                        hand[i].obj=NULL;
-                    }
-
-                free(hand);
-                hand = NULL;
-            }
-            goto done;
-            break;
+        switch ((char)opt) {
+            case 'h':
+                usage(h5tools_getprogname());
+                h5tools_setstatus(EXIT_SUCCESS);
+                if (hand) {
+                    for (i = 0; i < argc; i++)
+                        if(hand[i].obj) {
+                            free(hand[i].obj);
+                            hand[i].obj=NULL;
+                        }
+
+                    free(hand);
+                    hand = NULL;
+                }
+                goto done;
+                break;
 
-        case 'V':
-            print_version(h5tools_getprogname());
-            h5tools_setstatus(EXIT_SUCCESS);
-            if (hand) {
-                for (i = 0; i < argc; i++)
-                    if(hand[i].obj) {
-                        free(hand[i].obj);
-                        hand[i].obj=NULL;
-                    }
-
-                free(hand);
-                hand = NULL;
-            }
-            goto done;
-            break;
+            case 'V':
+                print_version(h5tools_getprogname());
+                h5tools_setstatus(EXIT_SUCCESS);
+                if (hand) {
+                    for (i = 0; i < argc; i++)
+                        if(hand[i].obj) {
+                            free(hand[i].obj);
+                            hand[i].obj=NULL;
+                        }
+
+                    free(hand);
+                    hand = NULL;
+                }
+                goto done;
+                break;
 
-        case 'F':
-            display_all = FALSE;
-            display_file_metadata = TRUE;
-            break;
+            case 'F':
+                display_all = FALSE;
+                display_file_metadata = TRUE;
+                break;
 
-        case 'f':
-            display_all = FALSE;
-            display_file = TRUE;
-            break;
+            case 'f':
+                display_all = FALSE;
+                display_file = TRUE;
+                break;
 
-        case 'G':
-            display_all = FALSE;
-            display_group_metadata = TRUE;
-            break;
+            case 'G':
+                display_all = FALSE;
+                display_group_metadata = TRUE;
+                break;
 
-        case 'g':
-            display_all = FALSE;
-            display_group = TRUE;
-            break;
+            case 'g':
+                display_all = FALSE;
+                display_group = TRUE;
+                break;
 
-        case 'D':
-            display_all = FALSE;
-            display_dset_metadata = TRUE;
-            break;
+            case 'D':
+                display_all = FALSE;
+                display_dset_metadata = TRUE;
+                break;
 
-        case 'd':
-            display_all = FALSE;
-            display_dset = TRUE;
-            break;
+            case 'd':
+                display_all = FALSE;
+                display_dset = TRUE;
+                break;
 
-        case 'T':
-            display_all = FALSE;
-            display_dset_dtype_meta = TRUE;
-            break;
+            case 'T':
+                display_all = FALSE;
+                display_dset_dtype_meta = TRUE;
+                break;
 
-        case 'A':
-            display_all = FALSE;
-            display_attr = TRUE;
-            break;
+            case 'A':
+                display_all = FALSE;
+                display_attr = TRUE;
+                break;
 
-        case 's':
-            display_all = FALSE;
-            display_free_sections = TRUE;
-            break;
+            case 's':
+                display_all = FALSE;
+                display_free_sections = TRUE;
+                break;
 
-        case 'S':
-            display_all = FALSE;
-            display_summary = TRUE;
-            break;
+            case 'S':
+                display_all = FALSE;
+                display_summary = TRUE;
+                break;
 
-        case 'O':
-            display_all = FALSE;
-            display_object = TRUE;
-            for (i = 0; i < argc; i++)
-                if (!hand[i].obj) {
-                    hand[i].obj = HDstrdup(opt_arg);
-                    break;
-                } /* end if */
-            break;
+            case 'O':
+                display_all = FALSE;
+                display_object = TRUE;
+                for(i = 0; i < argc; i++)
+                    if(!hand[i].obj) {
+                        hand[i].obj = HDstrdup(opt_arg);
+                        break;
+                    } /* end if */
+                break;
 
-        default:
-            usage(h5tools_getprogname());
-            h5tools_setstatus(EXIT_FAILURE);
-            goto error;
+            default:
+                usage(h5tools_getprogname());
+                h5tools_setstatus(EXIT_FAILURE);
+                goto error;
         } /* end switch */
     } /* end while */
 
@@ -964,7 +960,7 @@ iter_init(iter_t *iter, hid_t fid)
     iter->fid = fid;
 
     return 0;
-}
+} /* iter_init() */
 
 
 /*-------------------------------------------------------------------------
@@ -1174,7 +1170,7 @@ print_group_metadata(const iter_t *iter)
     printf("File space information for groups' metadata (in bytes):\n");
 
     HDfprintf(stdout, "\tObject headers (total/unused): %Hu/%Hu\n",
-    iter->group_ohdr_info.total_size, iter->group_ohdr_info.free_size);
+            iter->group_ohdr_info.total_size, iter->group_ohdr_info.free_size);
 
     HDfprintf(stdout, "\tB-tree/List: %Hu\n", iter->groups_btree_storage_size);
     HDfprintf(stdout, "\tHeap: %Hu\n", iter->groups_heap_storage_size);
@@ -1195,8 +1191,6 @@ print_group_metadata(const iter_t *iter)
  * Programmer: Elena Pourmal
  *             Saturday, August 12, 2006
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -1292,10 +1286,10 @@ print_dset_metadata(const iter_t *iter)
     printf("File space information for datasets' metadata (in bytes):\n");
 
     HDfprintf(stdout, "\tObject headers (total/unused): %Hu/%Hu\n",
-    iter->dset_ohdr_info.total_size, iter->dset_ohdr_info.free_size);
+            iter->dset_ohdr_info.total_size, iter->dset_ohdr_info.free_size);
 
     HDfprintf(stdout, "\tIndex for Chunked datasets: %Hu\n",
-    iter->datasets_index_storage_size);
+            iter->datasets_index_storage_size);
     HDfprintf(stdout, "\tHeap: %Hu\n", iter->datasets_heap_storage_size);
 
     return 0;
@@ -1311,11 +1305,7 @@ print_dset_metadata(const iter_t *iter)
  *
  * Failure: Never fails
  *
- * Programmer:
- *
- * Modifications:
- *  Vailin Choi; October 2009
- *  Moved from print_dataset_info()
+ * Programmer: Vailin Choi; October 2009
  *
  *-------------------------------------------------------------------------
  */
@@ -1327,21 +1317,21 @@ print_dset_dtype_meta(const iter_t *iter)
     unsigned u;                 /* Local index variable */
 
     if(iter->dset_ntypes) {
-  printf("Dataset datatype information:\n");
-  printf("\t# of unique datatypes used by datasets: %lu\n", iter->dset_ntypes);
-  total = 0;
-  for(u = 0; u < iter->dset_ntypes; u++) {
-      H5Tencode(iter->dset_type_info[u].tid, NULL, &dtype_size);
-      printf("\tDataset datatype #%u:\n", u);
-      printf("\t\tCount (total/named) = (%lu/%lu)\n",
-    iter->dset_type_info[u].count, iter->dset_type_info[u].named);
-      printf("\t\tSize (desc./elmt) = (%lu/%lu)\n", (unsigned long)dtype_size,
-    (unsigned long)H5Tget_size(iter->dset_type_info[u].tid));
-      H5Tclose(iter->dset_type_info[u].tid);
-      total += iter->dset_type_info[u].count;
-  } /* end for */
-  printf("\tTotal dataset datatype count: %lu\n", total);
-    }
+        printf("Dataset datatype information:\n");
+        printf("\t# of unique datatypes used by datasets: %lu\n", iter->dset_ntypes);
+        total = 0;
+        for(u = 0; u < iter->dset_ntypes; u++) {
+            H5Tencode(iter->dset_type_info[u].tid, NULL, &dtype_size);
+            printf("\tDataset datatype #%u:\n", u);
+            printf("\t\tCount (total/named) = (%lu/%lu)\n",
+                    iter->dset_type_info[u].count, iter->dset_type_info[u].named);
+            printf("\t\tSize (desc./elmt) = (%lu/%lu)\n", (unsigned long)dtype_size,
+                    (unsigned long)H5Tget_size(iter->dset_type_info[u].tid));
+            H5Tclose(iter->dset_type_info[u].tid);
+            total += iter->dset_type_info[u].count;
+        } /* end for */
+        printf("\tTotal dataset datatype count: %lu\n", total);
+    } /* end if */
 
     return 0;
 } /* print_dset_dtype_meta() */
@@ -1446,7 +1436,7 @@ print_freespace_info(const iter_t *iter)
     return 0;
 } /* print_freespace_info() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: print_storage_summary
  *
@@ -1492,7 +1482,7 @@ print_storage_summary(const iter_t *iter)
     HDfprintf(stdout, "  Amount/Percent of tracked free space: %Hu bytes/%3.1f%\n",
                 iter->free_space, percent);
 
-    if(iter->filesize < (total_meta+iter->dset_storage_size+iter->free_space)) {
+    if(iter->filesize < (total_meta + iter->dset_storage_size + iter->free_space)) {
         unaccount = (total_meta + iter->dset_storage_size + iter->free_space) - iter->filesize;
         HDfprintf(stdout, "  ??? File has %Hu more bytes accounted for than its size! ???\n", unaccount);
     }
@@ -1501,12 +1491,11 @@ print_storage_summary(const iter_t *iter)
         HDfprintf(stdout, "  Unaccounted space: %Hu bytes\n", unaccount);
     }
 
-    HDfprintf(stdout, "Total space: %Hu bytes\n", total_meta+iter->dset_storage_size+iter->free_space+unaccount);
+    HDfprintf(stdout, "Total space: %Hu bytes\n", total_meta + iter->dset_storage_size + iter->free_space + unaccount);
 
     if(iter->nexternal)
         HDfprintf(stdout, "External raw data: %Hu bytes\n", iter->dset_external_storage_size);
 
-
     return 0;
 } /* print_storage_summary() */
 
@@ -1523,11 +1512,6 @@ print_storage_summary(const iter_t *iter)
  * Programmer: Elena Pourmal
  *             Saturday, August 12, 2006
  *
- * Modifications:
- *  Vailin Choi; October 2009
- *  Activate "display_group_metadata", "dislay_dset_metadata" and
- *  "display_dset_dtype_info".
- *
  *-------------------------------------------------------------------------
  */
 static void
@@ -1560,7 +1544,7 @@ print_file_statistics(const iter_t *iter)
     if(display_attr)            print_attr_info(iter);
     if(display_free_sections)   print_freespace_info(iter);
     if(display_summary)         print_storage_summary(iter);
-}
+} /* print_file_statistics() */
 
 
 /*-------------------------------------------------------------------------
@@ -1583,7 +1567,7 @@ static void
 print_object_statistics(const char *name)
 {
     printf("Object name %s\n", name);
-}
+} /* print_object_statistics() */
 
 
 /*-------------------------------------------------------------------------
@@ -1609,9 +1593,18 @@ print_statistics(const char *name, const iter_t *iter)
         print_object_statistics(name);
     else
         print_file_statistics(iter);
-}
+} /* print_statistics() */
 
 
+/*-------------------------------------------------------------------------
+ * Function: main
+ *
+ * Modifications:
+ *      2/2010; Vailin Choi
+ *      Get the size of user block
+ *
+ *-------------------------------------------------------------------------
+ */
 int
 main(int argc, const char *argv[])
 {