use PGOTO* macros instead of goto

Author: TheAssembler1

src/api/pdc_client_connect.c

@@ -120,10 +120,10 @@ pdcid_t
 PDC_obj_create(pdcid_t cont_id, const char *obj_name, pdcid_t obj_prop_id, _pdc_obj_location_t location)
 {
     pdcid_t                ret_value = 0;
-    struct _pdc_obj_info * p         = NULL;
-    struct _pdc_id_info *  id_info   = NULL;
+    struct _pdc_obj_info  *p         = NULL;
+    struct _pdc_id_info   *id_info   = NULL;
     struct _pdc_cont_info *cont_info = NULL;
-    struct _pdc_obj_prop * obj_prop;
+    struct _pdc_obj_prop  *obj_prop;
     uint64_t               meta_id;
     uint32_t               data_server_id, metadata_server_id;
     size_t                 i;
@@ -281,7 +281,7 @@ perr_t
 PDC_obj_close(struct _pdc_obj_info *op)
 {
     perr_t                      ret_value = SUCCEED;
-    pdcid_t *                   transfer_request_id;
+    pdcid_t                    *transfer_request_id;
     pdc_local_transfer_request *temp, *previous;
     int                         i, n;
 
@@ -409,12 +409,12 @@ PDCobj_open_common(const char *obj_name, pdcid_t pdc, int is_col)
     pdcid_t               ret_value = 0;
     perr_t                ret       = SUCCEED;
     struct _pdc_obj_info *p         = NULL;
-    pdc_metadata_t *      out       = NULL;
+    pdc_metadata_t       *out       = NULL;
     pdcid_t               obj_prop;
     size_t                i;
     uint32_t              metadata_server_id;
-    obj_handle *          oh;
-    struct pdc_obj_info * info;
+    obj_handle           *oh;
+    struct pdc_obj_info  *info;
     int                   is_opened = 0;
 
     FUNC_ENTER(NULL);
@@ -431,9 +431,8 @@ PDCobj_open_common(const char *obj_name, pdcid_t pdc, int is_col)
     }
 
     if (is_opened) {
-        ret_value = info->local_id;
         PDC_inc_ref(info->local_id);
-        goto done;
+        PGOTO_DONE(info->local_id);
     }
 
     p = (struct _pdc_obj_info *)PDC_malloc(sizeof(struct _pdc_obj_info));
@@ -557,8 +556,8 @@ PDCobj_open_col(const char *obj_name, pdcid_t pdc)
 obj_handle *
 PDCobj_iter_start(pdcid_t cont_id)
 {
-    obj_handle *        ret_value = NULL;
-    obj_handle *        objhl     = NULL;
+    obj_handle         *ret_value = NULL;
+    obj_handle         *objhl     = NULL;
     struct PDC_id_type *type_ptr;
 
     FUNC_ENTER(NULL);
@@ -618,7 +617,7 @@ PDCobj_iter_next(obj_handle *ohandle, pdcid_t cont_id)
 struct pdc_obj_info *
 PDCobj_iter_get_info(obj_handle *ohandle)
 {
-    struct pdc_obj_info * ret_value = NULL;
+    struct pdc_obj_info  *ret_value = NULL;
     struct _pdc_obj_info *info      = NULL;
     unsigned              i;
 
@@ -748,7 +747,7 @@ perr_t
 PDCprop_set_obj_dims(pdcid_t obj_prop, PDC_int_t ndim, uint64_t *dims)
 {
     perr_t                ret_value = SUCCEED;
-    struct _pdc_id_info * info;
+    struct _pdc_id_info  *info;
     struct _pdc_obj_prop *prop;
 
     FUNC_ENTER(NULL);
@@ -776,7 +775,7 @@ perr_t
 PDCprop_set_obj_type(pdcid_t obj_prop, pdc_var_type_t type)
 {
     perr_t                ret_value = SUCCEED;
-    struct _pdc_id_info * info;
+    struct _pdc_id_info  *info;
     struct _pdc_obj_prop *prop;
 
     FUNC_ENTER(NULL);
@@ -795,7 +794,7 @@ perr_t
 PDCprop_set_obj_transfer_region_type(pdcid_t obj_prop, pdc_region_partition_t region_partition)
 {
     perr_t                ret_value = SUCCEED;
-    struct _pdc_id_info * info;
+    struct _pdc_id_info  *info;
     struct _pdc_obj_prop *prop;
 
     FUNC_ENTER(NULL);
@@ -814,7 +813,7 @@ perr_t
 PDCprop_set_obj_consistency_semantics(pdcid_t obj_prop, pdc_consistency_t consistency)
 {
     perr_t                ret_value = SUCCEED;
-    struct _pdc_id_info * info;
+    struct _pdc_id_info  *info;
     struct _pdc_obj_prop *prop;
 
     FUNC_ENTER(NULL);
@@ -833,7 +832,7 @@ perr_t
 PDCprop_set_obj_buf(pdcid_t obj_prop, void *buf)
 {
     perr_t                ret_value = SUCCEED;
-    struct _pdc_id_info * info;
+    struct _pdc_id_info  *info;
     struct _pdc_obj_prop *prop;
 
     FUNC_ENTER(NULL);
@@ -852,7 +851,7 @@ perr_t
 PDCobj_set_dims(pdcid_t obj_id, int ndim, uint64_t *dims)
 {
     perr_t                ret_value = SUCCEED;
-    struct _pdc_id_info * info;
+    struct _pdc_id_info  *info;
     struct _pdc_obj_info *object;
     int                   reset;
 
@@ -864,8 +863,7 @@ PDCobj_set_dims(pdcid_t obj_id, int ndim, uint64_t *dims)
     object = (struct _pdc_obj_info *)(info->obj_ptr);
     if (object->local_transfer_request_size) {
         // We do not allow setting obj dims while the region transfer requests are taking places.
-        ret_value = FAIL;
-        goto done;
+        PGOTO_ERROR(FAIL, "Attempt to set obj dims while a region transfer request was taking place");
     }
 
     if (ndim != (int)((pdc_metadata_t *)(object->metadata))->ndim) {
@@ -879,7 +877,7 @@ PDCobj_set_dims(pdcid_t obj_id, int ndim, uint64_t *dims)
 
     if (!reset) {
         // Server rejects reset object dims for some reasons, so we close this operation.
-        ret_value = FAIL;
+        PGOTO_DONE(FAIL);
     }
 
 done:
@@ -890,7 +888,7 @@ perr_t
 PDCobj_get_dims(pdcid_t obj_id, int *ndim, uint64_t **dims)
 {
     perr_t                ret_value = SUCCEED;
-    struct _pdc_id_info * info;
+    struct _pdc_id_info  *info;
     struct _pdc_obj_info *object;
     FUNC_ENTER(NULL);
 
@@ -909,10 +907,10 @@ PDCobj_get_dims(pdcid_t obj_id, int *ndim, uint64_t **dims)
 void **
 PDCobj_buf_retrieve(pdcid_t obj_id)
 {
-    void **               ret_value = NULL;
-    struct _pdc_id_info * info;
+    void                **ret_value = NULL;
+    struct _pdc_id_info  *info;
     struct _pdc_obj_info *object;
-    void **               buffer;
+    void                **buffer;
 
     FUNC_ENTER(NULL);
     info = PDC_find_id(obj_id);
@@ -931,7 +929,7 @@ PDC_obj_get_info(pdcid_t obj_id)
 {
     struct _pdc_obj_info *ret_value = NULL;
     struct _pdc_obj_info *info      = NULL;
-    struct _pdc_id_info * obj;
+    struct _pdc_id_info  *obj;
     size_t                i;
 
     FUNC_ENTER(NULL);
@@ -1112,7 +1110,7 @@ PDC_free_obj_info(struct _pdc_obj_info *obj)
 struct pdc_obj_info *
 PDCobj_get_info(pdcid_t obj_id)
 {
-    struct pdc_obj_info * ret_value = NULL;
+    struct pdc_obj_info  *ret_value = NULL;
     struct _pdc_obj_info *tmp       = NULL;
     /* pdcid_t obj_id; */