[svn-r23301]

2 files changed, 8 insertions, 9 deletions

diff --git a/tools/h5ls/CMakeLists.txt b/tools/h5ls/CMakeLists.txt
index 5cce6cb..70943b5 100644
--- a/tools/h5ls/CMakeLists.txt
+++ b/tools/h5ls/CMakeLists.txt
@@ -145,10 +145,9 @@ IF (BUILD_TESTING)
       IF (NOT "${last_test}" STREQUAL "")
         SET_TESTS_PROPERTIES (H5LS-${resultfile} PROPERTIES DEPENDS ${last_test})
       ENDIF (NOT "${last_test}" STREQUAL "")
-      SET (last_test "H5LS-${resultfile}")
     ELSE (HDF5_ENABLE_USING_MEMCHECKER)
       ADD_TEST (
-          NAME H5LS-clear-${resultfile}-objects
+          NAME H5LS-${resultfile}-clear-objects
           COMMAND    ${CMAKE_COMMAND}
               -E remove ./testfiles/${resultfile}.out ./testfiles/${resultfile}.out.err
       )
@@ -163,7 +162,7 @@ IF (BUILD_TESTING)
               -D "TEST_REFERENCE=${resultfile}.ls"
               -P "${HDF5_RESOURCES_DIR}/runTest.cmake"
       )
-      SET_TESTS_PROPERTIES (H5LS-${resultfile} PROPERTIES DEPENDS "H5LS-clear-${resultfile}-objects")
+      SET_TESTS_PROPERTIES (H5LS-${resultfile} PROPERTIES DEPENDS "H5LS-${resultfile}-clear-objects")
     ENDIF (HDF5_ENABLE_USING_MEMCHECKER)
   ENDMACRO (ADD_H5_TEST file)
 
diff --git a/tools/h5ls/h5ls.c b/tools/h5ls/h5ls.c
index 0fc0531..7135e4e 100644
--- a/tools/h5ls/h5ls.c
+++ b/tools/h5ls/h5ls.c
@@ -177,7 +177,7 @@ static void
 usage (void)
 {
     HDfprintf(rawerrorstream, "\
-usage: %s [OPTIONS] [OBJECTS...]\n\
+usage: %s [OPTIONS] file[/OBJECT] [file[/[OBJECT]...]\n\
   OPTIONS\n\
    -h, -?, --help  Print a usage message and exit\n\
    -a, --address   Print raw data address.  If dataset is contiguous, address\n\
@@ -217,7 +217,7 @@ usage: %s [OPTIONS] [OBJECTS...]\n\
    --vfd=DRIVER    Use the specified virtual file driver\n\
    -x, --hexdump   Show raw data in hexadecimal format\n\
 \n\
-  OBJECTS\n\
+  file/OBJECT\n\
     Each object consists of an HDF5 file name optionally followed by a\n\
     slash and an object name within the file (if no object is specified\n\
     within the file then the contents of the root group are displayed).\n\
@@ -1453,7 +1453,7 @@ dump_dataset_values(hid_t dset)
 
     h5tools_str_close(&buffer);
     
-    HDfprintf(rawoutstream, "\n");
+    PRINTVALSTREAM(rawoutstream, "\n");
 }
 
 
@@ -1637,7 +1637,7 @@ list_attr(hid_t obj, const char *attr_name, const H5A_info_t UNUSED *ainfo,
     } 
     h5tools_str_close(&buffer);
 
-    HDfprintf(rawoutstream, "\n");
+    PRINTVALSTREAM(rawoutstream, "\n");
 
     return 0;
 }
@@ -2263,7 +2263,7 @@ list_lnk(const char *name, const H5L_info_t *linfo, void *_iter)
                 grp_literal_g = orig_grp_literal;
             }
             else
-                HDfprintf(rawoutstream, "\n");
+                PRINTVALSTREAM(rawoutstream, "\n");
             }
             break;
 
@@ -2749,7 +2749,7 @@ main(int argc, const char *argv[])
 
             if(file >= 0) {
                 if(verbose_g)
-                    HDfprintf(rawoutstream, "Opened \"%s\" with %s driver.\n", fname, drivername);
+                    PRINTSTREAM(rawoutstream, "Opened \"%s\" with %s driver.\n", fname, drivername);
                 break; /*success*/
             } /* end if */