From d16006c45d7d574e8a8f530cc3f4dbd1f3e7e25e Mon Sep 17 00:00:00 2001 From: David Young Date: Mon, 27 Apr 2020 10:28:10 -0500 Subject: To avoid name clashes, rename FILENAME -> COMMON_FILENAME in test/vfd_swmr_common.h and in all files that #include it. Now I can --- test/vfd_swmr_addrem_writer.c | 8 +++++--- test/vfd_swmr_common.h | 2 +- test/vfd_swmr_generator.c | 4 ++-- test/vfd_swmr_reader.c | 2 +- test/vfd_swmr_remove_reader.c | 2 +- test/vfd_swmr_remove_writer.c | 8 +++++--- test/vfd_swmr_sparse_reader.c | 2 +- test/vfd_swmr_sparse_writer.c | 8 +++++--- test/vfd_swmr_writer.c | 8 +++++--- 9 files changed, 26 insertions(+), 18 deletions(-) diff --git a/test/vfd_swmr_addrem_writer.c b/test/vfd_swmr_addrem_writer.c index 662b474..a8aefa9 100644 --- a/test/vfd_swmr_addrem_writer.c +++ b/test/vfd_swmr_addrem_writer.c @@ -450,11 +450,13 @@ int main(int argc, const char *argv[]) return -1; /* Emit informational message */ - if(verbose) - HDfprintf(stderr, "WRITER: Opening skeleton file: %s\n", FILENAME); + if(verbose) { + HDfprintf(stderr, "WRITER: Opening skeleton file: %s\n", + COMMON_FILENAME); + } /* Open file skeleton */ - if((fid = open_skeleton(FILENAME, verbose)) < 0) { + if((fid = open_skeleton(COMMON_FILENAME, verbose)) < 0) { HDfprintf(stderr, "WRITER: Error opening skeleton file!\n"); HDexit(1); } /* end if */ diff --git a/test/vfd_swmr_common.h b/test/vfd_swmr_common.h index 618e4ff..8eb7143 100644 --- a/test/vfd_swmr_common.h +++ b/test/vfd_swmr_common.h @@ -33,7 +33,7 @@ #define NMAPPING 9 -#define FILENAME "vfd_swmr_data.h5" /* SWMR test file name */ +#define COMMON_FILENAME "vfd_swmr_data.h5" /* SWMR test file name */ #define DTYPE_SIZE 150 /* Data size in opaque type */ /* The message sent by writer that the file open is done--releasing the file lock */ diff --git a/test/vfd_swmr_generator.c b/test/vfd_swmr_generator.c index 0a455d8..054b5e5 100644 --- a/test/vfd_swmr_generator.c +++ b/test/vfd_swmr_generator.c @@ -385,10 +385,10 @@ int main(int argc, const char *argv[]) /* Emit informational message */ if(verbose) - HDfprintf(stderr, "Generating skeleton file: %s\n", FILENAME); + HDfprintf(stderr, "Generating skeleton file: %s\n", COMMON_FILENAME); /* Generate file skeleton */ - if(gen_skeleton(FILENAME, verbose, vfd_swmr_write, comp_level, index_type, random_seed) < 0) { + if(gen_skeleton(COMMON_FILENAME, verbose, vfd_swmr_write, comp_level, index_type, random_seed) < 0) { HDfprintf(stderr, "Error generating skeleton file!\n"); HDexit(1); } /* end if */ diff --git a/test/vfd_swmr_reader.c b/test/vfd_swmr_reader.c index 5d6b709..706c894 100644 --- a/test/vfd_swmr_reader.c +++ b/test/vfd_swmr_reader.c @@ -647,7 +647,7 @@ int main(int argc, const char *argv[]) } /* Reading records from datasets */ - if(read_records(FILENAME, verbose, verbose_file, random_seed, (unsigned long)nseconds, (unsigned)poll_time, (unsigned)ncommon, (unsigned)nrandom) < 0) { + if(read_records(COMMON_FILENAME, verbose, verbose_file, random_seed, (unsigned long)nseconds, (unsigned)poll_time, (unsigned)ncommon, (unsigned)nrandom) < 0) { HDfprintf(stderr, "READER: Error reading records from datasets (random_seed = %u)!\n", random_seed); HDexit(1); } /* end if */ diff --git a/test/vfd_swmr_remove_reader.c b/test/vfd_swmr_remove_reader.c index 025a015..3515987 100644 --- a/test/vfd_swmr_remove_reader.c +++ b/test/vfd_swmr_remove_reader.c @@ -567,7 +567,7 @@ int main(int argc, const char *argv[]) return -1; /* Reading records from datasets */ - if(read_records(FILENAME, verbose, (unsigned long)nseconds, (unsigned)poll_time, (unsigned)ncommon, (unsigned)nrandom) < 0) { + if(read_records(COMMON_FILENAME, verbose, (unsigned long)nseconds, (unsigned)poll_time, (unsigned)ncommon, (unsigned)nrandom) < 0) { HDfprintf(stderr, "READER: Error reading records from datasets!\n"); HDexit(1); } /* end if */ diff --git a/test/vfd_swmr_remove_writer.c b/test/vfd_swmr_remove_writer.c index e17a756..2ebe96f 100644 --- a/test/vfd_swmr_remove_writer.c +++ b/test/vfd_swmr_remove_writer.c @@ -374,11 +374,13 @@ int main(int argc, const char *argv[]) return -1; /* Emit informational message */ - if(verbose) - HDfprintf(stderr, "WRITER: Opening skeleton file: %s\n", FILENAME); + if(verbose) { + HDfprintf(stderr, "WRITER: Opening skeleton file: %s\n", + COMMON_FILENAME); + } /* Open file skeleton */ - if((fid = open_skeleton(FILENAME, verbose, old)) < 0) { + if((fid = open_skeleton(COMMON_FILENAME, verbose, old)) < 0) { HDfprintf(stderr, "WRITER: Error opening skeleton file!\n"); HDexit(1); } /* end if */ diff --git a/test/vfd_swmr_sparse_reader.c b/test/vfd_swmr_sparse_reader.c index 64f0d35..3ac8935 100644 --- a/test/vfd_swmr_sparse_reader.c +++ b/test/vfd_swmr_sparse_reader.c @@ -515,7 +515,7 @@ int main(int argc, const char *argv[]) } /* Reading records from datasets */ - if(read_records(FILENAME, verbose, (unsigned long) nrecords, (unsigned)poll_time, (unsigned)reopen_count) < 0) { + if(read_records(COMMON_FILENAME, verbose, (unsigned long) nrecords, (unsigned)poll_time, (unsigned)reopen_count) < 0) { HDfprintf(stderr, "READER: Error reading records from datasets!\n"); HDexit(1); } /* end if */ diff --git a/test/vfd_swmr_sparse_writer.c b/test/vfd_swmr_sparse_writer.c index 90fbf77..5722558 100644 --- a/test/vfd_swmr_sparse_writer.c +++ b/test/vfd_swmr_sparse_writer.c @@ -436,11 +436,13 @@ int main(int argc, const char *argv[]) return -1; /* Emit informational message */ - if(verbose) - HDfprintf(stderr, "WRITER: Opening skeleton file: %s\n", FILENAME); + if(verbose) { + HDfprintf(stderr, "WRITER: Opening skeleton file: %s\n", + COMMON_FILENAME); + } /* Open file skeleton */ - if((fid = open_skeleton(FILENAME, verbose)) < 0) { + if((fid = open_skeleton(COMMON_FILENAME, verbose)) < 0) { HDfprintf(stderr, "WRITER: Error opening skeleton file!\n"); HDexit(1); } /* end if */ diff --git a/test/vfd_swmr_writer.c b/test/vfd_swmr_writer.c index 87953ed..1d73dd6 100644 --- a/test/vfd_swmr_writer.c +++ b/test/vfd_swmr_writer.c @@ -400,11 +400,13 @@ main(int argc, char * const *argv) return -1; /* Emit informational message */ - if(verbose) - HDfprintf(verbose_file, "WRITER: Opening skeleton file: %s\n", FILENAME); + if(verbose) { + HDfprintf(verbose_file, "WRITER: Opening skeleton file: %s\n", + COMMON_FILENAME); + } /* Open file skeleton */ - if((fid = open_skeleton(FILENAME, verbose, verbose_file, random_seed, old)) < 0) { + if((fid = open_skeleton(COMMON_FILENAME, verbose, verbose_file, random_seed, old)) < 0) { HDfprintf(stderr, "WRITER: Error opening skeleton file!\n"); HDexit(1); } /* end if */ -- cgit v0.12