[svn-r17553] Description:

	Bring general fixes/improvements from file_free_space branch back to
trunk.

Tested on:
        FreeBSD/32 6.3 (duty) in debug mode
        FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (jam) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
                                in debug mode
        Linux/64-amd64 2.6 (smirom) w/Intel compilers w/default API=1.6.x,
                                w/C++ & FORTRAN, in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                                w/szip filter, in production mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                                in production mode
        Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
        Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
        Mac OS X/32 10.5.8 (amazon) in debug mode
        Mac OS X/32 10.5.8 (amazon) w/C++ & FORTRAN, w/threadsafe,
                                in production mode

8 files changed, 53 insertions, 67 deletions

diff --git a/tools/h5repack/h5repack_main.c b/tools/h5repack/h5repack_main.c
index d9ec7ad..63aba1f 100644
--- a/tools/h5repack/h5repack_main.c
+++ b/tools/h5repack/h5repack_main.c
@@ -183,60 +183,60 @@ static void usage(const char *prog)
 
  printf("\n");
 
- printf("  M - is an integer greater than 1, size of dataset in bytes (default is 1024) \n");
- printf("  E - is a filename.\n");
- printf("  S - is an integer\n");
- printf("  U - is a filename.\n");
- printf("  T - is an integer\n");
- printf("  A - is an integer greater than zero\n");
- printf("  B - is the user block size, any value that is 512 or greater and is\n");
+ printf("    M - is an integer greater than 1, size of dataset in bytes (default is 1024) \n");
+ printf("    E - is a filename.\n");
+ printf("    S - is an integer\n");
+ printf("    U - is a filename.\n");
+ printf("    T - is an integer\n");
+ printf("    A - is an integer greater than zero\n");
+ printf("    B - is the user block size, any value that is 512 or greater and is\n");
  printf("        a power of 2 (1024 default)\n");
- printf("  F - is the shared object header message type, any of <dspace|dtype|fill|\n");
+ printf("    F - is the shared object header message type, any of <dspace|dtype|fill|\n");
  printf("        pline|attr>. If F is not specified, S applies to all messages\n");
 
  printf("\n");
 
- printf("  FILT - is a string with the format:\n");
+ printf("    FILT - is a string with the format:\n");
  printf("\n");
- printf("    <list of objects>:<name of filter>=<filter parameters>\n");
+ printf("      <list of objects>:<name of filter>=<filter parameters>\n");
  printf("\n");
- printf("    <list of objects> is a comma separated list of object names, meaning apply\n");
- printf("      compression only to those objects. If no names are specified, the filter\n");
- printf("      is applied to all objects\n");
- printf("    <name of filter> can be:\n");
- printf("      GZIP, to apply the HDF5 GZIP filter (GZIP compression)\n");
- printf("      SZIP, to apply the HDF5 SZIP filter (SZIP compression)\n");
- printf("      SHUF, to apply the HDF5 shuffle filter\n");
- printf("      FLET, to apply the HDF5 checksum filter\n");
- printf("      NBIT, to apply the HDF5 NBIT filter (NBIT compression)\n");
- printf("      SOFF, to apply the HDF5 Scale/Offset filter\n");
- printf("      NONE, to remove all filters\n");
- printf("    <filter parameters> is optional filter parameter information\n");
- printf("      GZIP=<deflation level> from 1-9\n");
- printf("      SZIP=<pixels per block,coding> pixels per block is a even number in\n");
+ printf("      <list of objects> is a comma separated list of object names, meaning apply\n");
+ printf("        compression only to those objects. If no names are specified, the filter\n");
+ printf("        is applied to all objects\n");
+ printf("      <name of filter> can be:\n");
+ printf("        GZIP, to apply the HDF5 GZIP filter (GZIP compression)\n");
+ printf("        SZIP, to apply the HDF5 SZIP filter (SZIP compression)\n");
+ printf("        SHUF, to apply the HDF5 shuffle filter\n");
+ printf("        FLET, to apply the HDF5 checksum filter\n");
+ printf("        NBIT, to apply the HDF5 NBIT filter (NBIT compression)\n");
+ printf("        SOFF, to apply the HDF5 Scale/Offset filter\n");
+ printf("        NONE, to remove all filters\n");
+ printf("      <filter parameters> is optional filter parameter information\n");
+ printf("        GZIP=<deflation level> from 1-9\n");
+ printf("        SZIP=<pixels per block,coding> pixels per block is a even number in\n");
  printf("            2-32 and coding method is either EC or NN\n");
- printf("      SHUF (no parameter)\n");
- printf("      FLET (no parameter)\n");
- printf("      NBIT (no parameter)\n");
- printf("      SOFF=<scale_factor,scale_type> scale_factor is an integer and scale_type\n");
+ printf("        SHUF (no parameter)\n");
+ printf("        FLET (no parameter)\n");
+ printf("        NBIT (no parameter)\n");
+ printf("        SOFF=<scale_factor,scale_type> scale_factor is an integer and scale_type\n");
  printf("            is either IN or DS\n");
