Fixed clang-tidy readability-redundant-control-flow warnings (#428)

* Fixed clang-tidy readability-redundant-control-flow warnings

Just removed useless trailing return statements.

* Removed blank lines from h5diffgentest.c with clang-format v10.0.1.

Co-authored-by: Larry Knox <lrknox@hdfgroup.org>

1 files changed, 0 insertions, 60 deletions

diff --git a/test/cache_common.c b/test/cache_common.c
index 0d6136e..54b1cc5 100644
--- a/test/cache_common.c
+++ b/test/cache_common.c
@@ -434,8 +434,6 @@ addr_to_type_and_index(haddr_t addr, int32_t *type_ptr, int32_t *index_ptr)
     *type_ptr  = type;
     *index_ptr = idx;
 
-    return;
-
 } /* addr_to_type_and_index() */
 
 /* Call back functions: */
@@ -1515,8 +1513,6 @@ add_flush_op(int target_type, int target_idx, int op_code, int type, int idx, hb
         (target_entry_ptr->flush_ops)[i].order_ptr = order_ptr;
     }
 
-    return;
-
 } /* add_flush_op() */
 
 /*-------------------------------------------------------------------------
@@ -1586,8 +1582,6 @@ create_pinned_entry_dependency(H5F_t *file_ptr, int pinning_type, int pinning_id
         (pinned_entry_ptr->pinning_ref_count)++;
     }
 
-    return;
-
 } /* create_pinned_entry_dependency() */
 
 /*-------------------------------------------------------------------------
@@ -1660,8 +1654,6 @@ dirty_entry(H5F_t *file_ptr, int32_t type, int32_t idx, hbool_t dirty_pin)
         }
     }
 
-    return;
-
 } /* dirty_entry() */
 
 /*-------------------------------------------------------------------------
@@ -1805,8 +1797,6 @@ execute_flush_op(H5F_t *file_ptr, struct test_entry_t *entry_ptr, struct flush_o
         }
     }
 
-    return;
-
 } /* execute_flush_op() */
 
 /*-------------------------------------------------------------------------
@@ -2032,8 +2022,6 @@ free_entry_arrays(void)
     HDfree(notify_entries);
     HDfree(orig_notify_entries);
 
-    return;
-
 } /* free_entry_arrays() */
 
 /*-------------------------------------------------------------------------
@@ -2177,8 +2165,6 @@ reset_entries(void)
         } /* end for */
     }     /* end else */
 
-    return;
-
 } /* reset_entries() */
 
 /*-------------------------------------------------------------------------
@@ -2270,8 +2256,6 @@ resize_entry(H5F_t *file_ptr, int32_t type, int32_t idx, size_t new_size, hbool_
         }
     }
 
-    return;
-
 } /* resize_entry() */
 
 /*-------------------------------------------------------------------------
@@ -2323,8 +2307,6 @@ verify_clean(void)
         }
     }
 
-    return;
-
 } /* verify_clean() */
 
 /*-------------------------------------------------------------------------
@@ -2621,8 +2603,6 @@ verify_entry_status(H5C_t *cache_ptr, int tag, int num_entries, struct expected_
         i++;
     } /* while */
 
-    return;
-
 } /* verify_entry_status() */
 
 /*-------------------------------------------------------------------------
@@ -2676,8 +2656,6 @@ verify_unprotected(void)
         }
     }
 
-    return;
-
 } /* verify_unprotected() */
 
 /*-------------------------------------------------------------------------
@@ -2741,8 +2719,6 @@ expunge_entry(H5F_t *file_ptr, int32_t type, int32_t idx)
         }
     }
 
-    return;
-
 } /* expunge_entry() */
 
 /*-------------------------------------------------------------------------
@@ -2816,8 +2792,6 @@ flush_cache(H5F_t *file_ptr, hbool_t destroy_entries, hbool_t dump_stats, hbool_
         }
     }
 
-    return;
-
 } /* flush_cache() */
 
 /*-------------------------------------------------------------------------
@@ -2985,8 +2959,6 @@ insert_entry(H5F_t *file_ptr, int32_t type, int32_t idx, unsigned int flags)
         HDassert(((entry_ptr->header).type)->id == type);
     } /* end if */
 
