Made HGOTO_ERROR a do-while loop (#3308)

* Made HGOTO_ERROR a do-while loop

1 files changed, 20 insertions, 20 deletions

diff --git a/src/H5Fio.c b/src/H5Fio.c
index 09d57e8..1b329b6 100644
--- a/src/H5Fio.c
+++ b/src/H5Fio.c
@@ -89,14 +89,14 @@ H5F_shared_block_read(H5F_shared_t *f_sh, H5FD_mem_t type, haddr_t addr, size_t
 
     /* Check for attempting I/O on 'temporary' file address */
     if (H5_addr_le(f_sh->tmp_addr, (addr + size)))
-        HGOTO_ERROR(H5E_IO, H5E_BADRANGE, FAIL, "attempting I/O in temporary file space")
+        HGOTO_ERROR(H5E_IO, H5E_BADRANGE, FAIL, "attempting I/O in temporary file space");
 
     /* Treat global heap as raw data */
     map_type = (type == H5FD_MEM_GHEAP) ? H5FD_MEM_DRAW : type;
 
     /* Pass through page buffer layer */
     if (H5PB_read(f_sh, map_type, addr, size, buf) < 0)
-        HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "read through page buffer failed")
+        HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "read through page buffer failed");
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -129,14 +129,14 @@ H5F_block_read(H5F_t *f, H5FD_mem_t type, haddr_t addr, size_t size, void *buf /
 
     /* Check for attempting I/O on 'temporary' file address */
     if (H5_addr_le(f->shared->tmp_addr, (addr + size)))
-        HGOTO_ERROR(H5E_IO, H5E_BADRANGE, FAIL, "attempting I/O in temporary file space")
+        HGOTO_ERROR(H5E_IO, H5E_BADRANGE, FAIL, "attempting I/O in temporary file space");
 
     /* Treat global heap as raw data */
     map_type = (type == H5FD_MEM_GHEAP) ? H5FD_MEM_DRAW : type;
 
     /* Pass through page buffer layer */
     if (H5PB_read(f->shared, map_type, addr, size, buf) < 0)
-        HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "read through page buffer failed")
+        HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "read through page buffer failed");
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -169,14 +169,14 @@ H5F_shared_block_write(H5F_shared_t *f_sh, H5FD_mem_t type, haddr_t addr, size_t
 
     /* Check for attempting I/O on 'temporary' file address */
     if (H5_addr_le(f_sh->tmp_addr, (addr + size)))
-        HGOTO_ERROR(H5E_IO, H5E_BADRANGE, FAIL, "attempting I/O in temporary file space")
+        HGOTO_ERROR(H5E_IO, H5E_BADRANGE, FAIL, "attempting I/O in temporary file space");
 
     /* Treat global heap as raw data */
     map_type = (type == H5FD_MEM_GHEAP) ? H5FD_MEM_DRAW : type;
 
     /* Pass through page buffer layer */
     if (H5PB_write(f_sh, map_type, addr, size, buf) < 0)
-        HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "write through page buffer failed")
+        HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "write through page buffer failed");
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -210,14 +210,14 @@ H5F_block_write(H5F_t *f, H5FD_mem_t type, haddr_t addr, size_t size, const void
 
     /* Check for attempting I/O on 'temporary' file address */
     if (H5_addr_le(f->shared->tmp_addr, (addr + size)))
-        HGOTO_ERROR(H5E_IO, H5E_BADRANGE, FAIL, "attempting I/O in temporary file space")
+        HGOTO_ERROR(H5E_IO, H5E_BADRANGE, FAIL, "attempting I/O in temporary file space");
 
     /* Treat global heap as raw data */
     map_type = (type == H5FD_MEM_GHEAP) ? H5FD_MEM_DRAW : type;
 
     /* Pass through page buffer layer */
     if (H5PB_write(f->shared, map_type, addr, size, buf) < 0)
-        HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "write through page buffer failed")
+        HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "write through page buffer failed");
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_block_write() */
@@ -258,7 +258,7 @@ H5F_shared_select_read(H5F_shared_t *f_sh, H5FD_mem_t type, uint32_t count, H5S_
     /* Pass down to file driver layer (bypass page buffer for now) */
     if (H5FD_read_selection(f_sh->lf, map_type, count, mem_spaces, file_spaces, offsets, element_sizes,
                             bufs) < 0)
-        HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "selection read through file driver failed")
+        HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "selection read through file driver failed");
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -300,7 +300,7 @@ H5F_shared_select_write(H5F_shared_t *f_sh, H5FD_mem_t type, uint32_t count, H5S
     /* Pass down to file driver layer (bypass page buffer for now) */
     if (H5FD_write_selection(f_sh->lf, map_type, count, mem_spaces, file_spaces, offsets, element_sizes,
                              bufs) < 0)
-        HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "selection write through file driver failed")
+        HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "selection write through file driver failed");
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -342,7 +342,7 @@ H5F_shared_vector_read(H5F_shared_t *f_sh, uint32_t count, H5FD_mem_t types[], h
 
     /* Pass down to file driver layer (bypass page buffer for now) */
     if (H5FD_read_vector(f_sh->lf, count, types, addrs, sizes, bufs) < 0)
-        HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "vector read through file driver failed")
+        HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "vector read through file driver failed");
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -395,7 +395,7 @@ H5F_shared_vector_write(H5F_shared_t *f_sh, uint32_t count, H5FD_mem_t types[],
 
     /* Pass down to file driver layer (bypass page buffer for now) */
     if (H5FD_write_vector(f_sh->lf, count, types, addrs, sizes, bufs) < 0)
-        HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "vector write through file driver failed")
+        HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "vector write through file driver failed");
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -420,15 +420,15 @@ H5F_flush_tagged_metadata(H5F_t *f, haddr_t tag)
 
     /* Use tag to search for and flush associated metadata */
     if (H5AC_flush_tagged_metadata(f, tag) < 0)
