diff options
Diffstat (limited to 'src/H5G.c')
| -rw-r--r-- | src/H5G.c | 36 |
1 files changed, 18 insertions, 18 deletions
@@ -34,7 +34,7 @@ /* Packages needed by this file... */ #include <H5private.h> -#include <H5Aprivate.h> +#include <H5Iprivate.h> #include <H5Bprivate.h> #include <H5Eprivate.h> #include <H5Gpkg.h> @@ -94,8 +94,8 @@ H5Gcreate(hid_t file_id, const char *name, size_t size_hint) FUNC_ENTER(H5Gcreate, FAIL); /* Check arguments */ - if (H5_FILE != H5A_group(file_id) || - NULL == (f = H5A_object(file_id))) { + if (H5_FILE != H5I_group(file_id) || + NULL == (f = H5I_object(file_id))) { HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file"); } if (!name || !*name) { @@ -105,7 +105,7 @@ H5Gcreate(hid_t file_id, const char *name, size_t size_hint) if (NULL == (grp = H5G_create(f, name, size_hint))) { HRETURN_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create group"); } - if ((ret_value = H5A_register(H5_GROUP, grp)) < 0) { + if ((ret_value = H5I_register(H5_GROUP, grp)) < 0) { H5G_close(grp); HRETURN_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register group"); @@ -142,8 +142,8 @@ H5Gopen(hid_t file_id, const char *name) FUNC_ENTER(H5Gopen, FAIL); /* Check args */ - if (H5_FILE != H5A_group(file_id) || - NULL == (f = H5A_object(file_id))) { + if (H5_FILE != H5I_group(file_id) || + NULL == (f = H5I_object(file_id))) { HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file"); } if (!name || !*name) { @@ -154,7 +154,7 @@ H5Gopen(hid_t file_id, const char *name) HRETURN_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open group"); } /* Register an atom for the group */ - if ((ret_value = H5A_register(H5_GROUP, grp)) < 0) { + if ((ret_value = H5I_register(H5_GROUP, grp)) < 0) { H5G_close(grp); HRETURN_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register group"); @@ -185,15 +185,15 @@ H5Gclose(hid_t grp_id) FUNC_ENTER(H5Gclose, FAIL); /* Check args */ - if (H5_GROUP != H5A_group(grp_id) || - NULL == H5A_object(grp_id)) { + if (H5_GROUP != H5I_group(grp_id) || + NULL == H5I_object(grp_id)) { HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a group"); } /* * Decrement the counter on the group atom. It will be freed if the count * reaches zero. */ - if (H5A_dec_ref(grp_id) < 0) { + if (H5I_dec_ref(grp_id) < 0) { HRETURN_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to close group"); } FUNC_LEAVE(SUCCEED); @@ -235,8 +235,8 @@ H5Gset(hid_t file_id, const char *name) FUNC_ENTER(H5Gset, FAIL); /* Check/fix arguments */ - if (H5_FILE != H5A_group(file_id) || - NULL == (f = H5A_object(file_id))) { + if (H5_FILE != H5I_group(file_id) || + NULL == (f = H5I_object(file_id))) { HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file"); } if (!name || !*name) { @@ -293,8 +293,8 @@ H5Gpush(hid_t file_id, const char *name) FUNC_ENTER(H5Gpush, FAIL); /* Check arguments */ - if (H5_FILE != H5A_group(file_id) || - NULL == (f = H5A_object(file_id))) { + if (H5_FILE != H5I_group(file_id) || + NULL == (f = H5I_object(file_id))) { HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file"); } if (!name || !*name) { @@ -352,8 +352,8 @@ H5Gpop(hid_t file_id) FUNC_ENTER(H5Gpop, FAIL); /* Check arguments */ - if (H5_FILE != H5A_group(file_id) || - NULL == (f = H5A_object(file_id))) { + if (H5_FILE != H5I_group(file_id) || + NULL == (f = H5I_object(file_id))) { HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file"); } /* pop */ @@ -394,7 +394,7 @@ H5G_init_interface(void) FUNC_ENTER(H5G_init_interface, FAIL); /* Initialize the atom group for the group IDs */ - if (H5A_init_group(H5_GROUP, H5A_GROUPID_HASHSIZE, H5G_RESERVED_ATOMS, + if (H5I_init_group(H5_GROUP, H5I_GROUPID_HASHSIZE, H5G_RESERVED_ATOMS, (herr_t (*)(void *)) H5G_close) < 0 || H5_add_exit(H5G_term_interface) < 0) { HRETURN_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, @@ -420,7 +420,7 @@ H5G_init_interface(void) static void H5G_term_interface(void) { - H5A_destroy_group(H5_GROUP); + H5I_destroy_group(H5_GROUP); } /*------------------------------------------------------------------------- |