From 5024051e35d4e113e7c144aed5b99f1be3cc938d Mon Sep 17 00:00:00 2001 From: Dana Robinson Date: Tue, 13 Aug 2019 08:46:56 -0700 Subject: Renamed H5Mdelete_key to H5Mdelete and H5Mset to H5Mput. --- src/H5M.c | 26 +++++++++++++------------- src/H5Mpublic.h | 8 ++++---- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/H5M.c b/src/H5M.c index 3008c40..adb4df0 100644 --- a/src/H5M.c +++ b/src/H5M.c @@ -650,9 +650,9 @@ done: /*------------------------------------------------------------------------- - * Function: H5Mset + * Function: H5Mput * - * Purpose: H5Mset adds a key-value pair to the Map specified by + * Purpose: H5Mput adds a key-value pair to the Map specified by * MAP_ID, or updates the value for the specified key if one * was set previously. KEY_MEM_TYPE_ID and VAL_MEM_TYPE_ID * specify the datatypes for the provided KEY and VALUE @@ -666,7 +666,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5Mset(hid_t map_id, hid_t key_mem_type_id, const void *key, +H5Mput(hid_t map_id, hid_t key_mem_type_id, const void *key, hid_t val_mem_type_id, const void *value, hid_t dxpl_id) { H5VL_object_t *vol_obj = NULL; @@ -697,12 +697,12 @@ H5Mset(hid_t map_id, hid_t key_mem_type_id, const void *key, H5CX_set_dxpl(dxpl_id); /* Set the key/value pair */ - if(H5VL_optional(vol_obj, dxpl_id, H5_REQUEST_NULL, H5VL_MAP_SET, key_mem_type_id, key, val_mem_type_id, value) < 0) - HGOTO_ERROR(H5E_MAP, H5E_CANTSET, FAIL, "unable to set key/value pair") + if(H5VL_optional(vol_obj, dxpl_id, H5_REQUEST_NULL, H5VL_MAP_PUT, key_mem_type_id, key, val_mem_type_id, value) < 0) + HGOTO_ERROR(H5E_MAP, H5E_CANTSET, FAIL, "unable to put key/value pair") done: FUNC_LEAVE_API(ret_value) -} /* end H5Mset() */ +} /* end H5Mput() */ /*------------------------------------------------------------------------- @@ -973,9 +973,9 @@ done: /*------------------------------------------------------------------------- - * Function: H5Mdelete_key + * Function: H5Mdelete * - * Purpose: H5Mdelete_key deletes a key-value pair from the Map + * Purpose: H5Mdelete deletes a key-value pair from the Map * specified by MAP_ID. KEY_MEM_TYPE_ID specifies the * datatype for the provided key buffers, and if different * from that used to create the Map object, the key will be @@ -988,7 +988,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5Mdelete_key(hid_t map_id, hid_t key_mem_type_id, const void *key, +H5Mdelete(hid_t map_id, hid_t key_mem_type_id, const void *key, hid_t dxpl_id) { H5VL_object_t *vol_obj = NULL; @@ -1020,13 +1020,13 @@ H5Mdelete_key(hid_t map_id, hid_t key_mem_type_id, const void *key, loc_params.type = H5VL_OBJECT_BY_SELF; loc_params.obj_type = H5I_get_type(map_id); - /* Set the key/value pair */ - if(H5VL_optional(vol_obj, dxpl_id, H5_REQUEST_NULL, H5VL_MAP_SPECIFIC, &loc_params, H5VL_MAP_DELETE_KEY, key_mem_type_id, key) < 0) - HGOTO_ERROR(H5E_MAP, H5E_CANTSET, FAIL, "unable to set key/value pair") + /* Delete the key/value pair */ + if(H5VL_optional(vol_obj, dxpl_id, H5_REQUEST_NULL, H5VL_MAP_SPECIFIC, &loc_params, H5VL_MAP_DELETE, key_mem_type_id, key) < 0) + HGOTO_ERROR(H5E_MAP, H5E_CANTSET, FAIL, "unable to delete key/value pair") done: FUNC_LEAVE_API(ret_value) -} /* end H5Mdelete_key() */ +} /* end H5Mdelete() */ #endif /* H5_HAVE_MAP_API */ diff --git a/src/H5Mpublic.h b/src/H5Mpublic.h index 56c7d87..9cbdb32 100644 --- a/src/H5Mpublic.h +++ b/src/H5Mpublic.h @@ -37,7 +37,7 @@ #define H5VL_MAP_OPEN 2 #define H5VL_MAP_GET_VAL 3 #define H5VL_MAP_EXISTS 4 -#define H5VL_MAP_SET 5 +#define H5VL_MAP_PUT 5 #define H5VL_MAP_GET 6 #define H5VL_MAP_SPECIFIC 7 #define H5VL_MAP_CLOSE 8 @@ -59,7 +59,7 @@ typedef enum H5VL_map_get_t { /* types for map SPECIFIC callback */ typedef enum H5VL_map_specific_t { H5VL_MAP_ITER, /* H5Miterate */ - H5VL_MAP_DELETE_KEY /* H5Mdelete_key */ + H5VL_MAP_DELETE /* H5Mdelete */ } H5VL_map_specific_t; /* Callback for H5Miterate() */ @@ -95,7 +95,7 @@ H5_DLL hid_t H5Mget_val_type(hid_t map_id); H5_DLL hid_t H5Mget_create_plist(hid_t map_id); H5_DLL hid_t H5Mget_access_plist(hid_t map_id); H5_DLL herr_t H5Mget_count(hid_t map_id, hsize_t *count, hid_t dxpl_id); -H5_DLL herr_t H5Mset(hid_t map_id, hid_t key_mem_type_id, const void *key, +H5_DLL herr_t H5Mput(hid_t map_id, hid_t key_mem_type_id, const void *key, hid_t val_mem_type_id, const void *value, hid_t dxpl_id); H5_DLL herr_t H5Mget(hid_t map_id, hid_t key_mem_type_id, const void *key, hid_t val_mem_type_id, void *value, hid_t dxpl_id); @@ -106,7 +106,7 @@ H5_DLL herr_t H5Miterate(hid_t map_id, hsize_t *idx, hid_t key_mem_type_id, H5_DLL herr_t H5Miterate_by_name(hid_t loc_id, const char *map_name, hsize_t *idx, hid_t key_mem_type_id, H5M_iterate_t op, void *op_data, hid_t dxpl_id, hid_t lapl_id); -H5_DLL herr_t H5Mdelete_key(hid_t map_id, hid_t key_mem_type_id, +H5_DLL herr_t H5Mdelete(hid_t map_id, hid_t key_mem_type_id, const void *key, hid_t dxpl_id); /* Symbols defined for compatibility with previous versions of the HDF5 API. -- cgit v0.12