diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2019-06-28 15:03:45 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2019-06-28 15:03:45 (GMT) |
| commit | 8f0aacce8f8f4507325a6780cc06e0e1437fd1dc (patch) | |
| tree | 6243c2fc85225478a42f5ded45a843c256b4bea4 /src | |
| parent | b6268dbb1b4548be0a7bb5605001cb1859daec30 (diff) | |
| parent | 1c4101c6a77dd9223483dd9e3f7bec0f9e92f435 (diff) | |
| download | hdf5-8f0aacce8f8f4507325a6780cc06e0e1437fd1dc.zip hdf5-8f0aacce8f8f4507325a6780cc06e0e1437fd1dc.tar.gz hdf5-8f0aacce8f8f4507325a6780cc06e0e1437fd1dc.tar.bz2 | |
Merge pull request #1782 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:warning_fixes to develop
* commit '1c4101c6a77dd9223483dd9e3f7bec0f9e92f435':
Fixed various warnings in testhdf5 files.
Warning fixes: * fix for static/const flipped in H5Dint.c * Removed missing done target in H5Rint.c * Fixed misleading indentation in h5format_convert.c
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5Dint.c | 4 | ||||
| -rw-r--r-- | src/H5Rint.c | 3 |
2 files changed, 3 insertions, 4 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() */ |