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
This commit is contained in:
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user