diff options
| author | Quincey Koziol <koziol@lbl.gov> | 2020-11-23 16:18:26 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-23 16:18:26 (GMT) |
| commit | 5ff09ae971cdb8a85c596520666c8dc178541e4a (patch) | |
| tree | 56cd3f440387a7bd29938a8fc150a2073bc50e19 /src/H5FDhdfs.c | |
| parent | d4a3097ec5d9e44d377c4b91a05b3e0c5f9f1e2c (diff) | |
| download | hdf5-5ff09ae971cdb8a85c596520666c8dc178541e4a.zip hdf5-5ff09ae971cdb8a85c596520666c8dc178541e4a.tar.gz hdf5-5ff09ae971cdb8a85c596520666c8dc178541e4a.tar.bz2 | |
Basic alignment with async branch (#115)
* Basic alignment with async branch - trivial changes to reduce clutter in overall diff.
* Update minor error code to reflect change within library
* Update the error output to match library
Diffstat (limited to 'src/H5FDhdfs.c')
| -rw-r--r-- | src/H5FDhdfs.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/H5FDhdfs.c b/src/H5FDhdfs.c index 38145d0..1f375f5 100644 --- a/src/H5FDhdfs.c +++ b/src/H5FDhdfs.c @@ -646,22 +646,21 @@ done: *------------------------------------------------------------------------- */ herr_t -H5Pget_fapl_hdfs(hid_t fapl_id, H5FD_hdfs_fapl_t *fa_out) +H5Pget_fapl_hdfs(hid_t fapl_id, H5FD_hdfs_fapl_t *fa_dst) { - const H5FD_hdfs_fapl_t *fa = NULL; + const H5FD_hdfs_fapl_t *fa_src = NULL; H5P_genplist_t * plist = NULL; herr_t ret_value = SUCCEED; FUNC_ENTER_API(FAIL) - H5TRACE2("e", "i*x", fapl_id, fa_out); + H5TRACE2("e", "i*x", fapl_id, fa_dst); #if HDFS_DEBUG HDfprintf(stdout, "called %s.\n", FUNC); #endif - if (fa_out == NULL) - HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "fa_out is NULL") - + if (fa_dst == NULL) + HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "fa_dst ptr is NULL") plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS); if (plist == NULL) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access list") @@ -669,12 +668,12 @@ H5Pget_fapl_hdfs(hid_t fapl_id, H5FD_hdfs_fapl_t *fa_out) if (H5FD_HDFS != H5P_peek_driver(plist)) HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "incorrect VFL driver") - fa = (const H5FD_hdfs_fapl_t *)H5P_peek_driver_info(plist); - if (fa == NULL) + fa_src = (const H5FD_hdfs_fapl_t *)H5P_peek_driver_info(plist); + if (fa_src == NULL) HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "bad VFL driver info") /* Copy the hdfs fapl data out */ - H5MM_memcpy(fa_out, fa, sizeof(H5FD_hdfs_fapl_t)); + H5MM_memcpy(fs_dst, fa_src, sizeof(H5FD_hdfs_fapl_t)); done: FUNC_LEAVE_API(ret_value) |