[svn-r20713] Packed Bits Merge:

   removed option defines and #ifdef/#endif
   refactored all printf to HDfprintf in h5dump.c
   formatted and indention improvements
   synched with 1.8 branch
   
Tested: local linux

3 files changed, 6 insertions, 31 deletions

diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c
index a712794..3d96bed 100644
--- a/tools/lib/h5tools.c
+++ b/tools/lib/h5tools.c
@@ -42,11 +42,9 @@ FILE       *rawdatastream; /* should initialize to stdout but gcc moans about it
 int         bin_output;    /* binary output */
 int         bin_form;      /* binary form */
 int         region_output; /* region output */
-#ifdef H5_HAVE_H5DUMP_PACKED_BITS
 int         packed_bits_num; /* number of packed bits to display */
 int         packed_data_offset; /* offset of packed bits to display */
 unsigned long long packed_data_mask;  /* mask in which packed bits to display */
-#endif
 
 static h5tool_format_t h5tools_dataformat = {
 0, /*raw */
@@ -4349,23 +4347,23 @@ hbool_t h5tools_is_zero(const void *_mem, size_t size)
  *-------------------------------------------------------------------------
  */
 hbool_t h5tools_is_obj_same(hid_t loc_id1, const char *name1,
-		                    hid_t loc_id2, const char *name2)
+                        hid_t loc_id2, const char *name2)
 {
     H5O_info_t oinfo1,  oinfo2;
     hbool_t ret_val = 0;
 
     if ( name1 && strcmp(name1, "."))
-    	H5Oget_info_by_name(loc_id1, name1, &oinfo1, H5P_DEFAULT);
+      H5Oget_info_by_name(loc_id1, name1, &oinfo1, H5P_DEFAULT);
     else
-    	H5Oget_info(loc_id1, &oinfo1);
+      H5Oget_info(loc_id1, &oinfo1);
 
     if ( name2 && strcmp(name2, "."))
-    	H5Oget_info_by_name(loc_id2, name2, &oinfo2, H5P_DEFAULT);
+      H5Oget_info_by_name(loc_id2, name2, &oinfo2, H5P_DEFAULT);
     else
-    	H5Oget_info(loc_id2, &oinfo2);
+      H5Oget_info(loc_id2, &oinfo2);
 
     if (oinfo1.fileno == oinfo2.fileno && oinfo1.addr==oinfo2.addr)
-    	ret_val = 1;
+      ret_val = 1;
 
     return ret_val;
 }
