diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-04-16 13:55:27 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-04-16 13:55:27 (GMT) |
| commit | b5188673f70ab4f144a9b2927ce43ce407b0c8b8 (patch) | |
| tree | 5fa8b99b61eeed099ad6a2a8d78b080cd0dc847f /src/H5Aint.c | |
| parent | 6b8492bf99637a092886e7cb5d75ea4389da42d7 (diff) | |
| download | hdf5-b5188673f70ab4f144a9b2927ce43ce407b0c8b8.zip hdf5-b5188673f70ab4f144a9b2927ce43ce407b0c8b8.tar.gz hdf5-b5188673f70ab4f144a9b2927ce43ce407b0c8b8.tar.bz2 | |
[svn-r26824] merge 26771 and 26777 from trunk.
Fix internal H5AC dxpl usage in the library.
tested with h5committest.
Diffstat (limited to 'src/H5Aint.c')
| -rw-r--r-- | src/H5Aint.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/H5Aint.c b/src/H5Aint.c index b0c068d..79e7d22 100644 --- a/src/H5Aint.c +++ b/src/H5Aint.c @@ -1190,7 +1190,7 @@ H5A_type(const H5A_t *attr) */ htri_t H5A_exists_by_name(H5G_loc_t loc, const char *obj_name, const char *attr_name, - hid_t lapl_id) + hid_t lapl_id, hid_t dxpl_id) { H5G_loc_t obj_loc; /* Location used to open group */ H5G_name_t obj_path; /* Opened object group hier. path */ @@ -1206,12 +1206,12 @@ H5A_exists_by_name(H5G_loc_t loc, const char *obj_name, const char *attr_name, H5G_loc_reset(&obj_loc); /* Find the object's location */ - if(H5G_loc_find(&loc, obj_name, &obj_loc/*out*/, lapl_id, H5AC_ind_dxpl_id) < 0) + if(H5G_loc_find(&loc, obj_name, &obj_loc/*out*/, lapl_id, dxpl_id) < 0) HGOTO_ERROR(H5E_ATTR, H5E_NOTFOUND, FAIL, "object not found") loc_found = TRUE; /* Check if the attribute exists */ - if((ret_value = H5O_attr_exists(obj_loc.oloc, attr_name, H5AC_ind_dxpl_id)) < 0) + if((ret_value = H5O_attr_exists(obj_loc.oloc, attr_name, dxpl_id)) < 0) HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "unable to determine if attribute exists") done: @@ -2378,7 +2378,7 @@ done: */ herr_t H5A_rename_by_name(H5G_loc_t loc, const char *obj_name, const char *old_attr_name, - const char *new_attr_name, hid_t lapl_id) + const char *new_attr_name, hid_t lapl_id, hid_t dxpl_id) { H5G_loc_t obj_loc; /* Location used to open group */ H5G_name_t obj_path; /* Opened object group hier. path */ @@ -2401,7 +2401,7 @@ H5A_rename_by_name(H5G_loc_t loc, const char *obj_name, const char *old_attr_nam loc_found = TRUE; /* Call attribute rename routine */ - if(H5O_attr_rename(obj_loc.oloc, H5AC_dxpl_id, old_attr_name, new_attr_name) < 0) + if(H5O_attr_rename(obj_loc.oloc, dxpl_id, old_attr_name, new_attr_name) < 0) HGOTO_ERROR(H5E_ATTR, H5E_CANTRENAME, FAIL, "can't rename attribute") } /* end if */ |