From a6e8f34b7b0a8d7a37abc41f9cc7588b7f98cd3f Mon Sep 17 00:00:00 2001 From: kmu Date: Fri, 6 Dec 2019 12:03:19 -0600 Subject: remove unsed var,function,macro, etc --- src/H5Dchunk.c | 4 ++-- src/H5FDhdfs.c | 3 --- test/cache_image.c | 2 +- test/page_buffer.c | 33 +++++++++++++++++++++++++-------- test/tmisc.c | 7 ++----- testpar/t_bigio.c | 1 - testpar/t_cache.c | 3 ++- testpar/t_coll_chunk.c | 1 - testpar/t_coll_md_read.c | 1 - testpar/t_dset.c | 8 ++++---- testpar/t_filter_read.c | 1 - testpar/t_span_tree.c | 4 +++- tools/lib/h5tools_utils.c | 6 +++--- tools/src/h5diff/ph5diff_main.c | 2 +- tools/src/h5repack/h5repack_main.c | 2 +- tools/test/h5repack/h5repackgentest.c | 1 - tools/test/perform/perf.c | 8 ++------ tools/test/perform/pio_engine.c | 9 --------- 18 files changed, 46 insertions(+), 50 deletions(-) diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c index f90a81b..5608b17 100644 --- a/src/H5Dchunk.c +++ b/src/H5Dchunk.c @@ -2132,7 +2132,7 @@ H5D__create_chunk_mem_map_1d(const H5D_chunk_map_t *fm) { H5D_chunk_info_t *chunk_info; /* Pointer to chunk information */ H5SL_node_t *curr_node; /* Current node in skip list */ - herr_t ret_value = SUCCEED; /* Return value */ + herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_STATIC @@ -5701,7 +5701,7 @@ H5D__chunk_addrmap_cb(const H5D_chunk_rec_t *chunk_rec, void *_udata) /* Set it in the userdata to return */ udata->chunk_addr[chunk_index] = chunk_rec->chunk_addr; - FUNC_LEAVE_NOAPI(H5_ITER_CONT) + FUNC_LEAVE_NOAPI(ret_value) } /* H5D__chunk_addrmap_cb() */ diff --git a/src/H5FDhdfs.c b/src/H5FDhdfs.c index 3d086ea..e793151 100644 --- a/src/H5FDhdfs.c +++ b/src/H5FDhdfs.c @@ -577,9 +577,6 @@ hid_t H5FD_hdfs_init(void) { hid_t ret_value = H5I_INVALID_HID; /* Return value */ -#if HDFS_STATS - unsigned int bin_i; -#endif FUNC_ENTER_NOAPI(FAIL) diff --git a/test/cache_image.c b/test/cache_image.c index d4002c7..12f8171 100644 --- a/test/cache_image.c +++ b/test/cache_image.c @@ -7838,7 +7838,7 @@ get_free_sections_test(hbool_t single_file_vfd) *------------------------------------------------------------------------- */ static unsigned -evict_on_close_test(hbool_t single_file_vfd) +evict_on_close_test(hbool_t H5_ATTR_UNUSED single_file_vfd) { #ifndef H5_HAVE_PARALLEL const char * fcn_name = "evict_on_close_test()"; diff --git a/test/page_buffer.c b/test/page_buffer.c index 2baf6dc..fb22563 100644 --- a/test/page_buffer.c +++ b/test/page_buffer.c @@ -46,19 +46,22 @@ #define NY 50 /* helper routines */ +#ifndef H5_HAVE_PARALLEL static unsigned create_file(char *filename, hid_t fcpl, hid_t fapl); static unsigned open_file(char *filename, hid_t fapl, hsize_t page_size, size_t page_buffer_size); +#endif /* H5_HAVE_PARALLEL */ /* test routines */ +#ifdef H5_HAVE_PARALLEL +static unsigned verify_page_buffering_disabled(hid_t orig_fapl, + const char *env_h5_drvr); +#else static unsigned test_args(hid_t fapl, const char *env_h5_drvr); static unsigned test_raw_data_handling(hid_t orig_fapl, const char *env_h5_drvr, bool); static unsigned test_lru_processing(hid_t orig_fapl, const char *env_h5_drvr); static unsigned test_min_threshold(hid_t orig_fapl, const char *env_h5_drvr); static unsigned test_stats_collection(hid_t orig_fapl, const char *env_h5_drvr); -#ifdef H5_HAVE_PARALLEL -static unsigned verify_page_buffering_disabled(hid_t orig_fapl, - const char *env_h5_drvr); #endif /* H5_HAVE_PARALLEL */ #define FILENAME "filepaged" @@ -508,6 +511,8 @@ error: * *------------------------------------------------------------------------- */ + +#ifndef H5_HAVE_PARALLEL static unsigned test_args(hid_t orig_fapl, const char *env_h5_drvr) { @@ -661,7 +666,8 @@ error: H5Pclose(fcpl); } H5E_END_TRY; return 1; -} +} /* test_args */ +#endif /* @@ -1170,6 +1176,9 @@ error: * * JRM -- 10/26/18 */ + +/* Changes due to file space page size has a minimum size of 512 */ +#ifndef H5_HAVE_PARALLEL static unsigned test_raw_data_handling(hid_t orig_fapl, const char *env_h5_drvr, bool vfd_swmr_mode) @@ -1434,7 +1443,8 @@ error: HDfree(data); } H5E_END_TRY; return 1; -} +} /* test_raw_data_handling */ +#endif /*------------------------------------------------------------------------- @@ -1462,6 +1472,7 @@ error: *------------------------------------------------------------------------- */ +#ifndef H5_HAVE_PARALLEL static unsigned test_lru_processing(hid_t orig_fapl, const char *env_h5_drvr) { @@ -1697,7 +1708,8 @@ error: HDfree(data); } H5E_END_TRY; return 1; -} +} /* test_lru_processing */ +#endif /*------------------------------------------------------------------------- @@ -1739,6 +1751,7 @@ error: *------------------------------------------------------------------------- */ +#ifndef H5_HAVE_PARALLEL static unsigned test_min_threshold(hid_t orig_fapl, const char *env_h5_drvr) { @@ -2430,7 +2443,9 @@ error: HDfree(data); } H5E_END_TRY; return 1; -} + +} /* test_min_threshold */ +#endif /*------------------------------------------------------------------------- @@ -2467,6 +2482,7 @@ error: * *------------------------------------------------------------------------- */ +#ifndef H5_HAVE_PARALLEL static unsigned test_stats_collection(hid_t orig_fapl, const char *env_h5_drvr) { @@ -2824,7 +2840,8 @@ error: } H5E_END_TRY; return 1; -} +} /* test_stats_collection */ +#endif /*------------------------------------------------------------------------- diff --git a/test/tmisc.c b/test/tmisc.c index 7b7f5ba..34d20bf 100644 --- a/test/tmisc.c +++ b/test/tmisc.c @@ -128,15 +128,12 @@ typedef struct /* Definitions for misc. test #8 */ #define MISC8_FILE "tmisc8.h5" #define MISC8_DSETNAME1 "Dataset1" -#define MISC8_DSETNAME2 "Dataset2" -#define MISC8_DSETNAME3 "Dataset3" #define MISC8_DSETNAME4 "Dataset4" #define MISC8_DSETNAME5 "Dataset5" -#define MISC8_DSETNAME6 "Dataset6" +#ifndef H5_HAVE_PARALLEL #define MISC8_DSETNAME7 "Dataset7" +#endif #define MISC8_DSETNAME8 "Dataset8" -#define MISC8_DSETNAME9 "Dataset9" -#define MISC8_DSETNAME10 "Dataset10" #define MISC8_RANK 2 #define MISC8_DIM0 50 #define MISC8_DIM1 50 diff --git a/testpar/t_bigio.c b/testpar/t_bigio.c index 12c1023..b681a2a 100644 --- a/testpar/t_bigio.c +++ b/testpar/t_bigio.c @@ -27,7 +27,6 @@ const char *FILENAME[3]={ "bigio_test.h5", #define DATASET2 "DSET2" #define DATASET3 "DSET3" #define DATASET4 "DSET4" -#define DATASET5 "DSET5" #define DXFER_COLLECTIVE_IO 0x1 /* Collective IO*/ #define DXFER_INDEPENDENT_IO 0x2 /* Independent IO collectively */ #define DXFER_BIGCOUNT (1 < 29) diff --git a/testpar/t_cache.c b/testpar/t_cache.c index ebb8e33..cbbb18e 100644 --- a/testpar/t_cache.c +++ b/testpar/t_cache.c @@ -38,7 +38,6 @@ int failures = 0; hbool_t verbose = TRUE; /* used to control error messages */ #define NFILENAME 2 -#define PARATESTFILE filenames[0] const char *FILENAME[NFILENAME]={"CacheTestDummy", NULL}; #ifndef PATH_MAX #define PATH_MAX 512 @@ -219,7 +218,9 @@ struct datum data[NUM_DATA_ENTRIES]; #define STD_VIRT_NUM_DATA_ENTRIES NUM_DATA_ENTRIES #define EXPRESS_VIRT_NUM_DATA_ENTRIES (NUM_DATA_ENTRIES / 10) /* Use a smaller test size to avoid creating huge MPE logfiles. */ +#ifdef H5_HAVE_MPE #define MPE_VIRT_NUM_DATA_ENTIES (NUM_DATA_ENTRIES / 100) +#endif int virt_num_data_entries = NUM_DATA_ENTRIES; diff --git a/testpar/t_coll_chunk.c b/testpar/t_coll_chunk.c index 40cc1ca..2d758ba 100644 --- a/testpar/t_coll_chunk.c +++ b/testpar/t_coll_chunk.c @@ -620,7 +620,6 @@ coll_chunktest(const char* filename, size_t num_points; /* for point selection */ hsize_t *coords = NULL; /* for point selection */ hsize_t current_dims; /* for point selection */ - int i; /* set up MPI parameters */ MPI_Comm_size(comm,&mpi_size); diff --git a/testpar/t_coll_md_read.c b/testpar/t_coll_md_read.c index 912388c..c0fe04b 100644 --- a/testpar/t_coll_md_read.c +++ b/testpar/t_coll_md_read.c @@ -34,7 +34,6 @@ #define MULTI_CHUNK_IO_ADDRMAP_ISSUE_DIMS 2 -#define LINK_CHUNK_IO_SORT_CHUNK_ISSUE_NO_SEL_PROCESS (mpi_rank == mpi_size - 1) #define LINK_CHUNK_IO_SORT_CHUNK_ISSUE_DATASET_NAME "linked_chunk_io_sort_chunk_issue" #define LINK_CHUNK_IO_SORT_CHUNK_ISSUE_Y_DIM_SCALE 20000 #define LINK_CHUNK_IO_SORT_CHUNK_ISSUE_CHUNK_SIZE 1 diff --git a/testpar/t_dset.c b/testpar/t_dset.c index 832a47f..87782d0 100644 --- a/testpar/t_dset.c +++ b/testpar/t_dset.c @@ -567,7 +567,6 @@ dataset_writeAll(void) size_t num_points; /* for point selection */ hsize_t *coords = NULL; /* for point selection */ hsize_t current_dims; /* for point selection */ - int i; herr_t ret; /* Generic return value */ int mpi_size, mpi_rank; @@ -1098,7 +1097,6 @@ dataset_readAll(void) size_t num_points; /* for point selection */ hsize_t *coords = NULL; /* for point selection */ - hsize_t current_dims; /* for point selection */ int i,j,k; herr_t ret; /* Generic return value */ @@ -3470,8 +3468,9 @@ actual_io_mode_tests(void) { * Programmer: Jonathan Kim * Date: Aug, 2012 */ +#ifdef LATER #define DSET_NOCOLCAUSE "nocolcause" -#define NELM 2 +#endif #define FILE_EXTERNAL "nocolcause_extern.data" static void test_no_collective_cause_mode(int selection_mode) @@ -3482,7 +3481,6 @@ test_no_collective_cause_mode(int selection_mode) uint32_t no_collective_cause_global_write = 0; uint32_t no_collective_cause_global_read = 0; uint32_t no_collective_cause_global_expected = 0; - hsize_t coord[NELM][RANK]; const char * filename; const char * test_name; @@ -3797,6 +3795,7 @@ test_no_collective_cause_mode(int selection_mode) * Programmer: Jonathan Kim * Date: Aug, 2012 */ +#ifdef LATER static void test_no_collective_cause_mode_filter(int selection_mode) { @@ -4008,6 +4007,7 @@ test_no_collective_cause_mode_filter(int selection_mode) HDfree(buffer); return; } +#endif /* Function: no_collective_cause_tests * diff --git a/testpar/t_filter_read.c b/testpar/t_filter_read.c index 28baed5..15aec2d 100644 --- a/testpar/t_filter_read.c +++ b/testpar/t_filter_read.c @@ -215,7 +215,6 @@ test_filter_read(void) unsigned disable_partial_chunk_filters; /* Whether filters are disabled on partial chunks */ herr_t hrc; const char *filename; - hsize_t fletcher32_size; /* Size of dataset with Fletcher32 checksum */ #ifdef H5_HAVE_FILTER_DEFLATE hsize_t deflate_size; /* Size of dataset with deflate filter */ diff --git a/testpar/t_span_tree.c b/testpar/t_span_tree.c index 9a4ac4d..65ee03d 100644 --- a/testpar/t_span_tree.c +++ b/testpar/t_span_tree.c @@ -662,7 +662,7 @@ void coll_write_test(int chunk_factor) *------------------------------------------------------------------------- */ static void -coll_read_test(int chunk_factor) +coll_read_test(int H5_ATTR_UNUSED chunk_factor) { const char *filename; @@ -923,7 +923,9 @@ coll_read_test(int chunk_factor) ****************************************************************/ #define LDSCT_DS_RANK 5 +#if LOWER_DIM_SIZE_COMP_TEST__RUN_TEST__DEBUG #define LOWER_DIM_SIZE_COMP_TEST_DEBUG_TARGET_RANK 0 +#endif #define LOWER_DIM_SIZE_COMP_TEST__SELECT_CHECKER_BOARD__DEBUG 0 diff --git a/tools/lib/h5tools_utils.c b/tools/lib/h5tools_utils.c index 45e436c..27a9de1 100644 --- a/tools/lib/h5tools_utils.c +++ b/tools/lib/h5tools_utils.c @@ -1288,9 +1288,9 @@ done: *----------------------------------------------------------------------------- */ int -h5tools_set_configured_fapl(hid_t fapl_id, - const char vfd_name[], - void *fapl_t_ptr) +h5tools_set_configured_fapl(hid_t fapl_id, + const char vfd_name[], + void H5_ATTR_UNUSED *fapl_t_ptr) { int ret_value = 1; diff --git a/tools/src/h5diff/ph5diff_main.c b/tools/src/h5diff/ph5diff_main.c index 5ba5fb3..da0519e 100644 --- a/tools/src/h5diff/ph5diff_main.c +++ b/tools/src/h5diff/ph5diff_main.c @@ -305,7 +305,7 @@ void print_manager_output(void) * *------------------------------------------------------------------------- */ -void h5diff_exit(int status) +void h5diff_exit(int H5_ATTR_UNUSED status) { /* if in parallel mode, dismiss workers, close down MPI, then exit */ if(g_Parallel) { diff --git a/tools/src/h5repack/h5repack_main.c b/tools/src/h5repack/h5repack_main.c index c628beb..c0c8a2a 100644 --- a/tools/src/h5repack/h5repack_main.c +++ b/tools/src/h5repack/h5repack_main.c @@ -281,7 +281,7 @@ int read_info(const char *filename, pack_opt_t *options) char comp_info[1024]; FILE *fp = NULL; char c; - int i, rc = 1; + int i; int ret_value = EXIT_SUCCESS; if (NULL == (fp = HDfopen(filename, "r"))) { diff --git a/tools/test/h5repack/h5repackgentest.c b/tools/test/h5repack/h5repackgentest.c index 77fb28a..7c0e7f1 100644 --- a/tools/test/h5repack/h5repackgentest.c +++ b/tools/test/h5repack/h5repackgentest.c @@ -314,7 +314,6 @@ generate_f32le(hbool_t external) { int main(void) { int i = 0; - int ret_value = 0; for (i = 0; i < 2; i++) { hbool_t external = (i & 1) ? TRUE : FALSE; diff --git a/tools/test/perform/perf.c b/tools/test/perform/perf.c index 2008a6e..fd7d9de 100644 --- a/tools/test/perform/perf.c +++ b/tools/test/perform/perf.c @@ -117,8 +117,8 @@ extern char *optarg; int main(int argc, char **argv) { - char *buf, *tmp, *buf2 = NULL, *tmp2 = NULL, *check; - int i, j, mynod=0, nprocs=1, err, my_correct = 1, correct, myerrno; + char *buf, *tmp, *buf2, *tmp2, *check; + int i, j, mynod=0, nprocs=1, my_correct = 1, correct, myerrno; double stim, etim; double write_tim = 0; double read_tim = 0; @@ -127,10 +127,6 @@ int main(int argc, char **argv) double min_read_tim, min_write_tim; double ave_read_tim, ave_write_tim; int64_t iter_jump = 0; - int64_t seek_position = 0; - MPI_File fh; - MPI_Status status; - int nchars; char filename[MAX_PATH]; herr_t ret; /* Generic return value */ diff --git a/tools/test/perform/pio_engine.c b/tools/test/perform/pio_engine.c index d000f60..f3cb3ec 100644 --- a/tools/test/perform/pio_engine.c +++ b/tools/test/perform/pio_engine.c @@ -54,24 +54,15 @@ /* sizes of various items. these sizes won't change during program execution */ /* The following three must have the same type */ -#define ELMT_SIZE (sizeof(unsigned char)) /* we're doing bytes */ -#define ELMT_MPI_TYPE MPI_BYTE #define ELMT_H5_TYPE H5T_NATIVE_UCHAR #define GOTOERROR(errcode) { ret_code = errcode; goto done; } -#define GOTODONE { goto done; } #define ERRMSG(mesg) { \ HDfprintf(stderr, "Proc %d: ", pio_mpi_rank_g); \ HDfprintf(stderr, "*** Assertion failed (%s) at line %4d in %s\n", \ mesg, (int)__LINE__, __FILE__); \ } -#define MSG(mesg) { \ - HDfprintf(stderr, "Proc %d: ", pio_mpi_rank_g); \ - HDfprintf(stderr, "(%s) at line %4d in %s\n", \ - mesg, (int)__LINE__, __FILE__); \ -} - /* verify: if val is false (0), print mesg. */ #define VRFY(val, mesg) do { \ if (!val) { \ -- cgit v0.12