diff --git a/tools/lib/h5tools.h b/tools/lib/h5tools.h
index 448a20c..1b2014a 100644
--- a/tools/lib/h5tools.h
+++ b/tools/lib/h5tools.h
@@ -530,12 +530,9 @@ struct subset_t {
 extern "C" {
 #endif
 
-#ifdef H5_HAVE_H5DUMP_PACKED_BITS
 H5TOOLS_DLLVAR int     packed_bits_num;       /* number of packed bits to display */
 H5TOOLS_DLLVAR int     packed_data_offset;    /* offset of packed bits to display */
 H5TOOLS_DLLVAR unsigned long long packed_data_mask;  /* mask in which packed bits to display */
-#endif
-
 H5TOOLS_DLLVAR FILE   *rawdatastream;       /* output stream for raw data */
 H5TOOLS_DLLVAR int     bin_output;          /* binary output */
 H5TOOLS_DLLVAR int     bin_form;            /* binary form */
diff --git a/tools/lib/h5tools_str.c b/tools/lib/h5tools_str.c
index 7630e9a..ed13ac4 100644
--- a/tools/lib/h5tools_str.c
+++ b/tools/lib/h5tools_str.c
@@ -795,98 +795,78 @@ 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_bits_num) {
             tempint = (tempint >> packed_data_offset) & packed_data_mask;
         }
-#endif
         h5tools_str_append(str, OPT(info->fmt_int, "%d"), tempint);
     }
     else if (H5Tequal(type, H5T_NATIVE_UINT)) {
         HDmemcpy(&tempuint, vp, sizeof(unsigned int));
-#ifdef H5_HAVE_H5DUMP_PACKED_BITS
         if(packed_bits_num) {
             tempuint = (tempuint >> packed_data_offset) & packed_data_mask;
         }
-#endif
         h5tools_str_append(str, OPT(info->fmt_uint, "%u"), tempuint);
     }
     else if (H5Tequal(type, H5T_NATIVE_SCHAR)) {
         char               tempchar;
         HDmemcpy(&tempchar, cp_vp, sizeof(char));
-#ifdef H5_HAVE_H5DUMP_PACKED_BITS
         if(packed_bits_num) {
             tempchar = (tempchar >> packed_data_offset) & packed_data_mask;
         }
-#endif
         h5tools_str_append(str, OPT(info->fmt_schar, "%hhd"), tempchar);
     }
     else if (H5Tequal(type, H5T_NATIVE_UCHAR)) {
         unsigned char      tempuchar;
         HDmemcpy(&tempuchar, ucp_vp, sizeof(unsigned char));
-#ifdef H5_HAVE_H5DUMP_PACKED_BITS
         if(packed_bits_num) {
             tempuchar = (tempuchar >> packed_data_offset) & packed_data_mask;
         }
-#endif
         h5tools_str_append(str, OPT(info->fmt_uchar, "%u"), tempuchar);
     }
     else if (H5Tequal(type, H5T_NATIVE_SHORT)) {
         short tempshort;
 
         HDmemcpy(&tempshort, vp, sizeof(short));
-#ifdef H5_HAVE_H5DUMP_PACKED_BITS
         if(packed_bits_num) {
             tempshort = (tempshort >> packed_data_offset) & packed_data_mask;
         }
-#endif
         h5tools_str_append(str, OPT(info->fmt_short, "%d"), tempshort);
     }
     else if (H5Tequal(type, H5T_NATIVE_USHORT)) {
         unsigned short tempushort;
 
         HDmemcpy(&tempushort, vp, sizeof(unsigned short));
-#ifdef H5_HAVE_H5DUMP_PACKED_BITS
         if(packed_bits_num) {
             tempushort = (tempushort >> packed_data_offset) & packed_data_mask;
         }
-#endif
         h5tools_str_append(str, OPT(info->fmt_ushort, "%u"), tempushort);
     }
     else if (H5Tequal(type, H5T_NATIVE_LONG)) {
         HDmemcpy(&templong, vp, sizeof(long));
-#ifdef H5_HAVE_H5DUMP_PACKED_BITS
         if(packed_bits_num) {
             templong = (templong >> packed_data_offset) & packed_data_mask;
         }
-#endif
         h5tools_str_append(str, OPT(info->fmt_long, "%ld"), templong);
     }
     else if (H5Tequal(type, H5T_NATIVE_ULONG)) {
         HDmemcpy(&tempulong, vp, sizeof(unsigned long));
-#ifdef H5_HAVE_H5DUMP_PACKED_BITS
         if(packed_bits_num) {
             tempulong = (tempulong >> packed_data_offset) & packed_data_mask;
         }
-#endif
         h5tools_str_append(str, OPT(info->fmt_ulong, "%lu"), tempulong);
     }
     else if (H5Tequal(type, H5T_NATIVE_LLONG)) {
         HDmemcpy(&templlong, vp, sizeof(long long));
-#ifdef H5_HAVE_H5DUMP_PACKED_BITS
         if(packed_bits_num) {
             templlong = (templlong >> packed_data_offset) & packed_data_mask;
         }
-#endif
         h5tools_str_append(str, OPT(info->fmt_llong, fmt_llong), templlong);
     }
     else if (H5Tequal(type, H5T_NATIVE_ULLONG)) {
         HDmemcpy(&tempullong, vp, sizeof(unsigned long long));
-#ifdef H5_HAVE_H5DUMP_PACKED_BITS
         if(packed_bits_num) {
             tempullong = (tempullong >> packed_data_offset) & packed_data_mask;
         }
-#endif
         h5tools_str_append(str, OPT(info->fmt_ullong, fmt_ullong), tempullong);
     }
     else if (H5Tequal(type, H5T_NATIVE_HSSIZE)) {