-        HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "unable to flush tagged metadata")
+        HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "unable to flush tagged metadata");
 
     /* Flush and reset the accumulator */
     if (H5F__accum_reset(f->shared, TRUE) < 0)
-        HGOTO_ERROR(H5E_IO, H5E_CANTRESET, FAIL, "can't reset accumulator")
+        HGOTO_ERROR(H5E_IO, H5E_CANTRESET, FAIL, "can't reset accumulator");
 
     /* Flush file buffers to disk. */
     if (H5FD_flush(f->shared->lf, FALSE) < 0)
-        HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "low level flush failed")
+        HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "low level flush failed");
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -455,7 +455,7 @@ H5F__evict_cache_entries(H5F_t *f)
 
     /* Evict all except pinned entries in the cache */
     if (H5AC_evict(f) < 0)
-        HGOTO_ERROR(H5E_CACHE, H5E_CANTEXPUNGE, FAIL, "unable to evict all except pinned entries")
+        HGOTO_ERROR(H5E_CACHE, H5E_CANTEXPUNGE, FAIL, "unable to evict all except pinned entries");
 
 #ifndef NDEBUG
     {
@@ -464,19 +464,19 @@ H5F__evict_cache_entries(H5F_t *f)
 
         /* Retrieve status of the superblock */
         if (H5AC_get_entry_status(f, (haddr_t)0, &status) < 0)
-            HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "unable to get entry status")
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "unable to get entry status");
 
         /* Verify status of the superblock entry in the cache */
         if (!(status & H5AC_ES__IN_CACHE) || !(status & H5AC_ES__IS_PINNED))
-            HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "unable to get entry status")
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "unable to get entry status");
 
         /* Get the number of cache entries */
         if (H5AC_get_cache_size(f->shared->cache, NULL, NULL, NULL, &cur_num_entries) < 0)
-            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5AC_get_cache_size() failed.")
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5AC_get_cache_size() failed.");
 
         /* Should be the only one left in the cache (the superblock) */
         if (cur_num_entries != 1)
-            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "number of cache entries is not correct")
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "number of cache entries is not correct");
     }
 #endif /* NDEBUG */