Made HGOTO_ERROR a do-while loop (#3308)

* Made HGOTO_ERROR a do-while loop

1 files changed, 40 insertions, 40 deletions

diff --git a/src/H5ESint.c b/src/H5ESint.c
index 6109b17..e148132 100644
--- a/src/H5ESint.c
+++ b/src/H5ESint.c
@@ -139,7 +139,7 @@ H5ES_init(void)
 
     /* Initialize the ID group for the event set IDs */
     if (H5I_register_type(H5I_EVENTSET_CLS) < 0)
-        HGOTO_ERROR(H5E_EVENTSET, H5E_CANTINIT, FAIL, "unable to initialize interface")
+        HGOTO_ERROR(H5E_EVENTSET, H5E_CANTINIT, FAIL, "unable to initialize interface");
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -217,7 +217,7 @@ H5ES__create(void)
 
     /* Allocate space for new event set */
     if (NULL == (es = H5FL_CALLOC(H5ES_t)))
-        HGOTO_ERROR(H5E_EVENTSET, H5E_CANTALLOC, NULL, "can't allocate event set object")
+        HGOTO_ERROR(H5E_EVENTSET, H5E_CANTALLOC, NULL, "can't allocate event set object");
 
     /* Set the return value */
     ret_value = es;
@@ -254,7 +254,7 @@ H5ES__insert(H5ES_t *es, H5VL_t *connector, void *request_token, const char *app
 
     /* Create new event */
     if (NULL == (ev = H5ES__event_new(connector, request_token)))
-        HGOTO_ERROR(H5E_EVENTSET, H5E_CANTCREATE, FAIL, "can't create event object")
+        HGOTO_ERROR(H5E_EVENTSET, H5E_CANTCREATE, FAIL, "can't create event object");
 
     /* Copy the app source information */
     /* The 'app_func' & 'app_file' strings are statically allocated (by the compiler)
@@ -279,7 +279,7 @@ H5ES__insert(H5ES_t *es, H5VL_t *connector, void *request_token, const char *app
     ev->op_info.api_name = caller;
     assert(ev->op_info.api_args == NULL);
     if (api_args && NULL == (ev->op_info.api_args = H5MM_xstrdup(api_args)))
-        HGOTO_ERROR(H5E_EVENTSET, H5E_CANTALLOC, FAIL, "can't copy API routine arguments")
+        HGOTO_ERROR(H5E_EVENTSET, H5E_CANTALLOC, FAIL, "can't copy API routine arguments");
 
     /* Append fully initialized event onto the event set's 'active' list */
     H5ES__list_append(&es->active, ev);
@@ -288,7 +288,7 @@ H5ES__insert(H5ES_t *es, H5VL_t *connector, void *request_token, const char *app
     /* Invoke the event set's 'insert' callback, if present */
     if (es->ins_func)
         if ((es->ins_func)(&ev->op_info, es->ins_ctx) < 0)
-            HGOTO_ERROR(H5E_EVENTSET, H5E_CALLBACK, FAIL, "'insert' callback for event set failed")
+            HGOTO_ERROR(H5E_EVENTSET, H5E_CALLBACK, FAIL, "'insert' callback for event set failed");
 
 done:
     /* Release resources on error */
@@ -335,11 +335,11 @@ H5ES_insert(hid_t es_id, H5VL_t *connector, void *token, const char *caller, con
 
     /* Get event set */
     if (NULL == (es = (H5ES_t *)H5I_object_verify(es_id, H5I_EVENTSET)))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an event set")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an event set");
 
     /* Check for errors in event set */
     if (es->err_occurred)
-        HGOTO_ERROR(H5E_EVENTSET, H5E_CANTINSERT, FAIL, "event set has failed operations")
+        HGOTO_ERROR(H5E_EVENTSET, H5E_CANTINSERT, FAIL, "event set has failed operations");
 
     /* Start working on the API routines arguments */
     va_start(ap, caller_args);
@@ -355,19 +355,19 @@ H5ES_insert(hid_t es_id, H5VL_t *connector, void *token, const char *caller, con
 
     /* Create the string for the API routine's arguments */
     if (NULL == (rs = H5RS_create(NULL)))
-        HGOTO_ERROR(H5E_EVENTSET, H5E_CANTALLOC, FAIL, "can't allocate ref-counted string")
+        HGOTO_ERROR(H5E_EVENTSET, H5E_CANTALLOC, FAIL, "can't allocate ref-counted string");
 
     /* Copy the string for the API routine's arguments */
     /* (skip the six characters from the app's file, function and line # arguments) */
     assert(0 == HDstrncmp(caller_args, "*s*sIu", 6));
     if (H5_trace_args(rs, caller_args + 6, ap) < 0)
-        HGOTO_ERROR(H5E_EVENTSET, H5E_CANTSET, FAIL, "can't create formatted API arguments")
+        HGOTO_ERROR(H5E_EVENTSET, H5E_CANTSET, FAIL, "can't create formatted API arguments");
     if (NULL == (api_args = H5RS_get_str(rs)))
-        HGOTO_ERROR(H5E_EVENTSET, H5E_CANTGET, FAIL, "can't get pointer to formatted API arguments")
+        HGOTO_ERROR(H5E_EVENTSET, H5E_CANTGET, FAIL, "can't get pointer to formatted API arguments");
 
     /* Insert the operation into the event set */
     if (H5ES__insert(es, connector, token, app_file, app_func, app_line, caller, api_args) < 0)
-        HGOTO_ERROR(H5E_EVENTSET, H5E_CANTINSERT, FAIL, "event set has failed operations")
+        HGOTO_ERROR(H5E_EVENTSET, H5E_CANTINSERT, FAIL, "event set has failed operations");
 
 done:
     /* Clean up */
@@ -402,7 +402,7 @@ H5ES__insert_request(H5ES_t *es, H5VL_t *connector, void *token)
 
     /* Insert an 'anonymous' operation into the event set */
     if (H5ES__insert(es, connector, token, NULL, NULL, 0, NULL, NULL) < 0)
-        HGOTO_ERROR(H5E_EVENTSET, H5E_CANTINSERT, FAIL, "event set has failed operations")
+        HGOTO_ERROR(H5E_EVENTSET, H5E_CANTINSERT, FAIL, "event set has failed operations");
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -476,7 +476,7 @@ H5ES__get_requests(H5ES_t *es, H5_iter_order_t order, hid_t *connector_ids, void
 
     /* Iterate over the events in the set */
     if (H5ES__list_iterate(&es->active, order, H5ES__get_requests_cb, &ctx) < 0)
-        HGOTO_ERROR(H5E_EVENTSET, H5E_BADITER, FAIL, "iteration failed")
+        HGOTO_ERROR(H5E_EVENTSET, H5E_BADITER, FAIL, "iteration failed");
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -556,19 +556,19 @@ H5ES__op_complete(H5ES_t *es, H5ES_event_t *ev, H5VL_request_status_t ev_status)
                 /* Retrieve the execution time info */
                 if (H5VL_request_specific(ev->request, &vol_cb_args) < 0)
                     HGOTO_ERROR(H5E_EVENTSET, H5E_CANTGET, FAIL,
-                                "unable to retrieve execution time info for operation")
+                                "unable to retrieve execution time info for operation");
             }
             else
                 /* Translate status */
                 op_status = H5ES_STATUS_CANCELED;
 
             if ((es->comp_func)(&ev->op_info, op_status, H5I_INVALID_HID, es->comp_ctx) < 0)
-                HGOTO_ERROR(H5E_EVENTSET, H5E_CALLBACK, FAIL, "'complete' callback for event set failed")
+                HGOTO_ERROR(H5E_EVENTSET, H5E_CALLBACK, FAIL, "'complete' callback for event set failed");
         } /* end if */
 
         /* Event success or cancellation */
         if (H5ES__event_completed(ev, &es->active) < 0)
-            HGOTO_ERROR(H5E_EVENTSET, H5E_CANTRELEASE, FAIL, "unable to release completed event")
+            HGOTO_ERROR(H5E_EVENTSET, H5E_CANTRELEASE, FAIL, "unable to release completed event");
     } /* end if */
     else if (H5VL_REQUEST_STATUS_FAIL == ev_status) {
         /* Invoke the event set's 'complete' callback, if present */
@@ -579,21 +579,21 @@ H5ES__op_complete(H5ES_t *es, H5ES_event_t *ev, H5VL_request_status_t ev_status)
 
             /* Retrieve the error stack for the operation */
             if (H5VL_request_specific(ev->request, &vol_cb_args) < 0)
-                HGOTO_ERROR(H5E_EVENTSET, H5E_CANTGET, FAIL, "unable to retrieve error stack for operation")
+                HGOTO_ERROR(H5E_EVENTSET, H5E_CANTGET, FAIL, "unable to retrieve error stack for operation");
 
             /* Set values */
             err_stack_id = vol_cb_args.args.get_err_stack.err_stack_id;
 
             if ((es->comp_func)(&ev->op_info, H5ES_STATUS_FAIL, err_stack_id, es->comp_ctx) < 0)
-                HGOTO_ERROR(H5E_EVENTSET, H5E_CALLBACK, FAIL, "'complete' callback for event set failed")
+                HGOTO_ERROR(H5E_EVENTSET, H5E_CALLBACK, FAIL, "'complete' callback for event set failed");
         } /* end if */
 
         /* Handle failure */
         if (H5ES__handle_fail(es, ev) < 0)
-            HGOTO_ERROR(H5E_EVENTSET, H5E_CANTSET, FAIL, "unable to handle failed event")
+            HGOTO_ERROR(H5E_EVENTSET, H5E_CANTSET, FAIL, "unable to handle failed event");
     } /* end else-if */
     else
