[svn-r18796] Enhancement 1853:

Install packed-bits feature for h5dump.

tools/h5dump/h5dump.c:
    Added lots of error checking into parse_mask_list() to catch and
    flagged packed-bits argument errors. For now, the packed bits
    are limited to 1 byte (8 bits) range.

tools/h5dump/testh5dump.sh.in
    Added 10 new packed-bits test to verify normal operation and argument
    error detection.

tools/lib/h5tools.h:
tools/lib/h5tools_str.c:
tools/lib/h5tools.c:
    Only name changes of the packed-bit global variables to reflect
    the nature of the variable better, IMO.

Tested: albertPax (linux)
------------------------------------------------------------------------

1 files changed, 8 insertions, 8 deletions

diff --git a/tools/lib/h5tools_str.c b/tools/lib/h5tools_str.c
index c7fb8a9..b1c017a 100644
--- a/tools/lib/h5tools_str.c
+++ b/tools/lib/h5tools_str.c
@@ -784,7 +784,7 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
     else if (H5Tequal(type, H5T_NATIVE_INT)) {
         HDmemcpy(&tempint, vp, sizeof(int));
 #ifdef H5_HAVE_H5DUMP_PACKED_BITS
-        if(packed_output)
+        if(packed_bits_num)
             tempint = (tempint & packed_counter)>>packed_normalize;
 #endif
         h5tools_str_append(str, OPT(info->fmt_int, "%d"), tempint);
@@ -792,7 +792,7 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
     else if (H5Tequal(type, H5T_NATIVE_UINT)) {
         HDmemcpy(&tempuint, vp, sizeof(unsigned int));
 #ifdef H5_HAVE_H5DUMP_PACKED_BITS
-        if(packed_output)
+        if(packed_bits_num)
             tempuint = (tempuint & packed_counter)>>packed_normalize;
 #endif
         h5tools_str_append(str, OPT(info->fmt_uint, "%u"), tempuint);
@@ -801,7 +801,7 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
         char               tempchar;
         HDmemcpy(&tempchar, cp_vp, sizeof(char));
 #ifdef H5_HAVE_H5DUMP_PACKED_BITS
-        if(packed_output)
+        if(packed_bits_num)
             tempchar = (tempchar & packed_counter)>>packed_normalize;
 #endif
         h5tools_str_append(str, OPT(info->fmt_schar, "%d"), tempchar);
@@ -810,7 +810,7 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
         unsigned char      tempuchar;
         HDmemcpy(&tempuchar, ucp_vp, sizeof(unsigned char));
 #ifdef H5_HAVE_H5DUMP_PACKED_BITS
-        if(packed_output)
+        if(packed_bits_num)
             tempuchar = (tempuchar & packed_counter)>>packed_normalize;
 #endif
         h5tools_str_append(str, OPT(info->fmt_uchar, "%u"), tempuchar);
@@ -820,7 +820,7 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
 
         HDmemcpy(&tempshort, vp, sizeof(short));
 #ifdef H5_HAVE_H5DUMP_PACKED_BITS
-        if(packed_output)
+        if(packed_bits_num)
             tempshort = (tempshort & packed_counter)>>packed_normalize;
 #endif
         h5tools_str_append(str, OPT(info->fmt_short, "%d"), tempshort);
@@ -830,7 +830,7 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
 
         HDmemcpy(&tempushort, vp, sizeof(unsigned short));
 #ifdef H5_HAVE_H5DUMP_PACKED_BITS
-        if(packed_output)
+        if(packed_bits_num)
             tempushort = (tempushort & packed_counter)>>packed_normalize;
 #endif
         h5tools_str_append(str, OPT(info->fmt_ushort, "%u"), tempushort);
@@ -838,7 +838,7 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
     else if (H5Tequal(type, H5T_NATIVE_LONG)) {
         HDmemcpy(&templong, vp, sizeof(long));
 #ifdef H5_HAVE_H5DUMP_PACKED_BITS
-        if(packed_output)
+        if(packed_bits_num)
             templong = (templong & packed_counter)>>packed_normalize;
 #endif
         h5tools_str_append(str, OPT(info->fmt_long, "%ld"), templong);
@@ -846,7 +846,7 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
     else if (H5Tequal(type, H5T_NATIVE_ULONG)) {
         HDmemcpy(&tempulong, vp, sizeof(unsigned long));
 #ifdef H5_HAVE_H5DUMP_PACKED_BITS
-        if(packed_output)
+        if(packed_bits_num)
             tempulong = (tempulong & packed_counter)>>packed_normalize;
 #endif
         h5tools_str_append(str, OPT(info->fmt_ulong, "%lu"), tempulong);