diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2015-11-23 11:24:30 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2015-11-23 11:24:30 (GMT) |
| commit | 5913de51c2e84f78c80da224cc0437665fe6fcf4 (patch) | |
| tree | ef7b0bfa31762338fa98dd19bca72e1bbaeff961 /src | |
| parent | 4d2eb986229d4fcf17bc2ef12802cfb43d2f0d06 (diff) | |
| download | hdf5-5913de51c2e84f78c80da224cc0437665fe6fcf4.zip hdf5-5913de51c2e84f78c80da224cc0437665fe6fcf4.tar.gz hdf5-5913de51c2e84f78c80da224cc0437665fe6fcf4.tar.bz2 | |
[svn-r28443] Misc code cleanup and warning fixes.
Tested on Ubuntu 15.10 (Linux 4.2.0 x86_64) gcc 5.2.1
serial only
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5AC.c | 1 | ||||
| -rw-r--r-- | src/H5Dvirtual.c | 3 | ||||
| -rw-r--r-- | src/H5Pdapl.c | 2 | ||||
| -rw-r--r-- | src/H5Shyper.c | 2 |
4 files changed, 5 insertions, 3 deletions
@@ -1228,7 +1228,6 @@ H5AC_protect(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t addr, size_t trace_entry_size = 0; FILE * trace_file_ptr = NULL; #endif /* H5AC__TRACE_FILE_ENABLED */ - unsigned protect_flags = H5C__NO_FLAGS_SET; void *thing = NULL; /* Pointer to native data structure for entry */ hbool_t log_enabled; /* TRUE if logging was set up */ hbool_t curr_logging; /* TRUE if currently logging */ diff --git a/src/H5Dvirtual.c b/src/H5Dvirtual.c index 7e52f5d..d435c0d 100644 --- a/src/H5Dvirtual.c +++ b/src/H5Dvirtual.c @@ -657,7 +657,10 @@ H5D__virtual_copy(H5F_t H5_ATTR_UNUSED *f_dst, H5O_layout_t *layout_dst, { herr_t ret_value = SUCCEED; +#ifdef NOT_YET FUNC_ENTER_PACKAGE +#endif /* NOT_YET */ + FUNC_ENTER_PACKAGE_NOERR #ifdef NOT_YET /* Check for copy to the same file */ diff --git a/src/H5Pdapl.c b/src/H5Pdapl.c index c6f8d82..41c6c78 100644 --- a/src/H5Pdapl.c +++ b/src/H5Pdapl.c @@ -834,7 +834,7 @@ H5Pset_append_flush(hid_t plist_id, unsigned ndims, const hsize_t *boundary, H5D if(ndims > H5S_MAX_RANK) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "dimensionality is too large") if(!boundary) - HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no boundary dimensions specified") + HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no boundary dimensions specified") /* Check if the callback function is NULL and the user data is non-NULL. * This is almost certainly an error as the user data will not be used. */ diff --git a/src/H5Shyper.c b/src/H5Shyper.c index 28cabf0..fe013a7 100644 --- a/src/H5Shyper.c +++ b/src/H5Shyper.c @@ -2038,7 +2038,7 @@ H5S_hyper_serialize_helper(const H5S_hyper_span_info_t *spans, uint8_t *pp = (*p); /* Local pointer for decoding */ hsize_t u; /* Index variable */ - FUNC_ENTER_NOAPI_NOINIT + FUNC_ENTER_NOAPI_NOINIT_NOERR /* Sanity checks */ HDassert(spans); |