Skip to content

Commit

Permalink
Fixed clang-tidy readability-redundant-control-flow warnings (#428)
Browse files Browse the repository at this point in the history
* 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 <[email protected]>
  • Loading branch information
seanm and lrknox authored Mar 5, 2021
1 parent f4e8779 commit 6794428
Show file tree
Hide file tree
Showing 17 changed files with 0 additions and 170 deletions.
3 changes: 0 additions & 3 deletions src/H5.c
Original file line number Diff line number Diff line change
Expand Up @@ -807,9 +807,6 @@ H5__debug_mask(const char *s)
s++;
} /* end if-else */
} /* end while */

return;

} /* end H5__debug_mask() */

#ifdef H5_HAVE_PARALLEL
Expand Down
3 changes: 0 additions & 3 deletions src/H5C.c
Original file line number Diff line number Diff line change
Expand Up @@ -689,9 +689,6 @@ H5C_def_auto_resize_rpt_fcn(H5C_t *cache_ptr,
HDfprintf(stdout, "%sAuto cache resize -- unknown status code.\n", cache_ptr->prefix);
break;
}

return;

} /* H5C_def_auto_resize_rpt_fcn() */

/*-------------------------------------------------------------------------
Expand Down
2 changes: 0 additions & 2 deletions src/H5Cdbg.c
Original file line number Diff line number Diff line change
Expand Up @@ -832,8 +832,6 @@ H5C_stats__reset(H5C_t H5_ATTR_UNUSED *cache_ptr)

#endif /* H5C_COLLECT_CACHE_ENTRY_STATS */
#endif /* H5C_COLLECT_CACHE_STATS */

return;
} /* H5C_stats__reset() */

/*-------------------------------------------------------------------------
Expand Down
34 changes: 0 additions & 34 deletions test/cache.c
Original file line number Diff line number Diff line change
Expand Up @@ -3210,8 +3210,6 @@ check_flush_cache__empty_cache(H5F_t *file_ptr)
"flush with flags = 0x10 failed on empty cache.\n")
}

return;

} /* check_flush_cache__empty_cache() */

/*-------------------------------------------------------------------------
Expand Down Expand Up @@ -4413,8 +4411,6 @@ check_flush_cache__multi_entry(H5F_t *file_ptr)
check_flush_cache__pe_multi_entry_test(file_ptr, test_num, flush_flags, spec_size, spec);
}

return;

} /* check_flush_cache__multi_entry() */

/*-------------------------------------------------------------------------
Expand Down Expand Up @@ -4599,8 +4595,6 @@ check_flush_cache__multi_entry_test(H5F_t *file_ptr, int test_num, unsigned int
u++;
}

return;

} /* check_flush_cache__multi_entry_test() */

/*-------------------------------------------------------------------------
Expand Down Expand Up @@ -4794,8 +4788,6 @@ check_flush_cache__pe_multi_entry_test(H5F_t *file_ptr, int test_num, unsigned i
u++;
}

return;

} /* check_flush_cache__pe_multi_entry_test() */

/*-------------------------------------------------------------------------
Expand Down Expand Up @@ -7991,8 +7983,6 @@ check_flush_cache__flush_ops(H5F_t *file_ptr)
/* finally finish up with the flush ops eviction test */
check_flush_cache__flush_op_eviction_test(file_ptr);

return;

} /* check_flush_cache__flush_ops() */

/*-------------------------------------------------------------------------
Expand Down Expand Up @@ -8394,8 +8384,6 @@ check_flush_cache__flush_op_test(H5F_t *file_ptr, int test_num, unsigned int flu
i++;
}

return;

} /* check_flush_cache__flush_op_test() */

/*-------------------------------------------------------------------------
Expand Down Expand Up @@ -10546,8 +10534,6 @@ check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr)
reset_entries();
}

return;

} /* check_flush_cache__flush_op_eviction_test() */

/*-------------------------------------------------------------------------
Expand Down Expand Up @@ -12171,8 +12157,6 @@ check_flush_cache__single_entry(H5F_t *file_ptr)
}
}

return;

} /* check_flush_cache__single_entry() */

/*-------------------------------------------------------------------------
Expand Down Expand Up @@ -12312,8 +12296,6 @@ check_flush_cache__single_entry_test(H5F_t *file_ptr, int test_num, int entry_ty
}
}

return;

} /* check_flush_cache__single_entry_test() */

/*-------------------------------------------------------------------------
Expand Down Expand Up @@ -12489,8 +12471,6 @@ check_flush_cache__pinned_single_entry_test(H5F_t *file_ptr, int test_num, int e
}
}

return;

} /* check_flush_cache__pinned_single_entry_test() */

/*-------------------------------------------------------------------------
Expand Down Expand Up @@ -13639,8 +13619,6 @@ check_move_entry__run_test(H5F_t *file_ptr, unsigned test_num, struct move_entry
/* put the entry back where it started from */
move_entry(cache_ptr, spec_ptr->entry_type, spec_ptr->entry_index, TRUE);

return;

} /* check_move_entry__run_test() */

/*-------------------------------------------------------------------------
Expand Down Expand Up @@ -33880,8 +33858,6 @@ cedds__expunge_dirty_entry_in_flush_test(H5F_t *file_ptr)
/* reset cache min clean size to its expected value */
cache_ptr->min_clean_size = (1 * 1024 * 1024);

return;

} /* cedds__expunge_dirty_entry_in_flush_test() */

/*-------------------------------------------------------------------------
Expand Down Expand Up @@ -34240,8 +34216,6 @@ cedds__H5C_make_space_in_cache(H5F_t *file_ptr)
/* reset cache min clean size to its expected value */
cache_ptr->min_clean_size = (1 * 1024 * 1024);

return;

} /* cedds__H5C_make_space_in_cache() */

/*-------------------------------------------------------------------------
Expand Down Expand Up @@ -34638,8 +34612,6 @@ cedds__H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t *file_ptr)
/* reset cache min clean size to its expected value */
cache_ptr->min_clean_size = (1 * 1024 * 1024);

return;

} /* cedds__H5C__autoadjust__ageout__evict_aged_out_entries() */

/*-------------------------------------------------------------------------
Expand Down Expand Up @@ -35016,8 +34988,6 @@ cedds__H5C_flush_invalidate_cache__bucket_scan(H5F_t *file_ptr)
/* reset cache min clean size to its expected value */
cache_ptr->min_clean_size = (1 * 1024 * 1024);

return;

} /* cedds__H5C_flush_invalidate_cache__bucket_scan() */

/*-------------------------------------------------------------------------
Expand Down Expand Up @@ -35480,8 +35450,6 @@ check_stats__smoke_check_1(H5F_t *file_ptr)
/* reset cache min clean size to its expected value */
cache_ptr->min_clean_size = (1 * 1024 * 1024);

return;

} /* check_stats__smoke_check_1() */

#endif /* H5C_COLLECT_CACHE_STATS */
Expand Down Expand Up @@ -35889,8 +35857,6 @@ takedown_cache(H5F_t *file_ptr, hbool_t dump_stats, hbool_t dump_detailed_stats)
}
}

return;

} /* takedown_cache() */

/*-------------------------------------------------------------------------
Expand Down
Loading

0 comments on commit 6794428

Please sign in to comment.