diff options
author | Robb Matzke <matzke@llnl.gov> | 1998-11-11 16:33:33 (GMT) |
---|---|---|
committer | Robb Matzke <matzke@llnl.gov> | 1998-11-11 16:33:33 (GMT) |
commit | bb36032d5a67da619efb8d6139f4f6bae1fe4706 (patch) | |
tree | 819eb2f9d631d5e3accf9042d4fce60861f25c5c /tools/h5tools.c | |
parent | c82e6a41229a20086e0d6903da0f831b60ff62d9 (diff) | |
download | hdf5-bb36032d5a67da619efb8d6139f4f6bae1fe4706.zip hdf5-bb36032d5a67da619efb8d6139f4f6bae1fe4706.tar.gz hdf5-bb36032d5a67da619efb8d6139f4f6bae1fe4706.tar.bz2 |
[svn-r900] Changes since 19981106
----------------------
./tools/h5ls.c
The chunk dimensions and total size is printed for chunked datasets.
./examples/h5_attribute.c
./examples/h5_select.c
./test/chunk.c
./test/iopipe.c
./test/ragged.c
./src/H5.c
./src/H5private.h
./src/H5public.h
Removed extra carriage-return characters inserted by a broken
OS :-)
Reformatted strange-looking comments.
Removed C++ comments.
Wrapped long lines.
./examples/h5_attribute.c
./examples/h5_select.c
Removed inclusion of private headers.
Changed `uint32' (originally `uint') to `unsigned' because
`int32' is not exported as part of the API.
./src/H5Fmpio.h
Removed includes for <sys/types.h> and <sys/stat.h> since
they're already included by H5private.h. All system include
files should be included in H5private.h so we can wrap them
with appropriate feature macros.
./tools/h5import.c
./tools/h5repart.c
Included header files like all other programs in that
directory.
./tools/h5tools.c
Better type checking for `hsize_t' and `hssize_t'.
Diffstat (limited to 'tools/h5tools.c')
-rw-r--r-- | tools/h5tools.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tools/h5tools.c b/tools/h5tools.c index 30bd03e..ec91f34 100644 --- a/tools/h5tools.c +++ b/tools/h5tools.c @@ -29,8 +29,6 @@ #endif #define OPT(X,S) ((X)?(X):(S)) -#define MIN(X,Y) ((X)<(Y)?(X):(Y)) -#define NELMTS(X) (sizeof(X)/sizeof(*X)) #define ALIGN(A,Z) ((((A)+(Z)-1)/(Z))*(Z)) @@ -250,7 +248,9 @@ h5dump_sprint(char *s/*out*/, const h5dump_t *info, hid_t type, void *vp) sprintf(temp, "%lu", *((unsigned long*)vp)); } else if (H5Tequal(type, H5T_NATIVE_HSSIZE)) { - if (sizeof(hssize_t)==sizeof(long)) { + if (sizeof(hssize_t)==sizeof(int)) { + sprintf(temp, "%d", *((int*)vp)); + } else if (sizeof(hssize_t)==sizeof(long)) { sprintf(temp, "%ld", *((long*)vp)); } else { char fmt[8]; @@ -261,7 +261,9 @@ h5dump_sprint(char *s/*out*/, const h5dump_t *info, hid_t type, void *vp) } } else if (H5Tequal(type, H5T_NATIVE_HSIZE)) { - if (sizeof(hsize_t)==sizeof(long)) { + if (sizeof(hsize_t)==sizeof(int)) { + sprintf(temp, "%u", *((unsigned*)vp)); + } else if (sizeof(hsize_t)==sizeof(long)) { sprintf(temp, "%lu", *((unsigned long*)vp)); } else { char fmt[8]; |