diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2019-06-05 16:26:12 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2019-06-05 16:26:12 (GMT) |
| commit | cb82b6c22262bb7d605e4f723b09bc834282e9c4 (patch) | |
| tree | 0deb159671588a14d44c2839813c4de1765999f5 | |
| parent | 66699f2c7d889e725ced0fba579621ef97726b41 (diff) | |
| parent | 9557087c0ed7811301610155654bf58d6583e38c (diff) | |
| download | hdf5-cb82b6c22262bb7d605e4f723b09bc834282e9c4.zip hdf5-cb82b6c22262bb7d605e4f723b09bc834282e9c4.tar.gz hdf5-cb82b6c22262bb7d605e4f723b09bc834282e9c4.tar.bz2 | |
Merge pull request #1718 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:release_fixes to develop
* commit '9557087c0ed7811301610155654bf58d6583e38c':
Minor warning fixes: * Fixed an error return value in H5Aint.c (NULL --> FAIL) * Added H5VL_FILE_GET_FILENO to H5trace.c
| -rw-r--r-- | src/H5Aint.c | 2 | ||||
| -rw-r--r-- | src/H5trace.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/H5Aint.c b/src/H5Aint.c index ebd6860..6162401 100644 --- a/src/H5Aint.c +++ b/src/H5Aint.c @@ -2400,7 +2400,7 @@ H5A__attr_post_copy_file(const H5O_loc_t *src_oloc, const H5A_t *attr_src, /* Determine size of the destination datatype */ if(0 == (dst_dt_size = H5T_get_size(attr_dst->shared->dt))) - HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "unable to determine datatype size") + HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to determine datatype size") /* Determine # of reference elements to copy */ ref_count = attr_dst->shared->data_size / dst_dt_size; diff --git a/src/H5trace.c b/src/H5trace.c index 851ec73..1125072 100644 --- a/src/H5trace.c +++ b/src/H5trace.c @@ -2714,6 +2714,9 @@ H5_trace(const double *returning, const char *func, const char *type, ...) case H5VL_FILE_GET_INTENT: HDfprintf(out, "H5VL_FILE_GET_INTENT"); break; + case H5VL_FILE_GET_FILENO: + HDfprintf(out, "H5VL_FILE_GET_FILENO"); + break; case H5VL_FILE_GET_NAME: HDfprintf(out, "H5VL_FILE_GET_NAME"); break; |