- printf("      NONE (no parameter)\n");
+ printf("        NONE (no parameter)\n");
  printf("\n");
- printf("  LAYT - is a string with the format:\n");
+ printf("    LAYT - is a string with the format:\n");
  printf("\n");
- printf("    <list of objects>:<layout type>=<layout parameters>\n");
+ printf("      <list of objects>:<layout type>=<layout parameters>\n");
  printf("\n");
- printf("    <list of objects> is a comma separated list of object names, meaning that\n");
- printf("      layout information is supplied for those objects. If no names are\n");
- printf("      specified, the layout type is applied to all objects\n");
- printf("    <layout type> can be:\n");
- printf("      CHUNK, to apply chunking layout\n");
- printf("      COMPA, to apply compact layout\n");
- printf("      CONTI, to apply continuous layout\n");
- printf("    <layout parameters> is optional layout information\n");
- printf("      CHUNK=DIM[xDIM...xDIM], the chunk size of each dimension\n");
- printf("      COMPA (no parameter)\n");
- printf("      CONTI (no parameter)\n");
+ printf("      <list of objects> is a comma separated list of object names, meaning that\n");
+ printf("        layout information is supplied for those objects. If no names are\n");
+ printf("        specified, the layout type is applied to all objects\n");
+ printf("      <layout type> can be:\n");
+ printf("        CHUNK, to apply chunking layout\n");
+ printf("        COMPA, to apply compact layout\n");
+ printf("        CONTI, to apply continuous layout\n");
+ printf("      <layout parameters> is optional layout information\n");
+ printf("        CHUNK=DIM[xDIM...xDIM], the chunk size of each dimension\n");
+ printf("        COMPA (no parameter)\n");
+ printf("        CONTI (no parameter)\n");
  printf("\n");
  printf("Examples of use:\n");
  printf("\n");
diff --git a/tools/h5repack/h5repack_verify.c b/tools/h5repack/h5repack_verify.c
index 69df02c..83985c9 100644
--- a/tools/h5repack/h5repack_verify.c
+++ b/tools/h5repack/h5repack_verify.c
@@ -210,7 +210,7 @@ error:
             trav_table_free(travt);
     } H5E_END_TRY;
     return -1;
-}
+} /* h5repack_verify() */
 
 
 
diff --git a/tools/h5repack/h5repacktst.c b/tools/h5repack/h5repacktst.c
index d28750c..7ac339a 100644
--- a/tools/h5repack/h5repacktst.c
+++ b/tools/h5repack/h5repacktst.c
@@ -79,7 +79,6 @@
 #define FNAME_UB   "ublock.bin"
 
 
