diff options
| author | Bill Wendling <wendling@ncsa.uiuc.edu> | 2001-08-02 17:57:12 (GMT) |
|---|---|---|
| committer | Bill Wendling <wendling@ncsa.uiuc.edu> | 2001-08-02 17:57:12 (GMT) |
| commit | 34fa342bab4fb85ef86198b1d55d3de8a26cf72f (patch) | |
| tree | 3354b4f380a810e75c50aa35b73ca625b02e678b | |
| parent | f303405aee3efd78f68c82d8b6cc540a05d34184 (diff) | |
| download | hdf5-34fa342bab4fb85ef86198b1d55d3de8a26cf72f.zip hdf5-34fa342bab4fb85ef86198b1d55d3de8a26cf72f.tar.gz hdf5-34fa342bab4fb85ef86198b1d55d3de8a26cf72f.tar.bz2 | |
[svn-r4307]
Purpose:
Sync
Description:
Brought into sync with the 1.5 branch. This included the fix for the
new h5tools_fopen() call. It now accepts the parameter for specifying
a filedriver.
Platforms tested:
Linux
| -rw-r--r-- | tools/h5ls/h5ls.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/tools/h5ls/h5ls.c b/tools/h5ls/h5ls.c index 5a2b0a1..ab07849 100644 --- a/tools/h5ls/h5ls.c +++ b/tools/h5ls/h5ls.c @@ -1,12 +1,12 @@ /* - * Copyright (C) 1998 NCSA - * All rights reserved. + * Copyright (C) 1998, 2001 + * National Center for Supercomputing Applications + * All rights reserved * * Programmer: Robb Matzke <matzke@llnl.gov> * Monday, March 23, 1998 */ - /* * We include the private header file so we can get to the uniform * programming environment it declares. Other than that, h5ls only calls @@ -14,6 +14,7 @@ */ #include "H5private.h" #include "h5tools.h" +#include "h5tools_utils.h" /* * If defined then include the file name as part of the object name when @@ -847,10 +848,10 @@ display_enum_type(hid_t type, int ind) printf("%02x", value[i*dst_size+j]); } } else if (H5T_SGN_NONE==H5Tget_sign(native)) { - printf("%"PRINTF_LL_WIDTH"u", + HDfprintf(stdout,"%"PRINTF_LL_WIDTH"u", *((unsigned long_long*)((void*)(value+i*dst_size)))); } else { - printf("%"PRINTF_LL_WIDTH"d", + HDfprintf(stdout,"%"PRINTF_LL_WIDTH"d", *((long_long*)((void*)(value+i*dst_size)))); } } @@ -2103,7 +2104,7 @@ main (int argc, char *argv[]) file = -1; while (fname && *fname) { - file = h5tools_fopen(fname, drivername, sizeof drivername); + file = h5tools_fopen(fname, NULL, drivername, sizeof drivername); if (file>=0) { if (verbose_g) { |