[svn-r24949] change the H5E macros at the server.

1 files changed, 80 insertions, 80 deletions

diff --git a/src/H5VLiod_map.c b/src/H5VLiod_map.c
index 8be68e4..e026401 100644
--- a/src/H5VLiod_map.c
+++ b/src/H5VLiod_map.c
@@ -84,7 +84,7 @@ H5VL_iod_server_map_create_cb(AXE_engine_t UNUSED axe_engine,
 
     /* get the scope for data integrity checks for raw data */
     if(H5Pget_ocpl_enable_checksum(mcpl_id, &enable_checksum) < 0)
-        HGOTO_ERROR2(H5E_PLIST, H5E_CANTGET, FAIL, "can't get scope for data integrity checks");
+        HGOTO_ERROR_FF(FAIL, "can't get scope for data integrity checks");
 
     if((cs_scope & H5_CHECKSUM_IOD) && enable_checksum) {
         obj_create_hint = (iod_hint_list_t *)malloc(sizeof(iod_hint_list_t) + sizeof(iod_hint_t));
@@ -97,7 +97,7 @@ H5VL_iod_server_map_create_cb(AXE_engine_t UNUSED axe_engine,
        does not exist. */
     if(H5VL_iod_server_traverse(coh, loc_id, loc_handle, name, wtid, rtid, FALSE, 
                                 cs_scope, &last_comp, &cur_id, &cur_oh) < 0)
-        HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't traverse path");
+        HGOTO_ERROR_FF(FAIL, "can't traverse path");
 
 #if H5_EFF_DEBUG
     fprintf(stderr, "Creating Map ID %"PRIx64" (CV %"PRIu64", TR %"PRIu64") ", 
@@ -112,24 +112,24 @@ H5VL_iod_server_map_create_cb(AXE_engine_t UNUSED axe_engine,
     /* create the map */
     if(iod_obj_create(coh, wtid, obj_create_hint, IOD_OBJ_KV, 
                       NULL, NULL, &map_id, NULL) < 0)
-        HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't create Map");
+        HGOTO_ERROR_FF(FAIL, "can't create Map");
 
     if (iod_obj_open_read(coh, map_id, wtid, NULL, &map_oh.rd_oh, NULL) < 0)
-        HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't open Map");
+        HGOTO_ERROR_FF(FAIL, "can't open Map");
     if (iod_obj_open_write(coh, map_id, wtid, NULL, &map_oh.wr_oh, NULL) < 0)
-        HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't open Map");
+        HGOTO_ERROR_FF(FAIL, "can't open Map");
 
     step ++;
 
     /* create the metadata KV object for the map */
     if(iod_obj_create(coh, wtid, obj_create_hint, IOD_OBJ_KV, 
                       NULL, NULL, &mdkv_id, NULL) < 0)
-        HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't create metadata KV object");
+        HGOTO_ERROR_FF(FAIL, "can't create metadata KV object");
 
     /* create the attribute KV object for the root group */
     if(iod_obj_create(coh, wtid, obj_create_hint, IOD_OBJ_KV, 
                       NULL, NULL, &attr_id, NULL) < 0)
-        HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't create metadata KV object");
+        HGOTO_ERROR_FF(FAIL, "can't create metadata KV object");
 
     /* set values for the scratch pad object */
     sp[0] = mdkv_id;
@@ -143,54 +143,54 @@ H5VL_iod_server_map_create_cb(AXE_engine_t UNUSED axe_engine,
 
         sp_cs = H5_checksum_crc64(&sp, sizeof(sp));
         if (iod_obj_set_scratch(map_oh.wr_oh, wtid, &sp, &sp_cs, NULL) < 0)
-            HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't set scratch pad");
+            HGOTO_ERROR_FF(FAIL, "can't set scratch pad");
     }
     else {
         if (iod_obj_set_scratch(map_oh.wr_oh, wtid, &sp, NULL, NULL) < 0)
-            HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't set scratch pad");
+            HGOTO_ERROR_FF(FAIL, "can't set scratch pad");
     }
 
     /* Open Metadata KV object for write */
     if (iod_obj_open_write(coh, mdkv_id, wtid, NULL, &mdkv_oh, NULL) < 0)
-        HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't create scratch pad");
+        HGOTO_ERROR_FF(FAIL, "can't create scratch pad");
 
     step ++;
 
     /* insert plist metadata */
     if(H5VL_iod_insert_plist(mdkv_oh, wtid, mcpl_id, 
                              cs_scope, NULL, NULL) < 0)
-        HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't insert KV value");
+        HGOTO_ERROR_FF(FAIL, "can't insert KV value");
 
     /* insert link count metadata */
     if(H5VL_iod_insert_link_count(mdkv_oh, wtid, (uint64_t)1, 
                                   cs_scope, NULL, NULL) < 0)
-        HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't insert KV value");
+        HGOTO_ERROR_FF(FAIL, "can't insert KV value");
 
     /* insert object type metadata */
     if(H5VL_iod_insert_object_type(mdkv_oh, wtid, H5I_MAP, 
                                    cs_scope, NULL, NULL) < 0)
-        HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't insert KV value");
+        HGOTO_ERROR_FF(FAIL, "can't insert KV value");
 
     /* insert Key datatype metadata */
     if(H5VL_iod_insert_datatype_with_key(mdkv_oh, wtid, keytype, H5VL_IOD_KEY_MAP_KEY_TYPE,
                                          cs_scope, NULL, NULL) < 0)
-        HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't insert KV value");
+        HGOTO_ERROR_FF(FAIL, "can't insert KV value");
 
     /* insert Value datatype metadata */
     if(H5VL_iod_insert_datatype_with_key(mdkv_oh, wtid, valtype, H5VL_IOD_KEY_MAP_VALUE_TYPE,
                                          cs_scope, NULL, NULL) < 0)
-        HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't insert KV value");
+        HGOTO_ERROR_FF(FAIL, "can't insert KV value");
 
     /* close MD KV object */
     if(iod_obj_close(mdkv_oh, NULL, NULL) < 0)
-        HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't close object");
+        HGOTO_ERROR_FF(FAIL, "can't close object");
 
     step --;
 
     /* add link in parent group to current object */
     if(H5VL_iod_insert_new_link(cur_oh.wr_oh, wtid, last_comp, 
                                 H5L_TYPE_HARD, &map_id, cs_scope, NULL, NULL) < 0)
-        HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't insert KV value");
+        HGOTO_ERROR_FF(FAIL, "can't insert KV value");
 
 #if H5_EFF_DEBUG
     fprintf(stderr, "Done with map create, sending response to client\n");
@@ -288,45 +288,45 @@ H5VL_iod_server_map_open_cb(AXE_engine_t UNUSED axe_engine,
     /* Traverse Path and open map */
     if(H5VL_iod_server_open_path(coh, loc_id, loc_handle, name, rtid, 
                                  cs_scope, &map_id, &map_oh) < 0)
-        HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't open object");
+        HGOTO_ERROR_FF(FAIL, "can't open object");
 
     /* open a write handle on the ID. */
     if (iod_obj_open_write(coh, map_id, rtid, NULL, &map_oh.wr_oh, NULL) < 0)
-        HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't open current map");
+        HGOTO_ERROR_FF(FAIL, "can't open current map");
     step ++;
 
     /* get scratch pad of map */
     if(iod_obj_get_scratch(map_oh.rd_oh, rtid, &sp, &sp_cs, NULL) < 0)
-        HGOTO_ERROR2(H5E_FILE, H5E_CANTINIT, FAIL, "can't get scratch pad for object");
+        HGOTO_ERROR_FF(FAIL, "can't get scratch pad for object");
 
     if(sp_cs && (cs_scope & H5_CHECKSUM_IOD)) {
         /* verify scratch pad integrity */
         if(H5VL_iod_verify_scratch_pad(&sp, sp_cs) < 0)
-            HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "Scratch Pad failed integrity check");
+            HGOTO_ERROR_FF(FAIL, "Scratch Pad failed integrity check");
     }
 
     /* open the metadata scratch pad */
     if (iod_obj_open_read(coh, sp[0], rtid, NULL /*hints*/, &mdkv_oh, NULL) < 0)
-        HGOTO_ERROR2(H5E_FILE, H5E_CANTINIT, FAIL, "can't open scratch pad");
+        HGOTO_ERROR_FF(FAIL, "can't open scratch pad");
     step ++;
 
     if(H5VL_iod_get_metadata(mdkv_oh, rtid, H5VL_IOD_PLIST, 
                              H5VL_IOD_KEY_OBJ_CPL, cs_scope, NULL, &output.mcpl_id) < 0)
-        HGOTO_ERROR2(H5E_SYM, H5E_CANTGET, FAIL, "failed to retrieve gcpl");
+        HGOTO_ERROR_FF(FAIL, "failed to retrieve gcpl");
 
     if(H5VL_iod_get_metadata(mdkv_oh, rtid, H5VL_IOD_DATATYPE, 
                              H5VL_IOD_KEY_MAP_KEY_TYPE,
                              cs_scope, NULL, &output.keytype_id) < 0)
-        HGOTO_ERROR2(H5E_SYM, H5E_CANTGET, FAIL, "failed to retrieve link count");
+        HGOTO_ERROR_FF(FAIL, "failed to retrieve link count");
 
     if(H5VL_iod_get_metadata(mdkv_oh, rtid, H5VL_IOD_DATATYPE, 
                              H5VL_IOD_KEY_MAP_VALUE_TYPE,
                              cs_scope, NULL, &output.valtype_id) < 0)
-        HGOTO_ERROR2(H5E_SYM, H5E_CANTGET, FAIL, "failed to retrieve link count");
+        HGOTO_ERROR_FF(FAIL, "failed to retrieve link count");
 
     /* close the metadata scratch pad */
     if(iod_obj_close(mdkv_oh, NULL, NULL) < 0)
-        HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't close meta data KV handle");
+        HGOTO_ERROR_FF(FAIL, "can't close meta data KV handle");
     step --;
 
     output.iod_id = map_id;
@@ -422,7 +422,7 @@ H5VL_iod_server_map_set_cb(AXE_engine_t UNUSED axe_engine,
     /* open the map if we don't have the handle yet */
     if(iod_oh.cookie == IOD_OH_UNDEFINED) {
         if (iod_obj_open_write(coh, iod_id, wtid, NULL /*hints*/, &iod_oh, NULL) < 0)
-            HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't open current group");
+            HGOTO_ERROR_FF(FAIL, "can't open current group");
         opened_locally = TRUE;
     }
 
@@ -435,25 +435,25 @@ H5VL_iod_server_map_set_cb(AXE_engine_t UNUSED axe_engine,
 
     /* allocate buffer to hold data */
     if(NULL == (val_buf = malloc(val_size)))
-        HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't allocate read buffer");
+        HGOTO_ERROR_FF(FAIL, "can't allocate read buffer");
 
     /* create a Mercury block handle for transfer */
     HG_Bulk_handle_create(val_buf, val_size, HG_BULK_READWRITE, &bulk_block_handle);
 
     /* Write bulk data here and wait for the data to be there  */
     if(HG_SUCCESS != HG_Bulk_read_all(source, value_handle, bulk_block_handle, &bulk_request))
-        HGOTO_ERROR2(H5E_SYM, H5E_WRITEERROR, FAIL, "can't get data from function shipper");
+        HGOTO_ERROR_FF(FAIL, "can't get data from function shipper");
     /* wait for it to complete */
     if(HG_SUCCESS != HG_Bulk_wait(bulk_request, HG_MAX_IDLE_TIME, HG_STATUS_IGNORE))
-        HGOTO_ERROR2(H5E_SYM, H5E_WRITEERROR, FAIL, "can't get data from function shipper");
+        HGOTO_ERROR_FF(FAIL, "can't get data from function shipper");
 
     /* free the bds block handle */
     if(HG_SUCCESS != HG_Bulk_handle_free(bulk_block_handle))
-        HGOTO_ERROR2(H5E_SYM, H5E_WRITEERROR, FAIL, "can't free bds block handle");
+        HGOTO_ERROR_FF(FAIL, "can't free bds block handle");
 
     /* get the scope for data integrity checks for raw data */
     if(H5Pget_rawdata_integrity_scope(dxpl_id, &raw_cs_scope) < 0)
-        HGOTO_ERROR2(H5E_PLIST, H5E_CANTGET, FAIL, "can't get scope for data integrity checks");
+        HGOTO_ERROR_FF(FAIL, "can't get scope for data integrity checks");
 
     /* verify data if transfer flag is set */
     if(raw_cs_scope & H5_CHECKSUM_TRANSFER) {
@@ -476,11 +476,11 @@ H5VL_iod_server_map_set_cb(AXE_engine_t UNUSED axe_engine,
     /* adjust buffers for datatype conversion */
     if(H5VL__iod_server_adjust_buffer(key_memtype_id, key_maptype_id, 1, dxpl_id, 
                                       key.buf_size, &key.buf, &key_is_vl_data, &key_size) < 0) 
-        HGOTO_ERROR2(H5E_DATATYPE, H5E_CANTINIT, FAIL, "data type conversion failed");
+        HGOTO_ERROR_FF(FAIL, "data type conversion failed");
 
     if(H5VL__iod_server_adjust_buffer(val_memtype_id, val_maptype_id, 1, dxpl_id, 
                                       val_size, &val_buf, &val_is_vl_data, &new_val_size) < 0)
-        HGOTO_ERROR2(H5E_DATATYPE, H5E_CANTINIT, FAIL, "data type conversion failed");
+        HGOTO_ERROR_FF(FAIL, "data type conversion failed");
 
 #if H5_EFF_DEBUG
     /* fake debugging */
@@ -510,11 +510,11 @@ H5VL_iod_server_map_set_cb(AXE_engine_t UNUSED axe_engine,
     if(!key_is_vl_data) {
         /* convert data if needed */
         if(H5Tconvert(key_memtype_id, key_maptype_id, 1, key.buf, NULL, dxpl_id) < 0)
-            HGOTO_ERROR2(H5E_DATATYPE, H5E_CANTINIT, FAIL, "data type conversion failed");
+            HGOTO_ERROR_FF(FAIL, "data type conversion failed");
     }
     if(!val_is_vl_data) {
         if(H5Tconvert(val_memtype_id, val_maptype_id, 1, val_buf, NULL, dxpl_id) < 0)
-            HGOTO_ERROR2(H5E_DATATYPE, H5E_CANTINIT, FAIL, "data type conversion failed");
+            HGOTO_ERROR_FF(FAIL, "data type conversion failed");
     }
 
     /* MSC - do IOD checksum - can't now */
@@ -531,17 +531,17 @@ H5VL_iod_server_map_set_cb(AXE_engine_t UNUSED axe_engine,
         cs[0] = H5_checksum_crc64(kv.key, kv.key_len);
         cs[1] = H5_checksum_crc64(kv.value, kv.value_len);
         if (iod_kv_set(iod_oh, wtid, NULL, &kv, cs, NULL) < 0)
-            HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't set KV pair in Map");
+            HGOTO_ERROR_FF(FAIL, "can't set KV pair in Map");
     }
     else {
         if (iod_kv_set(iod_oh, wtid, NULL, &kv, NULL, NULL) < 0)
-            HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't set KV pair in Map");
+            HGOTO_ERROR_FF(FAIL, "can't set KV pair in Map");
     }
 
 done:
 
     if(HG_SUCCESS != HG_Handler_start_output(op_data->hg_handle, &ret_value))
-        HDONE_ERROR2(H5E_SYM, H5E_WRITEERROR, FAIL, "can't send result of write to client");
+        HDONE_ERROR_FF(FAIL, "can't send result of write to client");
 
     input = (map_set_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
@@ -552,7 +552,7 @@ done:
     /* close the map if we opened it in this routine */
     if(opened_locally) {
         if(iod_obj_close(iod_oh, NULL, NULL) < 0)
-            HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't close Array object");
+            HGOTO_ERROR_FF(FAIL, "can't close Array object");
     }
 
 #if H5_EFF_DEBUG 
@@ -618,7 +618,7 @@ H5VL_iod_server_map_get_cb(AXE_engine_t UNUSED axe_engine,
     /* open the map if we don't have the handle yet */
     if(iod_oh.cookie == IOD_OH_UNDEFINED) {
         if (iod_obj_open_read(coh, iod_id, rtid, NULL /*hints*/, &iod_oh, NULL) < 0)
-            HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't open current group");
+            HGOTO_ERROR_FF(FAIL, "can't open current group");
         opened_locally = TRUE;
     }
 
@@ -631,7 +631,7 @@ H5VL_iod_server_map_get_cb(AXE_engine_t UNUSED axe_engine,
 
         /* get replica ID from dxpl */
         if(H5Pget_read_replica(dxpl_id, &read_tid) < 0)
-            HGOTO_ERROR2(H5E_PLIST, H5E_CANTGET, FAIL, "can't get replica ID from dxpl");
+            HGOTO_ERROR_FF(FAIL, "can't get replica ID from dxpl");
 
         if(read_tid) {
             fprintf(stderr, "Reading from replica tag %"PRIx64"\n", read_tid);
@@ -641,16 +641,16 @@ H5VL_iod_server_map_get_cb(AXE_engine_t UNUSED axe_engine,
 
     /* get the scope for data integrity checks for raw data */
     if(H5Pget_rawdata_integrity_scope(dxpl_id, &raw_cs_scope) < 0)
-        HGOTO_ERROR2(H5E_PLIST, H5E_CANTGET, FAIL, "can't get scope for data integrity checks");
+        HGOTO_ERROR_FF(FAIL, "can't get scope for data integrity checks");
 
     /* adjust buffers for datatype conversion */
     if(H5VL__iod_server_adjust_buffer(key_memtype_id, key_maptype_id, 1, dxpl_id, 
                                       key.buf_size, &key.buf, &key_is_vl, &key_size) < 0) 
-        HGOTO_ERROR2(H5E_DATATYPE, H5E_CANTINIT, FAIL, "data type conversion failed");
+        HGOTO_ERROR_FF(FAIL, "data type conversion failed");
 
     if(iod_kv_get_value(iod_oh, rtid, key.buf, (iod_size_t)key.buf_size, NULL, 
                         &src_size, NULL, NULL) < 0)
-        HGOTO_ERROR2(H5E_SYM, H5E_CANTGET, FAIL, "can't retrieve value size from parent KV store");
+        HGOTO_ERROR_FF(FAIL, "can't retrieve value size from parent KV store");
 
     if(val_is_vl) {
         output.ret = ret_value;
@@ -658,11 +658,11 @@ H5VL_iod_server_map_get_cb(AXE_engine_t UNUSED axe_engine,
         fprintf(stderr, "val size = %zu\n", src_size);
         if(client_val_buf_size) {
             if(NULL == (val_buf = malloc((size_t)src_size)))
-                HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't allocate buffer");
+                HGOTO_ERROR_FF(FAIL, "can't allocate buffer");
 
             if(iod_kv_get_value(iod_oh, rtid, key.buf, (iod_size_t)key.buf_size, val_buf, 
                                 &src_size, kv_cs, NULL) < 0)
-                HGOTO_ERROR2(H5E_SYM, H5E_CANTGET, FAIL, "can't retrieve value from parent KV store");
+                HGOTO_ERROR_FF(FAIL, "can't retrieve value from parent KV store");
 
             if(raw_cs_scope) {
                 iod_checksum_t cs[2];
@@ -671,7 +671,7 @@ H5VL_iod_server_map_get_cb(AXE_engine_t UNUSED axe_engine,
                 cs[1] = H5_checksum_crc64(val_buf, src_size);
 
                 if(kv_cs[0] != cs[0] && kv_cs[1] != cs[1])
-                    HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "Corruption detected in IOD KV pair");
+                    HGOTO_ERROR_FF(FAIL, "Corruption detected in IOD KV pair");
 
                 /* set checksum for the data to be sent */
                 output.val_cs = kv_cs[1];
@@ -687,14 +687,14 @@ H5VL_iod_server_map_get_cb(AXE_engine_t UNUSED axe_engine,
 
             /* Write bulk data here and wait for the data to be there  */
             if(HG_SUCCESS != HG_Bulk_write_all(dest, value_handle, bulk_block_handle, &bulk_request))
-                HGOTO_ERROR2(H5E_SYM, H5E_READERROR, FAIL, "can't read from array object");
+                HGOTO_ERROR_FF(FAIL, "can't read from array object");
             /* wait for it to complete */
             if(HG_SUCCESS != HG_Bulk_wait(bulk_request, HG_MAX_IDLE_TIME, HG_STATUS_IGNORE))
-                HGOTO_ERROR2(H5E_SYM, H5E_READERROR, FAIL, "can't read from array object");
+                HGOTO_ERROR_FF(FAIL, "can't read from array object");
 
             /* free block handle */
             if(HG_SUCCESS != HG_Bulk_handle_free(bulk_block_handle))
-                HGOTO_ERROR2(H5E_SYM, H5E_READERROR, FAIL, "can't free bds block handle");
+                HGOTO_ERROR_FF(FAIL, "can't free bds block handle");
         }
     }
     else {
@@ -702,11 +702,11 @@ H5VL_iod_server_map_get_cb(AXE_engine_t UNUSED axe_engine,
         src_size = HG_Bulk_handle_get_size(value_handle);
 
         if(NULL == (val_buf = malloc((size_t)src_size)))
-            HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't allocate buffer");
+            HGOTO_ERROR_FF(FAIL, "can't allocate buffer");
 
         if(iod_kv_get_value(iod_oh, rtid, key.buf, (iod_size_t)key.buf_size, val_buf, 
                             &src_size, kv_cs, NULL) < 0)
-            HGOTO_ERROR2(H5E_SYM, H5E_CANTGET, FAIL, "can't retrieve value from parent KV store");
+            HGOTO_ERROR_FF(FAIL, "can't retrieve value from parent KV store");
 
         if(raw_cs_scope) {
             iod_checksum_t cs[2];
@@ -715,7 +715,7 @@ H5VL_iod_server_map_get_cb(AXE_engine_t UNUSED axe_engine,
             cs[1] = H5_checksum_crc64(val_buf, src_size);
 
             if(kv_cs[0] != cs[0] && kv_cs[1] != cs[1])
-                HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "Corruption detected in IOD KV pair");
+                HGOTO_ERROR_FF(FAIL, "Corruption detected in IOD KV pair");
 
             /* set checksum for the data to be sent */
             output.val_cs = kv_cs[1];
@@ -724,11 +724,11 @@ H5VL_iod_server_map_get_cb(AXE_engine_t UNUSED axe_engine,
         /* adjust buffers for datatype conversion */
         if(H5VL__iod_server_adjust_buffer(val_memtype_id, val_maptype_id, 1, dxpl_id, 
                                           (size_t)src_size, &val_buf, &val_is_vl, &val_size) < 0) 
-            HGOTO_ERROR2(H5E_DATATYPE, H5E_CANTINIT, FAIL, "data type conversion failed");
+            HGOTO_ERROR_FF(FAIL, "data type conversion failed");
 
         /* do data conversion */
         if(H5Tconvert(val_maptype_id, val_memtype_id, 1, val_buf, NULL, dxpl_id) < 0)
-            HGOTO_ERROR2(H5E_DATATYPE, H5E_CANTINIT, FAIL, "data type conversion failed");
+            HGOTO_ERROR_FF(FAIL, "data type conversion failed");
 
         if(raw_cs_scope) {
             /* calculate a checksum for the data to be sent */
@@ -748,14 +748,14 @@ H5VL_iod_server_map_get_cb(AXE_engine_t UNUSED axe_engine,
 
         /* Write bulk data here and wait for the data to be there  */
         if(HG_SUCCESS != HG_Bulk_write_all(dest, value_handle, bulk_block_handle, &bulk_request))
-            HGOTO_ERROR2(H5E_SYM, H5E_READERROR, FAIL, "can't read from array object");
+            HGOTO_ERROR_FF(FAIL, "can't read from array object");
         /* wait for it to complete */
         if(HG_SUCCESS != HG_Bulk_wait(bulk_request, HG_MAX_IDLE_TIME, HG_STATUS_IGNORE))
-            HGOTO_ERROR2(H5E_SYM, H5E_READERROR, FAIL, "can't read from array object");
+            HGOTO_ERROR_FF(FAIL, "can't read from array object");
 
         /* free block handle */
         if(HG_SUCCESS != HG_Bulk_handle_free(bulk_block_handle))
-            HGOTO_ERROR2(H5E_SYM, H5E_READERROR, FAIL, "can't free bds block handle");
+            HGOTO_ERROR_FF(FAIL, "can't free bds block handle");
     }
 
 #if H5_EFF_DEBUG 
@@ -763,7 +763,7 @@ H5VL_iod_server_map_get_cb(AXE_engine_t UNUSED axe_engine,
 #endif
 
     if(HG_SUCCESS != HG_Handler_start_output(op_data->hg_handle, &output))
-        HGOTO_ERROR2(H5E_SYM, H5E_CANTGET, FAIL, "can't send result of map get");
+        HGOTO_ERROR_FF(FAIL, "can't send result of map get");
 
 done:
 
@@ -772,7 +772,7 @@ done:
         output.val_size = 0;
         output.val_cs = 0;
         if(HG_SUCCESS != HG_Handler_start_output(op_data->hg_handle, &output))
-            HDONE_ERROR2(H5E_SYM, H5E_CANTGET, FAIL, "can't send result of map get");
+            HDONE_ERROR_FF(FAIL, "can't send result of map get");
     }
 
     if(val_buf) 
@@ -784,7 +784,7 @@ done:
     /* close the map if we opened it in this routine */
     if(opened_locally) {
         if(iod_obj_close(iod_oh, NULL, NULL) < 0)
-            HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't close Array object");
+            HGOTO_ERROR_FF(FAIL, "can't close Array object");
     }
 
 } /* end H5VL_iod_server_map_get_cb() */
@@ -828,12 +828,12 @@ H5VL_iod_server_map_get_count_cb(AXE_engine_t UNUSED axe_engine,
     /* open the map if we don't have the handle yet */
     if(iod_oh.cookie == IOD_OH_UNDEFINED) {
         if (iod_obj_open_read(coh, iod_id, rtid, NULL /*hints*/, &iod_oh, NULL) < 0)
-            HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't open current group");
+            HGOTO_ERROR_FF(FAIL, "can't open current group");
         opened_locally = TRUE;
     }
 
     if(iod_kv_get_num(iod_oh, rtid, &num, NULL) < 0)
-        HGOTO_ERROR2(H5E_SYM, H5E_CANTGET, FAIL, "can't retrieve Number of KV pairs in MAP");
+        HGOTO_ERROR_FF(FAIL, "can't retrieve Number of KV pairs in MAP");
 
     output = (hsize_t)num;
 
@@ -842,14 +842,14 @@ H5VL_iod_server_map_get_count_cb(AXE_engine_t UNUSED axe_engine,
 #endif
 
     if(HG_SUCCESS != HG_Handler_start_output(op_data->hg_handle, &output))
-        HGOTO_ERROR2(H5E_SYM, H5E_CANTGET, FAIL, "can't send result of map get");
+        HGOTO_ERROR_FF(FAIL, "can't send result of map get");
 
 done:
 
     if(ret_value < 0) {
         output = IOD_COUNT_UNDEFINED;
         if(HG_SUCCESS != HG_Handler_start_output(op_data->hg_handle, &output))
-            HDONE_ERROR2(H5E_SYM, H5E_CANTGET, FAIL, "can't send result of map get_count");
+            HDONE_ERROR_FF(FAIL, "can't send result of map get_count");
     }
 
     input = (map_get_count_in_t *)H5MM_xfree(input);
@@ -858,7 +858,7 @@ done:
     /* close the map if we opened it in this routine */
     if(opened_locally) {
         if(iod_obj_close(iod_oh, NULL, NULL) < 0)
-            HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't close Array object");
+            HGOTO_ERROR_FF(FAIL, "can't close Array object");
     }
 
 } /* end H5VL_iod_server_map_get_count_cb() */
@@ -907,14 +907,14 @@ H5VL_iod_server_map_exists_cb(AXE_engine_t UNUSED axe_engine,
     /* open the map if we don't have the handle yet */
     if(iod_oh.cookie == IOD_OH_UNDEFINED) {
         if (iod_obj_open_read(coh, iod_id, rtid, NULL /*hints*/, &iod_oh, NULL) < 0)
-            HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't open current group");
+            HGOTO_ERROR_FF(FAIL, "can't open current group");
         opened_locally = TRUE;
     }
 
     /* adjust buffers for datatype conversion */
     if(H5VL__iod_server_adjust_buffer(key_memtype_id, key_maptype_id, 1, H5P_DEFAULT, 
                                       key.buf_size, &key.buf, &is_vl_data, &key_size) < 0) 
-        HGOTO_ERROR2(H5E_DATATYPE, H5E_CANTINIT, FAIL, "data type conversion failed");
+        HGOTO_ERROR_FF(FAIL, "data type conversion failed");
 
     /* determine if the Key exists by querying its value size */
     if(iod_kv_get_value(iod_oh, rtid, key.buf, (iod_size_t)key.buf_size, NULL, 
@@ -929,14 +929,14 @@ H5VL_iod_server_map_exists_cb(AXE_engine_t UNUSED axe_engine,
 #endif
 
     if(HG_SUCCESS != HG_Handler_start_output(op_data->hg_handle, &exists))
-        HGOTO_ERROR2(H5E_SYM, H5E_CANTGET, FAIL, "can't send result of map get");
+        HGOTO_ERROR_FF(FAIL, "can't send result of map get");
 
 done:
 
     if(ret_value < 0) {
         exists = -1; 
         if(HG_SUCCESS != HG_Handler_start_output(op_data->hg_handle, &exists))
-            HDONE_ERROR2(H5E_SYM, H5E_CANTGET, FAIL, "can't send result of map exists");
+            HDONE_ERROR_FF(FAIL, "can't send result of map exists");
     }
 
     input = (map_op_in_t *)H5MM_xfree(input);
@@ -945,7 +945,7 @@ done:
     /* close the map if we opened it in this routine */
     if(opened_locally) {
         if(iod_obj_close(iod_oh, NULL, NULL) < 0)
-            HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't close Array object");
+            HGOTO_ERROR_FF(FAIL, "can't close Array object");
     }
 
 } /* end H5VL_iod_server_map_exists_cb() */
@@ -994,14 +994,14 @@ H5VL_iod_server_map_delete_cb(AXE_engine_t UNUSED axe_engine,
     /* open the map if we don't have the handle yet */
     if(iod_oh.cookie == IOD_OH_UNDEFINED) {
         if (iod_obj_open_write(coh, iod_id, rtid, NULL /*hints*/, &iod_oh, NULL) < 0)
-            HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't open current group");
+            HGOTO_ERROR_FF(FAIL, "can't open current group");
         opened_locally = TRUE;
     }
 
     /* adjust buffers for datatype conversion */
     if(H5VL__iod_server_adjust_buffer(key_memtype_id, key_maptype_id, 1, H5P_DEFAULT, 
                                       key.buf_size, &key.buf, &is_vl_data, &key_size) < 0) 
-        HGOTO_ERROR2(H5E_DATATYPE, H5E_CANTINIT, FAIL, "data type conversion failed");
+        HGOTO_ERROR_FF(FAIL, "data type conversion failed");
 
     kv.key = key.buf;
     kv.key_len = key_size;
@@ -1010,10 +1010,10 @@ H5VL_iod_server_map_delete_cb(AXE_engine_t UNUSED axe_engine,
     kvs.ret = &ret;
 
     if(iod_kv_unlink_keys(iod_oh, wtid, NULL, 1, &kvs, NULL) < 0)
-        HGOTO_ERROR2(H5E_SYM, H5E_CANTDEC, FAIL, "Unable to unlink KV pair");
+        HGOTO_ERROR_FF(FAIL, "Unable to unlink KV pair");
 
     if(ret < 0)
-        HGOTO_ERROR2(H5E_SYM, H5E_CANTDEC, FAIL, "Unable to unlink KV pair");
+        HGOTO_ERROR_FF(FAIL, "Unable to unlink KV pair");
 done:
 
 #if H5_EFF_DEBUG 
@@ -1021,7 +1021,7 @@ done:
 #endif
 
     if(HG_SUCCESS != HG_Handler_start_output(op_data->hg_handle, &ret_value))
-        HDONE_ERROR2(H5E_SYM, H5E_CANTGET, FAIL, "can't send result of map delete");
+        HDONE_ERROR_FF(FAIL, "can't send result of map delete");
 
     input = (map_op_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
@@ -1029,7 +1029,7 @@ done:
     /* close the map if we opened it in this routine */
     if(opened_locally) {
         if(iod_obj_close(iod_oh, NULL, NULL) < 0)
-            HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't close Array object");
+            HGOTO_ERROR_FF(FAIL, "can't close Array object");
     }
 
 } /* end H5VL_iod_server_map_delete_cb() */
@@ -1065,9 +1065,9 @@ H5VL_iod_server_map_close_cb(AXE_engine_t UNUSED axe_engine,
 #endif
 
     if((iod_obj_close(iod_oh.rd_oh, NULL, NULL)) < 0)
-        HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't close object");
+        HGOTO_ERROR_FF(FAIL, "can't close object");
     if((iod_obj_close(iod_oh.wr_oh, NULL, NULL)) < 0)
-        HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't close object");
+        HGOTO_ERROR_FF(FAIL, "can't close object");
 
 done:
 #if H5_EFF_DEBUG