-        HGOTO_ERROR(H5E_EVENTSET, H5E_BADVALUE, FAIL, "unknown event status?!?")
+        HGOTO_ERROR(H5E_EVENTSET, H5E_BADVALUE, FAIL, "unknown event status?!?");
 
 done:
     /* Clean up */
@@ -632,7 +632,7 @@ H5ES__wait_cb(H5ES_event_t *ev, void *_ctx)
     if (ctx->timeout != H5ES_WAIT_NONE && ctx->timeout != H5ES_WAIT_FOREVER)
         start_time = H5_now_usec();
     if (H5VL_request_wait(ev->request, ctx->timeout, &ev_status) < 0)
-        HGOTO_ERROR(H5E_EVENTSET, H5E_CANTWAIT, H5_ITER_ERROR, "unable to test operation")
+        HGOTO_ERROR(H5E_EVENTSET, H5E_CANTWAIT, H5_ITER_ERROR, "unable to test operation");
     if (ctx->timeout != H5ES_WAIT_NONE && ctx->timeout != H5ES_WAIT_FOREVER)
         elapsed_time = H5_now_usec() - start_time;
 
@@ -640,7 +640,7 @@ H5ES__wait_cb(H5ES_event_t *ev, void *_ctx)
     if (ev_status == H5VL_REQUEST_STATUS_FAIL) {
         /* Handle event completion */
         if (H5ES__op_complete(ctx->es, ev, ev_status) < 0)
-            HGOTO_ERROR(H5E_EVENTSET, H5E_CANTRELEASE, H5_ITER_ERROR, "unable to release completed event")
+            HGOTO_ERROR(H5E_EVENTSET, H5E_CANTRELEASE, H5_ITER_ERROR, "unable to release completed event");
 
         /* Record the error */
         *ctx->op_failed = TRUE;
@@ -651,12 +651,12 @@ H5ES__wait_cb(H5ES_event_t *ev, void *_ctx)
     else if (ev_status == H5VL_REQUEST_STATUS_SUCCEED || ev_status == H5VL_REQUEST_STATUS_CANCELED) {
         /* Handle event completion */
         if (H5ES__op_complete(ctx->es, ev, ev_status) < 0)
-            HGOTO_ERROR(H5E_EVENTSET, H5E_CANTRELEASE, H5_ITER_ERROR, "unable to release completed event")
+            HGOTO_ERROR(H5E_EVENTSET, H5E_CANTRELEASE, H5_ITER_ERROR, "unable to release completed event");
     } /* end else-if */
     else if (ev_status == H5VL_REQUEST_STATUS_CANT_CANCEL)
         /* Should never get a status of 'can't cancel' back from test / wait operation */
         HGOTO_ERROR(H5E_EVENTSET, H5E_BADVALUE, H5_ITER_ERROR,
-                    "received \"can't cancel\" status for operation")
+                    "received \"can't cancel\" status for operation");
     else {
         /* Sanity check */
         assert(ev_status == H5VL_REQUEST_STATUS_IN_PROGRESS);
@@ -714,7 +714,7 @@ H5ES__wait(H5ES_t *es, uint64_t timeout, size_t *num_in_progress, hbool_t *op_fa
 
     /* Iterate over the events in the set, waiting for them to complete */
     if (H5ES__list_iterate(&es->active, H5_ITER_NATIVE, H5ES__wait_cb, &ctx) < 0)
-        HGOTO_ERROR(H5E_EVENTSET, H5E_BADITER, FAIL, "iteration failed")
+        HGOTO_ERROR(H5E_EVENTSET, H5E_BADITER, FAIL, "iteration failed");
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -744,13 +744,13 @@ H5ES__cancel_cb(H5ES_event_t *ev, void *_ctx)
 
     /* Attempt to cancel the request */
     if (H5VL_request_cancel(ev->request, &ev_status) < 0)
-        HGOTO_ERROR(H5E_EVENTSET, H5E_CANTCANCEL, H5_ITER_ERROR, "unable to cancel operation")
+        HGOTO_ERROR(H5E_EVENTSET, H5E_CANTCANCEL, H5_ITER_ERROR, "unable to cancel operation");
 
     /* Check for status values that indicate we should break out of the loop */
     if (ev_status == H5VL_REQUEST_STATUS_FAIL) {
         /* Handle event completion */
         if (H5ES__op_complete(ctx->es, ev, ev_status) < 0)
-            HGOTO_ERROR(H5E_EVENTSET, H5E_CANTSET, H5_ITER_ERROR, "unable to handle failed event")
+            HGOTO_ERROR(H5E_EVENTSET, H5E_CANTSET, H5_ITER_ERROR, "unable to handle failed event");
 
         /* Record the error */
         *ctx->op_failed = TRUE;
@@ -764,7 +764,7 @@ H5ES__cancel_cb(H5ES_event_t *ev, void *_ctx)
 
         /* Handle event completion */
         if (H5ES__op_complete(ctx->es, ev, ev_status) < 0)
-            HGOTO_ERROR(H5E_EVENTSET, H5E_CANTRELEASE, H5_ITER_ERROR, "unable to release completed event")
+            HGOTO_ERROR(H5E_EVENTSET, H5E_CANTRELEASE, H5_ITER_ERROR, "unable to release completed event");
     } /* end else-if */
     else if (ev_status == H5VL_REQUEST_STATUS_CANT_CANCEL || ev_status == H5VL_REQUEST_STATUS_IN_PROGRESS) {
         /* Increment "not canceled" counter */
@@ -776,7 +776,7 @@ H5ES__cancel_cb(H5ES_event_t *ev, void *_ctx)
 
         /* Handle event completion */
         if (H5ES__op_complete(ctx->es, ev, ev_status) < 0)
-            HGOTO_ERROR(H5E_EVENTSET, H5E_CANTRELEASE, H5_ITER_ERROR, "unable to release completed event")
+            HGOTO_ERROR(H5E_EVENTSET, H5E_CANTRELEASE, H5_ITER_ERROR, "unable to release completed event");
     } /* end else */
 
 done:
@@ -816,7 +816,7 @@ H5ES__cancel(H5ES_t *es, size_t *num_not_canceled, hbool_t *op_failed)
 
     /* Iterate over the events in the set, attempting to cancel them */
     if (H5ES__list_iterate(&es->active, H5_ITER_NATIVE, H5ES__cancel_cb, &ctx) < 0)
-        HGOTO_ERROR(H5E_EVENTSET, H5E_BADITER, FAIL, "iteration failed")
+        HGOTO_ERROR(H5E_EVENTSET, H5E_BADITER, FAIL, "iteration failed");
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -850,13 +850,13 @@ H5ES__get_err_info_cb(H5ES_event_t *ev, void *_ctx)
      * here, when they are given back to the user.
      */
     if (NULL == (ctx->curr_err_info->api_name = H5MM_xstrdup(ev->op_info.api_name)))
-        HGOTO_ERROR(H5E_EVENTSET, H5E_CANTALLOC, H5_ITER_ERROR, "can't copy HDF5 API routine name")
+        HGOTO_ERROR(H5E_EVENTSET, H5E_CANTALLOC, H5_ITER_ERROR, "can't copy HDF5 API routine name");
     if (NULL == (ctx->curr_err_info->api_args = H5MM_xstrdup(ev->op_info.api_args)))
-        HGOTO_ERROR(H5E_EVENTSET, H5E_CANTALLOC, H5_ITER_ERROR, "can't copy HDF5 API routine arguments")
+        HGOTO_ERROR(H5E_EVENTSET, H5E_CANTALLOC, H5_ITER_ERROR, "can't copy HDF5 API routine arguments");
     if (NULL == (ctx->curr_err_info->app_file_name = H5MM_xstrdup(ev->op_info.app_file_name)))
-        HGOTO_ERROR(H5E_EVENTSET, H5E_CANTALLOC, H5_ITER_ERROR, "can't copy HDF5 application file name")
+        HGOTO_ERROR(H5E_EVENTSET, H5E_CANTALLOC, H5_ITER_ERROR, "can't copy HDF5 application file name");
     if (NULL == (ctx->curr_err_info->app_func_name = H5MM_xstrdup(ev->op_info.app_func_name)))
-        HGOTO_ERROR(H5E_EVENTSET, H5E_CANTALLOC, H5_ITER_ERROR, "can't copy HDF5 application function name")
+        HGOTO_ERROR(H5E_EVENTSET, H5E_CANTALLOC, H5_ITER_ERROR, "can't copy HDF5 application function name");
     ctx->curr_err_info->app_line_num = ev->op_info.app_line_num;
     ctx->curr_err_info->op_ins_count = ev->op_info.op_ins_count;
     ctx->curr_err_info->op_ins_ts    = ev->op_info.op_ins_ts;
@@ -869,7 +869,7 @@ H5ES__get_err_info_cb(H5ES_event_t *ev, void *_ctx)
 
     /* Get error stack for event */
     if (H5VL_request_specific(ev->request, &vol_cb_args) < 0)
-        HGOTO_ERROR(H5E_EVENTSET, H5E_CANTGET, H5_ITER_ERROR, "unable to retrieve error stack for operation")
+        HGOTO_ERROR(H5E_EVENTSET, H5E_CANTGET, H5_ITER_ERROR, "unable to retrieve error stack for operation");
 
     /* Set value */
     ctx->curr_err_info->err_stack_id = vol_cb_args.args.get_err_stack.err_stack_id;
@@ -879,7 +879,7 @@ H5ES__get_err_info_cb(H5ES_event_t *ev, void *_ctx)
 
     /* Free event node */
     if (H5ES__event_free(ev) < 0)
-        HGOTO_ERROR(H5E_EVENTSET, H5E_CANTRELEASE, H5_ITER_ERROR, "unable to release failed event")
+        HGOTO_ERROR(H5E_EVENTSET, H5E_CANTRELEASE, H5_ITER_ERROR, "unable to release failed event");
 
     /* Advance to next element of err_info[] array */
     ctx->curr_err++;
@@ -924,7 +924,7 @@ H5ES__get_err_info(H5ES_t *es, size_t num_err_info, H5ES_err_info_t err_info[],
 
     /* Iterate over the failed events in the set, copying their error info */
     if (H5ES__list_iterate(&es->failed, H5_ITER_NATIVE, H5ES__get_err_info_cb, &ctx) < 0)
-        HGOTO_ERROR(H5E_EVENTSET, H5E_BADITER, FAIL, "iteration failed")
+        HGOTO_ERROR(H5E_EVENTSET, H5E_BADITER, FAIL, "iteration failed");
 
     /* Set # of failed events cleared from event set's failed list */
     *num_cleared = ctx.curr_err;
@@ -959,7 +959,7 @@ H5ES__close_failed_cb(H5ES_event_t *ev, void *_ctx)
 
     /* Free event node */
     if (H5ES__event_free(ev) < 0)
-        HGOTO_ERROR(H5E_EVENTSET, H5E_CANTRELEASE, H5_ITER_ERROR, "unable to release failed event")
+        HGOTO_ERROR(H5E_EVENTSET, H5E_CANTRELEASE, H5_ITER_ERROR, "unable to release failed event");
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -988,11 +988,11 @@ H5ES__close(H5ES_t *es)
     if (H5ES__list_count(&es->active) > 0)
         HGOTO_ERROR(
             H5E_EVENTSET, H5E_CANTCLOSEOBJ, FAIL,
-            "can't close event set while unfinished operations are present (i.e. wait on event set first)")
+            "can't close event set while unfinished operations are present (i.e. wait on event set first)");
 
     /* Iterate over the failed events in the set, releasing them */
     if (H5ES__list_iterate(&es->failed, H5_ITER_NATIVE, H5ES__close_failed_cb, (void *)es) < 0)
-        HGOTO_ERROR(H5E_EVENTSET, H5E_BADITER, FAIL, "iteration failed")
+        HGOTO_ERROR(H5E_EVENTSET, H5E_BADITER, FAIL, "iteration failed");
 
     /* Release the event set */
     es = H5FL_FREE(H5ES_t, es);