[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

1 files changed, 9 insertions, 1 deletions

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