-    return;
-
 } /* insert_entry() */
 
 /*-------------------------------------------------------------------------
@@ -3046,8 +3018,6 @@ mark_entry_dirty(int32_t type, int32_t idx)
         HDassert(((entry_ptr->header).type)->id == type);
     }
 
-    return;
-
 } /* mark_entry_dirty() */
 
 /*-------------------------------------------------------------------------
@@ -3146,8 +3116,6 @@ move_entry(H5C_t *cache_ptr, int32_t type, int32_t idx, hbool_t main_addr)
         HDassert(entry_ptr->is_dirty);
     }
 
-    return;
-
 } /* move_entry() */
 
 /*-------------------------------------------------------------------------
@@ -3314,8 +3282,6 @@ protect_entry_ro(H5F_t *file_ptr, int32_t type, int32_t idx)
         HDassert(((entry_ptr->header).type)->id == type);
     }
 
-    return;
-
 } /* protect_entry_ro() */
 
 /*-------------------------------------------------------------------------
@@ -3372,8 +3338,6 @@ pin_entry(int32_t type, int32_t idx)
         }
     } /* end if */
 
-    return;
-
 } /* pin_entry() */
 
 /*-------------------------------------------------------------------------
@@ -3431,8 +3395,6 @@ unpin_entry(int32_t type, int32_t idx)
         HDassert(((entry_ptr->header).type)->id == type);
     }
 
-    return;
-
 } /* unpin_entry() */
 
 /*-------------------------------------------------------------------------
@@ -3542,8 +3504,6 @@ unprotect_entry(H5F_t *file_ptr, int32_t type, int32_t idx, unsigned int flags)
         HDassert(entry_ptr->header.ro_ref_count == entry_ptr->ro_ref_count);
     }
 
-    return;
-
 } /* unprotect_entry() */
 
 /*-------------------------------------------------------------------------
@@ -3972,8 +3932,6 @@ hl_row_major_scan_forward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, h
         H5C_stats(cache_ptr, "test cache", display_detailed_stats);
     }
 
-    return;
-
 } /* hl_row_major_scan_forward() */
 
 /*-------------------------------------------------------------------------
@@ -4234,8 +4192,6 @@ row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
         H5C_stats(cache_ptr, "test cache", display_detailed_stats);
     }
 
-    return;
-
 } /* row_major_scan_backward() */
 
 /*-------------------------------------------------------------------------
@@ -4328,8 +4284,6 @@ hl_row_major_scan_backward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose,
         H5C_stats(cache_ptr, "test cache", display_detailed_stats);
     }
 
-    return;
-
 } /* hl_row_major_scan_backward() */
 
 /*-------------------------------------------------------------------------
@@ -4422,8 +4376,6 @@ col_major_scan_forward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
         H5C_stats(cache_ptr, "test cache", display_detailed_stats);
     }
 
-    return;
-
 } /* col_major_scan_forward() */
 
 /*-------------------------------------------------------------------------
@@ -4527,8 +4479,6 @@ hl_col_major_scan_forward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose, h
         H5C_stats(cache_ptr, "test cache", display_detailed_stats);
     }
 
-    return;
-
 } /* hl_col_major_scan_forward() */
 
 /*-------------------------------------------------------------------------
@@ -4633,8 +4583,6 @@ col_major_scan_backward(H5F_t *file_ptr, int32_t max_index, int32_t lag, hbool_t
     if (verbose)
         HDfprintf(stdout, "%s: exiting.\n", FUNC);
 
-    return;
-
 } /* col_major_scan_backward() */
 
 /*-------------------------------------------------------------------------
@@ -4738,8 +4686,6 @@ hl_col_major_scan_backward(H5F_t *file_ptr, int32_t max_index, hbool_t verbose,
         H5C_stats(cache_ptr, "test cache", display_detailed_stats);
     }
 
-    return;
-
 } /* hl_col_major_scan_backward() */
 
 /*-------------------------------------------------------------------------
@@ -5108,8 +5054,6 @@ check_and_validate_cache_hit_rate(hid_t file_id, double *hit_rate_ptr, hbool_t d
         failure_mssg = "Unexpectedly low hit rate.";
     }
 
-    return;
-
 } /* check_and_validate_cache_hit_rate() */
 
 /*-------------------------------------------------------------------------
@@ -5227,8 +5171,6 @@ check_and_validate_cache_size(hid_t file_id, size_t *max_size_ptr, size_t *min_c
                   (long)min_clean_size, (long)cur_size, (long)cur_num_entries);
     }
 
-    return;
-
 } /* check_and_validate_cache_size() */
 
 H5_ATTR_PURE hbool_t
@@ -5389,8 +5331,6 @@ validate_mdc_config(hid_t file_id, H5AC_cache_config_t *ext_config_ptr, hbool_t
         }
     }
 
-    return;
-
 } /* validate_mdc_config() */
 
 #if 0 /* debugging functions -- normally commented out */