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 | |
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')
-rw-r--r-- | tools/lib/Makefile.in | 1 | ||||
-rw-r--r-- | tools/lib/h5tools.c | 14 | ||||
-rw-r--r-- | tools/lib/h5tools.h | 5 | ||||
-rw-r--r-- | tools/lib/h5tools_str.c | 20 |
4 files changed, 7 insertions, 33 deletions
diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in index d7e4a01..ea898db 100644 --- a/tools/lib/Makefile.in +++ b/tools/lib/Makefile.in @@ -241,7 +241,6 @@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ -PACKED_BITS = @PACKED_BITS@ PARALLEL = @PARALLEL@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ 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 88847d1..1b2014a 100644 --- a/tools/lib/h5tools.h +++ b/tools/lib/h5tools.h @@ -529,13 +529,10 @@ struct subset_t { #ifdef __cplusplus 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)) { |