summaryrefslogtreecommitdiffstats
path: root/src/H5F.c
diff options
context:
space:
mode:
authorDavid Young <dyoung@hdfgroup.org>2020-01-29 02:35:28 (GMT)
committerDavid Young <dyoung@hdfgroup.org>2020-01-29 02:35:28 (GMT)
commitfa1b2f6ef35c459c9f74ead885c119ae7f61c056 (patch)
treea71219e0f97dfd57e2c1a8a2e89b65476631ba0b /src/H5F.c
parent71c050f837149a0c11e0936e661047c091deaa2f (diff)
downloadhdf5-fa1b2f6ef35c459c9f74ead885c119ae7f61c056.zip
hdf5-fa1b2f6ef35c459c9f74ead885c119ae7f61c056.tar.gz
hdf5-fa1b2f6ef35c459c9f74ead885c119ae7f61c056.tar.bz2
Reduce differences between my -Werror branch and `develop`:
Rename index -> idx, fileno -> fnumber, fileno -> fno to avoid GCC shadowed declaration warnings about index(3). Convert #pragma GCC diagnostic push/pop/ignored to the HDF5 library's H5_GCC_DIAG_OFF()/H5_GCC_DIAG_ON() macros.
Diffstat (limited to 'src/H5F.c')
-rw-r--r--src/H5F.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/H5F.c b/src/H5F.c
index 752530c..1a9bab5 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -1052,15 +1052,15 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5Fget_fileno(hid_t file_id, unsigned long *fileno)
+H5Fget_fileno(hid_t file_id, unsigned long *fnumber)
{
herr_t ret_value = SUCCEED;
FUNC_ENTER_API(FAIL)
- H5TRACE2("e", "i*Ul", file_id, fileno);
+ H5TRACE2("e", "i*Ul", file_id, fnumber);
- /* If no fileno pointer was passed in, exit quietly */
- if(fileno) {
+ /* If no fnumber pointer was passed in, exit quietly */
+ if(fnumber) {
H5VL_object_t *vol_obj; /* File info */
/* Get the internal file structure */
@@ -1068,7 +1068,7 @@ H5Fget_fileno(hid_t file_id, unsigned long *fileno)
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid file identifier")
/* Get the flags */
- if((ret_value = H5VL_file_get(vol_obj, H5VL_FILE_GET_FILENO, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL, fileno)) < 0)
+ if((ret_value = H5VL_file_get(vol_obj, H5VL_FILE_GET_FILENO, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL, fnumber)) < 0)
HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "unable to get file's 'file number'")
} /* end if */