Merge Made HGOTO_ERROR a do-while loop changes from develop (#3334)

1 files changed, 14 insertions, 14 deletions

diff --git a/src/H5Pencdec.c b/src/H5Pencdec.c
index 653f155..69396f4 100644
--- a/src/H5Pencdec.c
+++ b/src/H5Pencdec.c
@@ -321,7 +321,7 @@ H5P__encode_cb(H5P_genprop_t *prop, void *_udata)
         /* Encode (or not, if *(udata->pp) is NULL) the property value */
         prop_value_len = 0;
         if ((prop->encode)(prop->value, udata->pp, &prop_value_len) < 0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTENCODE, H5_ITER_ERROR, "property encoding routine failed")
+            HGOTO_ERROR(H5E_PLIST, H5E_CANTENCODE, H5_ITER_ERROR, "property encoding routine failed");
         *(udata->enc_size_ptr) += prop_value_len;
     } /* end if */
 
@@ -366,7 +366,7 @@ H5P__encode(const H5P_genplist_t *plist, hbool_t enc_all_prop, void *buf, size_t
 
     /* Sanity check */
     if (NULL == nalloc)
-        HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "bad allocation size pointer")
+        HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "bad allocation size pointer");
 
     /* If the buffer is NULL, then this call to H5P__encode will return how much
      * space is needed to encode a property.
@@ -392,7 +392,7 @@ H5P__encode(const H5P_genplist_t *plist, hbool_t enc_all_prop, void *buf, size_t
     /* Iterate over all properties in property list, encoding them */
     idx = 0;
     if (H5P__iterate_plist(plist, enc_all_prop, &idx, H5P__encode_cb, &udata) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_BADITER, FAIL, "can't iterate over properties")
+        HGOTO_ERROR(H5E_PLIST, H5E_BADITER, FAIL, "can't iterate over properties");
 
     /* Encode a terminator for list of properties */
     if (encode)
@@ -508,7 +508,7 @@ H5P__decode_unsigned(const void **_pp, void *_value)
     /* Decode the size */
     enc_size = *(*pp)++;
     if (enc_size != sizeof(unsigned))
-        HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "unsigned value can't be decoded")
+        HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "unsigned value can't be decoded");
 
     H5_DECODE_UNSIGNED(*pp, *value);
 
@@ -604,7 +604,7 @@ H5P__decode_double(const void **_pp, void *_value)
     /* Decode the size */
     enc_size = *(*pp)++;
     if (enc_size != sizeof(double))
-        HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "double value can't be decoded")
+        HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "double value can't be decoded");
 
     H5_DECODE_DOUBLE(*pp, *value);
 
@@ -651,18 +651,18 @@ H5P__decode(const void *buf)
 
     /* Sanity check */
     if (NULL == p)
-        HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "decode buffer is NULL")
+        HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "decode buffer is NULL");
 
     /* Get the version number of the encoded property list */
     vers = (uint8_t)*p++;
     if ((uint8_t)H5P_ENCODE_VERS != vers)
         HGOTO_ERROR(H5E_PLIST, H5E_VERSION, FAIL, "bad version # of encoded information, expected %u, got %u",
-                    (unsigned)H5P_ENCODE_VERS, (unsigned)vers)
+                    (unsigned)H5P_ENCODE_VERS, (unsigned)vers);
 
     /* Get the type of the property list */
     type = (H5P_plist_type_t)*p++;
     if (type <= H5P_TYPE_USER || type >= H5P_TYPE_MAX_TYPE)
-        HGOTO_ERROR(H5E_PLIST, H5E_BADRANGE, FAIL, "bad type of encoded information: %u", (unsigned)type)
+        HGOTO_ERROR(H5E_PLIST, H5E_BADRANGE, FAIL, "bad type of encoded information: %u", (unsigned)type);
 
     /* Create new property list of the specified type */
     if ((plist_id = H5P__new_plist_of_type(type)) < 0)
@@ -670,7 +670,7 @@ H5P__decode(const void *buf)
 
     /* Get the property list object */
     if (NULL == (plist = (H5P_genplist_t *)H5I_object(plist_id)))
-        HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a property class")
+        HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a property class");
 
     /* Loop over encoded properties, deserializing their values */
     while (p) {
@@ -687,12 +687,12 @@ H5P__decode(const void *buf)
 
         /* Find property with name */
         if (NULL == (prop = H5P__find_prop_plist(plist, name)))
-            HGOTO_ERROR(H5E_PLIST, H5E_NOTFOUND, FAIL, "property doesn't exist: '%s'", name)
+            HGOTO_ERROR(H5E_PLIST, H5E_NOTFOUND, FAIL, "property doesn't exist: '%s'", name);
 
         /* Check if we should increase the size of the value buffer */
         if (prop->size > value_buf_size) {
             if (NULL == (value_buf = H5MM_realloc(value_buf, prop->size)))
-                HGOTO_ERROR(H5E_PLIST, H5E_CANTALLOC, FAIL, "decoding buffer allocation failed")
+                HGOTO_ERROR(H5E_PLIST, H5E_CANTALLOC, FAIL, "decoding buffer allocation failed");
             value_buf_size = prop->size;
         } /* end if */
 
@@ -700,14 +700,14 @@ H5P__decode(const void *buf)
         if (prop->decode) {
             if ((prop->decode)((const void **)&p, value_buf) < 0)
                 HGOTO_ERROR(H5E_PLIST, H5E_CANTDECODE, FAIL,
-                            "property decoding routine failed, property: '%s'", name)
+                            "property decoding routine failed, property: '%s'", name);
         } /* end if */
         else
-            HGOTO_ERROR(H5E_PLIST, H5E_NOTFOUND, FAIL, "no decode callback for property: '%s'", name)
+            HGOTO_ERROR(H5E_PLIST, H5E_NOTFOUND, FAIL, "no decode callback for property: '%s'", name);
 
         /* Set the value for the property */
         if (H5P_poke(plist, name, value_buf) < 0)
-            HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "unable to set value for property: '%s'", name)
+            HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "unable to set value for property: '%s'", name);
     } /* end while */
 
     /* Set return value */