-
 const char *H5REPACK_FILENAMES[] = {
     "h5repack_big_out",
     NULL
@@ -178,6 +177,7 @@ int main (void)
     *-------------------------------------------------------------------------
     */
 
+
     /*-------------------------------------------------------------------------
     * file with fill values
     *-------------------------------------------------------------------------
@@ -1472,7 +1472,6 @@ int main (void)
     if(h5repack_verify(FNAME8OUT, &pack_options) <= 0)
         GOERROR;
 
-
     /* verify aligment */
     {
         hsize_t threshold;
diff --git a/tools/h5stat/h5stat.c b/tools/h5stat/h5stat.c
index 78fb4f5..f5537e1 100644
--- a/tools/h5stat/h5stat.c
+++ b/tools/h5stat/h5stat.c
@@ -88,7 +88,7 @@ typedef struct iter_t {
     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_ext_size;	   	/* superblock extension size */
-    hsize_t datasets_btree_storage_size;   /* btree size for chunked dataset */
+    hsize_t datasets_index_storage_size;/* meta size for chunked dataset's indexing type */
     unsigned long nexternal;            /* Number of external files for a dataset */
     int           local;                /* Flag to indicate iteration over the object*/
 } iter_t;
@@ -381,18 +381,6 @@ group_stats(iter_t *iter, const char *name, const H5O_info_t *oi)
  * Programmer:    Quincey Koziol
  *                Tuesday, August 16, 2005
  *
- * Modifications: Refactored code from the walk_function
- *                EIP, Wednesday, August 16, 2006
- *
- *                Vailin Choi 12 July 2007
- *                1. Gathered storage info for btree and heap
- *                   (chunked datasets and attributes)
- *                2. Gathered info for attributes
- *
- *		  Vailin Choi 14 July 2007
- *		  Cast "dims" and "num_attrs" to size_t
- *		  Due to the -Mbounds problem for the pgi-32bit compiler on indexing
- *
  *-------------------------------------------------------------------------
  */
 static herr_t
@@ -426,7 +414,7 @@ dataset_stats(iter_t *iter, const char *name, const H5O_info_t *oi)
     assert(did > 0);
 
     /* Update dataset metadata info */
-    iter->datasets_btree_storage_size += oi->meta_size.obj.index_size;
+    iter->datasets_index_storage_size += oi->meta_size.obj.index_size;
 
     /* Update attribute metadata info */
     ret = attribute_stats(iter, oi);
@@ -587,8 +575,7 @@ datatype_stats(iter_t *iter, const H5O_info_t *oi)
  * Purpose: Gather statistics about an object
  *
  * Return: Success: 0
- *
- *  Failure: -1
+ *  	   Failure: -1
  *
  * Programmer: Quincey Koziol
  *             Tuesday, November 6, 2007
@@ -815,7 +802,7 @@ print_file_info(const iter_t *iter)
     printf("File information\n");
     printf("\t# of unique groups: %lu\n", iter->uniq_groups);
     printf("\t# of unique datasets: %lu\n", iter->uniq_dsets);
-    printf("\t# of unique named dataypes: %lu\n", iter->uniq_dtypes);
+    printf("\t# of unique named datatypes: %lu\n", iter->uniq_dtypes);
     printf("\t# of unique links: %lu\n", iter->uniq_links);
     printf("\t# of unique other: %lu\n", iter->uniq_others);
     printf("\tMax. # of links to object: %lu\n", iter->max_links);
@@ -860,7 +847,7 @@ print_file_metadata(const iter_t *iter)
     HDfprintf(stdout, "\t\tHeap: %Hu\n", iter->attrs_heap_storage_size);
 
     HDfprintf(stdout, "\tChunked datasets:\n");
-    HDfprintf(stdout, "\t\tB-tree: %Hu\n", iter->datasets_btree_storage_size);
+    HDfprintf(stdout, "\t\tB-tree: %Hu\n", iter->datasets_index_storage_size);
 
     HDfprintf(stdout, "\tShared Messages:\n");
     HDfprintf(stdout, "\t\tHeader: %Hu\n", iter->SM_hdr_storage_size);
diff --git a/tools/h5stat/testfiles/h5stat_filters-file.ddl b/tools/h5stat/testfiles/h5stat_filters-file.ddl
index 7b8f47f..eddc898 100644
--- a/tools/h5stat/testfiles/h5stat_filters-file.ddl
+++ b/tools/h5stat/testfiles/h5stat_filters-file.ddl
@@ -5,7 +5,7 @@ Filename: h5stat_filters.h5
 File information
 	# of unique groups: 1
 	# of unique datasets: 15
-	# of unique named dataypes: 1
+	# of unique named datatypes: 1
 	# of unique links: 0
 	# of unique other: 0
 	Max. # of links to object: 1
diff --git a/tools/h5stat/testfiles/h5stat_filters.ddl b/tools/h5stat/testfiles/h5stat_filters.ddl
index 8243a23..f9adebd 100644
--- a/tools/h5stat/testfiles/h5stat_filters.ddl
+++ b/tools/h5stat/testfiles/h5stat_filters.ddl
@@ -5,7 +5,7 @@ Filename: h5stat_filters.h5
 File information
 	# of unique groups: 1
 	# of unique datasets: 15
-	# of unique named dataypes: 1
+	# of unique named datatypes: 1
 	# of unique links: 0
 	# of unique other: 0
 	Max. # of links to object: 1
diff --git a/tools/h5stat/testfiles/h5stat_newgrat.ddl b/tools/h5stat/testfiles/h5stat_newgrat.ddl
index f87f297..4f9bcac 100644
--- a/tools/h5stat/testfiles/h5stat_newgrat.ddl
+++ b/tools/h5stat/testfiles/h5stat_newgrat.ddl
@@ -5,7 +5,7 @@ Filename: h5stat_newgrat.h5
 File information
 	# of unique groups: 35001
 	# of unique datasets: 1
-	# of unique named dataypes: 0
+	# of unique named datatypes: 0
 	# of unique links: 0
 	# of unique other: 0
 	Max. # of links to object: 1
diff --git a/tools/h5stat/testfiles/h5stat_tsohm.ddl b/tools/h5stat/testfiles/h5stat_tsohm.ddl
index 577dfdd..e536c33 100644
--- a/tools/h5stat/testfiles/h5stat_tsohm.ddl
+++ b/tools/h5stat/testfiles/h5stat_tsohm.ddl
@@ -5,7 +5,7 @@ Filename: h5stat_tsohm.h5
 File information
 	# of unique groups: 1
 	# of unique datasets: 3
-	# of unique named dataypes: 0
+	# of unique named datatypes: 0
 	# of unique links: 0
 	# of unique other: 0
 	Max. # of links to object: 1