[svn-r23600] Bring revisions #23085 - #23341 from trunk to revise_chunks.

h5committested.

1 files changed, 6 insertions, 6 deletions

diff --git a/tools/h5ls/h5ls.c b/tools/h5ls/h5ls.c
index 19ae99a..f14a667 100644
--- a/tools/h5ls/h5ls.c
+++ b/tools/h5ls/h5ls.c
@@ -178,7 +178,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\
@@ -218,7 +218,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\
@@ -1454,7 +1454,7 @@ dump_dataset_values(hid_t dset)
 
     h5tools_str_close(&buffer);
     
-    HDfprintf(rawoutstream, "\n");
+    PRINTVALSTREAM(rawoutstream, "\n");
 }
 
 
@@ -1638,7 +1638,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;
 }
@@ -2264,7 +2264,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;
 
@@ -2750,7 +2750,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 */