[svn-r17646] 1. tools/h5repack/h5repack_main.c: accept string for strategy instead of a number

2. tools/h5stat/h5stat.c: clean up and activate options as stated in usage
3. tools/h5stat/testfiles/*.ddl: modified according to the latest output

-This line, and those below, will be ignored--

M    tools/h5repack/h5repack_main.c
M    tools/h5stat/testfiles/h5stat_newgrat.ddl
M    tools/h5stat/testfiles/h5stat_filters.ddl
M    tools/h5stat/testfiles/h5stat_help1.ddl
M    tools/h5stat/testfiles/h5stat_help2.ddl
M    tools/h5stat/testfiles/h5stat_tsohm.ddl
M    tools/h5stat/testfiles/h5stat_filters-F.ddl
M    tools/h5stat/h5stat.c

6 files changed, 45 insertions, 20 deletions

diff --git a/tools/h5stat/testfiles/h5stat_filters-F.ddl b/tools/h5stat/testfiles/h5stat_filters-F.ddl
index 78c7c5a..fba875a 100644
--- a/tools/h5stat/testfiles/h5stat_filters-F.ddl
+++ b/tools/h5stat/testfiles/h5stat_filters-F.ddl
@@ -2,7 +2,7 @@
 Expected output for 'h5stat -F h5stat_filters.h5'
 #############################
 Filename: h5stat_filters.h5
-Storage information (in bytes):
+File space information for file metadata (in bytes):
 	Superblock: 96
 	Superblock extension: 0
 	User block: 0
diff --git a/tools/h5stat/testfiles/h5stat_filters.ddl b/tools/h5stat/testfiles/h5stat_filters.ddl
index 6ce04fe..ddafd81 100644
--- a/tools/h5stat/testfiles/h5stat_filters.ddl
+++ b/tools/h5stat/testfiles/h5stat_filters.ddl
@@ -10,7 +10,7 @@ File information
 	# of unique other: 0
 	Max. # of links to object: 1
 	Max. # of objects in group: 16
-Storage information (in bytes):
+File space information for file metadata (in bytes):
 	Superblock: 96
 	Superblock extension: 0
 	User block: 0
@@ -84,7 +84,16 @@ Small # of attributes:
 Attribute bins:
 	Total # of objects with attributes: 0
 	Max. # of attributes to objects: 0
+Free-space section threshold: 1 bytes
 Small size free-space sections (< 10 bytes):
 	Total # of small size sections: 0
 Free-space section bins:
 	Total # of sections: 0
+File space management strategy: H5F_FILE_SPACE_ALL
+Summary of file space information:
+  File metadata: 37312 bytes
+  Raw data: 8659 bytes
+  Amount/Percent of tracked free space: 0 bytes/0.0%
+  Unaccounted space: 301 bytes
+Total space: 46272 bytes
+External raw data: 400 bytes
diff --git a/tools/h5stat/testfiles/h5stat_help1.ddl b/tools/h5stat/testfiles/h5stat_help1.ddl
index 5808c49..e70fef1 100644
--- a/tools/h5stat/testfiles/h5stat_help1.ddl
+++ b/tools/h5stat/testfiles/h5stat_help1.ddl
@@ -5,14 +5,14 @@ Usage: h5stat [OPTIONS] file
 
       OPTIONS
      -h, --help            Print a usage message and exit
-     -V, --version         Print version number and exit
+     -v, --version         Print version number and exit
      -f, --file            Print file information
-     -F, --filemetadata    Print file metadata
+     -F, --FILEmetadata    Print file space information for file's metadata
      -g, --group           Print group information
-     -G, --groupmetadata   Print group metadata
+     -G, --GROUPmetadata   Print file space information for groups' metadata
      -d, --dset            Print dataset information
-     -D, --dsetmetadata    Print dataset metadata
-     -T, --dtypemetadata   Print datatype metadata
-     -A, --attribute       Print attribute information
-     -s, --freespace       Print free-space information
-     -S, --Summary         Print summary of storage information
+     -D, --DSETmetadata    Print file space information for datasets' metadata
+     -T, --DSETtypeinfo    Print datasets' datatype information
+     -a, --attribute       Print attribute information
+     -s, --freespace       Print free space information
+     -S, --summary         Print summary of file space information
diff --git a/tools/h5stat/testfiles/h5stat_help2.ddl b/tools/h5stat/testfiles/h5stat_help2.ddl
index 169787f..fbfdd14 100644
--- a/tools/h5stat/testfiles/h5stat_help2.ddl
+++ b/tools/h5stat/testfiles/h5stat_help2.ddl
@@ -5,14 +5,14 @@ Usage: h5stat [OPTIONS] file
 
       OPTIONS
      -h, --help            Print a usage message and exit
-     -V, --version         Print version number and exit
+     -v, --version         Print version number and exit
      -f, --file            Print file information
-     -F, --filemetadata    Print file metadata
+     -F, --FILEmetadata    Print file space information for file's metadata
      -g, --group           Print group information
-     -G, --groupmetadata   Print group metadata
+     -G, --GROUPmetadata   Print file space information for groups' metadata
      -d, --dset            Print dataset information
-     -D, --dsetmetadata    Print dataset metadata
-     -T, --dtypemetadata   Print datatype metadata
-     -A, --attribute       Print attribute information
-     -s, --freespace       Print free-space information
-     -S, --Summary         Print summary of storage information
+     -D, --DSETmetadata    Print file space information for datasets' metadata
+     -T, --DSETtypeinfo    Print datasets' datatype information
+     -a, --attribute       Print attribute information
+     -s, --freespace       Print free space information
+     -S, --summary         Print summary of file space information
diff --git a/tools/h5stat/testfiles/h5stat_newgrat.ddl b/tools/h5stat/testfiles/h5stat_newgrat.ddl
index 877e55a..c2f6152 100644
--- a/tools/h5stat/testfiles/h5stat_newgrat.ddl
+++ b/tools/h5stat/testfiles/h5stat_newgrat.ddl
@@ -10,7 +10,7 @@ File information
 	# of unique other: 0
 	Max. # of links to object: 1
 	Max. # of objects in group: 35001
-Storage information (in bytes):
+File space information for file metadata (in bytes):
 	Superblock: 48
 	Superblock extension: 119
 	User block: 0
@@ -80,6 +80,7 @@ Attribute bins:
 	# of objects with 100 - 999 attributes: 1
 	Total # of objects with attributes: 1
 	Max. # of attributes to objects: 100
+Free-space section threshold: 1 bytes
 Small size free-space sections (< 10 bytes):
 	# of sections of size 1: 1
 	# of sections of size 2: 12
@@ -92,3 +93,10 @@ Free-space section bins:
 	# of sections of size 10 - 99: 44
 	# of sections of size 100 - 999: 18
 	Total # of sections: 81
+File space management strategy: H5F_FILE_SPACE_ALL_PERSIST
+Summary of file space information:
+  File metadata: 6363206 bytes
+  Raw data: 0 bytes
+  Amount/Percent of tracked free space: 4463 bytes/0.1%
+  Unaccounted space: 0 bytes
+Total space: 6367669 bytes
diff --git a/tools/h5stat/testfiles/h5stat_tsohm.ddl b/tools/h5stat/testfiles/h5stat_tsohm.ddl
index a53e40c..c7ed5f4 100644
--- a/tools/h5stat/testfiles/h5stat_tsohm.ddl
+++ b/tools/h5stat/testfiles/h5stat_tsohm.ddl
@@ -10,7 +10,7 @@ File information
 	# of unique other: 0
 	Max. # of links to object: 1
 	Max. # of objects in group: 3
-Storage information (in bytes):
+File space information for file metadata (in bytes):
 	Superblock: 48
 	Superblock extension: 40
 	User block: 0
@@ -78,7 +78,15 @@ Small # of attributes:
 Attribute bins:
 	Total # of objects with attributes: 0
 	Max. # of attributes to objects: 0
+Free-space section threshold: 1 bytes
 Small size free-space sections (< 10 bytes):
 	Total # of small size sections: 0
 Free-space section bins:
 	Total # of sections: 0
+File space management strategy: H5F_FILE_SPACE_ALL
+Summary of file space information:
+  File metadata: 3887 bytes
+  Raw data: 0 bytes
+  Amount/Percent of tracked free space: 0 bytes/0.0%
+  Unaccounted space: 0 bytes
+Total space: 3887 bytes