diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2011-05-04 19:46:33 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2011-05-04 19:46:33 (GMT) |
commit | 7706186b2fc3095b5b6e2d8b4f8e4a1c45df3abe (patch) | |
tree | 63ff45c29edb39e00c6a44c32618e8c23c7dfbba /tools/lib/h5tools_str.c | |
parent | be60cc1759b1b0907dd23962359077e1d54596c1 (diff) | |
download | hdf5-7706186b2fc3095b5b6e2d8b4f8e4a1c45df3abe.zip hdf5-7706186b2fc3095b5b6e2d8b4f8e4a1c45df3abe.tar.gz hdf5-7706186b2fc3095b5b6e2d8b4f8e4a1c45df3abe.tar.bz2 |
[svn-r20722] Refactor ext lib import and install.
Change case of tools subtests to not conflict with tools tests.
Add SOVERSION for linux
Remove PACKED BITS define/idef blocks
Bring r20721 from trunk
Diffstat (limited to 'tools/lib/h5tools_str.c')
-rw-r--r-- | tools/lib/h5tools_str.c | 20 |
1 files changed, 0 insertions, 20 deletions
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)) { |