diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2019-06-28 05:38:20 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2019-06-28 05:38:20 (GMT) |
| commit | de2440ae5f5227a8f513c4fef4c963990d6bb90f (patch) | |
| tree | 22f98e8b43594aec66ab141c7df89d086a73269b | |
| parent | 2c69584fb124c20e1dd06c31f2baf240b50b381c (diff) | |
| download | hdf5-de2440ae5f5227a8f513c4fef4c963990d6bb90f.zip hdf5-de2440ae5f5227a8f513c4fef4c963990d6bb90f.tar.gz hdf5-de2440ae5f5227a8f513c4fef4c963990d6bb90f.tar.bz2 | |
Warning fixes:
* fix for static/const flipped in H5Dint.c
* Removed missing done target in H5Rint.c
* Fixed misleading indentation in h5format_convert.c
| -rw-r--r-- | src/H5Dint.c | 4 | ||||
| -rw-r--r-- | src/H5Rint.c | 3 | ||||
| -rw-r--r-- | tools/src/h5format_convert/h5format_convert.c | 10 |
3 files changed, 9 insertions, 8 deletions
diff --git a/src/H5Dint.c b/src/H5Dint.c index cd120d0..b517f8b 100644 --- a/src/H5Dint.c +++ b/src/H5Dint.c @@ -114,8 +114,8 @@ static hbool_t H5D_top_package_initialize_s = FALSE; /* Prefixes of VDS and external file from the environment variables * HDF5_EXTFILE_PREFIX and HDF5_VDS_PREFIX */ -const static char *H5D_prefix_ext_env = NULL; -const static char *H5D_prefix_vds_env = NULL; +static const char *H5D_prefix_ext_env = NULL; +static const char *H5D_prefix_vds_env = NULL; /*------------------------------------------------------------------------- diff --git a/src/H5Rint.c b/src/H5Rint.c index 8109ac0..2355ec1 100644 --- a/src/H5Rint.c +++ b/src/H5Rint.c @@ -84,12 +84,11 @@ H5R__init_package(void) { herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT + FUNC_ENTER_NOAPI_NOINIT_NOERR /* Mark "top" of interface as initialized */ H5R_top_package_initialize_s = TRUE; -done: FUNC_LEAVE_NOAPI(ret_value) } /* end H5R__init_package() */ diff --git a/tools/src/h5format_convert/h5format_convert.c b/tools/src/h5format_convert/h5format_convert.c index b9ed9ce..5fb02f4 100644 --- a/tools/src/h5format_convert/h5format_convert.c +++ b/tools/src/h5format_convert/h5format_convert.c @@ -260,8 +260,9 @@ convert(hid_t fid, const char *dname) h5tools_setstatus(EXIT_FAILURE); goto error; } - else if(verbose_g) + else if(verbose_g) { HDfprintf(stdout, "Retrieve the dataset's chunk indexing type\n"); + } if(idx_type == H5D_CHUNK_IDX_BTREE) { if(verbose_g) @@ -269,8 +270,9 @@ convert(hid_t fid, const char *dname) h5tools_setstatus(EXIT_SUCCESS); goto done; } - else if (verbose_g) + else if(verbose_g) { HDfprintf(stdout, "Dataset's chunk indexing type is not version 1 B-tree\n"); + } break; @@ -302,8 +304,8 @@ convert(hid_t fid, const char *dname) if(noop_g) { if(verbose_g) HDfprintf(stdout, "Not converting the dataset\n"); - h5tools_setstatus(EXIT_SUCCESS); - goto done; + h5tools_setstatus(EXIT_SUCCESS); + goto done; } if(verbose_g) |