[svn-r20385] Purpose:

    Bug 2182 - h5ls and h5dump: update to use --enable-error-stack among tools, also update related descriptions

Description:
    Merged from HDF5 trunk r20378 and r20379
    Decided to use --enable-error-stack long option name only to 
    display error stack messages from HDF5 lib among tools.
    Updated to unify option name to '--enable-error-stack' for printing 
    HDF5 error stack messages for HDF5 tools. h5ls and h5dump for now.
    For h5ls, this replaces "-e/--errors" option, which is deprecated.
    For h5dump, remove -E from help page and RM , which was added by mistake
    before release1.8.7.
    Help page and RM got updated.
    Updated test case.
     
Tested:
 jam (linux32-LE), amani (linux64-LE), heiwa (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE)

1 files changed, 9 insertions, 2 deletions

diff --git a/tools/h5ls/h5ls.c b/tools/h5ls/h5ls.c
index 8987d03..722f45c 100644
--- a/tools/h5ls/h5ls.c
+++ b/tools/h5ls/h5ls.c
@@ -111,7 +111,8 @@ usage: %s [OPTIONS] [OBJECTS...]\n\
                    Must be used with -v, --verbose option.\n\
                    Provides no information for non-dataset objects.\n\
    -d, --data      Print the values of datasets\n\
-   -e, --errors    Show all HDF5 error reporting\n\
+   --enable-error-stack\n\
+                   Prints messages from the HDF5 error stack as they occur.\n\
    --follow-symlinks\n\
                    Follow symbolic links (soft links and external links)\n\
                    to display target object information.\n\
@@ -156,7 +157,9 @@ usage: %s [OPTIONS] [OBJECTS...]\n\
     updated to use the replacement option.\n\
 \n\
    -E or --external   Follow external links.\n\
-                      Replaced by --follow-symlinks.\n",
+                      Replaced by --follow-symlinks.\n\
+   -e, --errors       Show all HDF5 error reporting\n\
+                      Replaced by --enable-error-stack.\n",
      h5tools_getprogname());
 }
 
@@ -2295,6 +2298,9 @@ main(int argc, const char *argv[])
             address_g = TRUE;
         } else if(!HDstrcmp(argv[argno], "--data")) {
             data_g = TRUE;
+        } else if(!HDstrcmp(argv[argno], "--enable-error-stack")) {
+            show_errors_g = TRUE;
+        /* deprecated --errors */
         } else if(!HDstrcmp(argv[argno], "--errors")) {
             show_errors_g = TRUE;
         } else if(!HDstrcmp(argv[argno], "--follow-symlinks")) {
@@ -2380,6 +2386,7 @@ main(int argc, const char *argv[])
                         data_g = TRUE;
                         break;
 
+                    /* deprecated -e */
                     case 'e': /* --errors */
                         show_errors_g = TRUE;
                         break;