diff options
| author | Vailin Choi <vchoi@jam.ad.hdfgroup.org> | 2019-01-02 19:23:54 (GMT) |
|---|---|---|
| committer | Vailin Choi <vchoi@jam.ad.hdfgroup.org> | 2019-01-02 19:23:54 (GMT) |
| commit | d3dff6efe6f769b219f9dcccebd057afe75ed3c7 (patch) | |
| tree | a4b0146909d9468a0a44921bd2e3a494d9cdb77e /src/H5FDfamily.c | |
| parent | 7f9c45999567ca5f1db89127cf101a9fae27aba1 (diff) | |
| parent | 71f4e1832c737e2fb76385bc478fad7f39d89ab8 (diff) | |
| download | hdf5-d3dff6efe6f769b219f9dcccebd057afe75ed3c7.zip hdf5-d3dff6efe6f769b219f9dcccebd057afe75ed3c7.tar.gz hdf5-d3dff6efe6f769b219f9dcccebd057afe75ed3c7.tar.bz2 | |
Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into develop
Resolve conflicts:
Conflicts:
test/Makefile.am
Diffstat (limited to 'src/H5FDfamily.c')
| -rw-r--r-- | src/H5FDfamily.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/src/H5FDfamily.c b/src/H5FDfamily.c index e52a71a..4d40cf3 100644 --- a/src/H5FDfamily.c +++ b/src/H5FDfamily.c @@ -171,28 +171,25 @@ done: /*------------------------------------------------------------------------- - * Function: H5FD_family_init + * Function: H5FD_family_init * - * Purpose: Initialize this driver by registering the driver with the - * library. + * Purpose: Initialize this driver by registering the driver with the + * library. * - * Return: Success: The driver ID for the family driver. + * Return: Success: The driver ID for the family driver + * Failure: H5I_INVALID_HID * - * Failure: Negative - * - * Programmer: Robb Matzke + * Programmer: Robb Matzke * Wednesday, August 4, 1999 * - * Modifications: - * *------------------------------------------------------------------------- */ hid_t H5FD_family_init(void) { - hid_t ret_value = H5FD_FAMILY_g; /* Return value */ + hid_t ret_value = H5I_INVALID_HID; /* Return value */ - FUNC_ENTER_NOAPI(FAIL) + FUNC_ENTER_NOAPI(H5I_INVALID_HID) if(H5I_VFL != H5I_get_type(H5FD_FAMILY_g)) H5FD_FAMILY_g = H5FD_register(&H5FD_family_g, sizeof(H5FD_class_t), FALSE); |