diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/swmr_addrem_writer.c | 2 | ||||
-rw-r--r-- | test/swmr_common.c | 2 | ||||
-rw-r--r-- | test/swmr_generator.c | 6 | ||||
-rw-r--r-- | test/swmr_reader.c | 6 | ||||
-rw-r--r-- | test/swmr_remove_reader.c | 4 | ||||
-rw-r--r-- | test/swmr_remove_writer.c | 2 | ||||
-rw-r--r-- | test/swmr_sparse_reader.c | 4 | ||||
-rw-r--r-- | test/swmr_sparse_writer.c | 6 | ||||
-rw-r--r-- | test/swmr_start_write.c | 4 | ||||
-rw-r--r-- | test/swmr_writer.c | 2 | ||||
-rw-r--r-- | test/vds_swmr_reader.c | 2 | ||||
-rw-r--r-- | test/vds_swmr_writer.c | 6 |
12 files changed, 23 insertions, 23 deletions
diff --git a/test/swmr_addrem_writer.c b/test/swmr_addrem_writer.c index 3034da5..fb5cb8e 100644 --- a/test/swmr_addrem_writer.c +++ b/test/swmr_addrem_writer.c @@ -317,7 +317,7 @@ usage(void) printf("Defaults to verbose (no '-q' given), flushing every 1000 operations\n"); printf("('-f 1000'), and will generate a random seed (no -r given).\n"); printf("\n"); - exit(1); + HDexit(1); } int main(int argc, const char *argv[]) diff --git a/test/swmr_common.c b/test/swmr_common.c index 96e4b76..8bd98b6 100644 --- a/test/swmr_common.c +++ b/test/swmr_common.c @@ -202,7 +202,7 @@ generate_symbols(void) char name_buf[64]; generate_name(name_buf, u, v); - symbol_info[u][v].name = (char *)HDmalloc(strlen(name_buf) + 1); + symbol_info[u][v].name = (char *)HDmalloc(HDstrlen(name_buf) + 1); HDstrcpy(symbol_info[u][v].name, name_buf); symbol_info[u][v].dsid = -1; symbol_info[u][v].nrecords = 0; diff --git a/test/swmr_generator.c b/test/swmr_generator.c index 23341c8..3b782da 100644 --- a/test/swmr_generator.c +++ b/test/swmr_generator.c @@ -253,7 +253,7 @@ usage(void) printf("compression ('-c -1'), v1 b-tree indexing (-i b1), and will generate a random\n"); printf("seed (no -r given).\n"); printf("\n"); - exit(1); + HDexit(1); } /* end usage() */ int main(int argc, const char *argv[]) @@ -284,8 +284,8 @@ int main(int argc, const char *argv[]) /* Chunk index type */ case 'i': index_type = argv[u + 1]; - if(strcmp(index_type, "ea") - && strcmp(index_type, "b2")) + if(HDstrcmp(index_type, "ea") + && HDstrcmp(index_type, "b2")) usage(); u += 2; break; diff --git a/test/swmr_reader.c b/test/swmr_reader.c index ea91f07..24b5366 100644 --- a/test/swmr_reader.c +++ b/test/swmr_reader.c @@ -205,7 +205,7 @@ read_records(const char *filename, unsigned verbose, unsigned long nseconds, /* Allocate space for 'common' datasets, if any */ if(ncommon > 0) { /* Allocate array to hold pointers to symbols for common datasets */ - if(NULL == (sym_com = (symbol_info_t **)malloc(sizeof(symbol_info_t *) * ncommon))) + if(NULL == (sym_com = (symbol_info_t **)HDmalloc(sizeof(symbol_info_t *) * ncommon))) return -1; /* Open the common datasets */ @@ -313,7 +313,7 @@ read_records(const char *filename, unsigned verbose, unsigned long nseconds, HDsleep(poll_time); /* Retrieve the current time */ - curr_time = time(NULL); + curr_time = HDtime(NULL); } /* end while */ /* Close the memory dataspace */ @@ -359,7 +359,7 @@ usage(void) printf("5 common symbols to poll ('-h 5'), 10 random symbols to poll ('-l 10'),\n"); printf("and will generate a random seed (no -r given).\n"); printf("\n"); - exit(1); + HDexit(1); } int main(int argc, const char *argv[]) diff --git a/test/swmr_remove_reader.c b/test/swmr_remove_reader.c index a241481..689b010 100644 --- a/test/swmr_remove_reader.c +++ b/test/swmr_remove_reader.c @@ -268,7 +268,7 @@ read_records(const char *filename, unsigned verbose, unsigned long nseconds, HDfprintf(stderr, "Reading records\n"); /* Get the starting time */ - start_time = time(NULL); + start_time = HDtime(NULL); curr_time = start_time; /* Create file access property list */ @@ -372,7 +372,7 @@ usage(void) printf("5 common symbols to poll ('-h 5'), 10 random symbols to poll ('-l 10'),\n"); printf("and will generate a random seed (no -r given).\n"); printf("\n"); - exit(1); + HDexit(1); } int main(int argc, const char *argv[]) diff --git a/test/swmr_remove_writer.c b/test/swmr_remove_writer.c index ce69877..8f111a2 100644 --- a/test/swmr_remove_writer.c +++ b/test/swmr_remove_writer.c @@ -238,7 +238,7 @@ usage(void) printf("Defaults to verbose (no '-q' given), latest format when opening file (no '-o' given),\n"); printf("flushing every 1000 shrinks ('-f 1000'), and will generate a random seed (no -r given).\n"); printf("\n"); - exit(1); + HDexit(1); } int main(int argc, const char *argv[]) diff --git a/test/swmr_sparse_reader.c b/test/swmr_sparse_reader.c index 8053a8c..f755cd2 100644 --- a/test/swmr_sparse_reader.c +++ b/test/swmr_sparse_reader.c @@ -261,7 +261,7 @@ read_records(const char *filename, unsigned verbose, unsigned long nrecords, } /* end if */ /* Check for timeout */ - if(time(NULL) >= (time_t)(start_time + (time_t)TIMEOUT)) { + if(HDtime(NULL) >= (time_t)(start_time + (time_t)TIMEOUT)) { HDfprintf(stderr, "Reader timed out\n"); return -1; } /* end if */ @@ -340,7 +340,7 @@ usage(void) printf("Note that the # of records *must* be the same as that supplied to\n"); printf("swmr_sparse_writer\n"); printf("\n"); - exit(1); + HDexit(1); } /* end usage() */ int main(int argc, const char *argv[]) diff --git a/test/swmr_sparse_writer.c b/test/swmr_sparse_writer.c index dbc8926..66afb3b 100644 --- a/test/swmr_sparse_writer.c +++ b/test/swmr_sparse_writer.c @@ -180,7 +180,7 @@ add_records(hid_t fid, unsigned verbose, unsigned long nrecords, unsigned long f hsize_t dim[2] = {1,0}; /* Dataspace dimensions */ unsigned long u, v; /* Local index variables */ - assert(fid >= 0); + HDassert(fid >= 0); /* Reset the record */ /* (record's 'info' field might need to change for each record written, also) */ @@ -344,7 +344,7 @@ usage(void) printf("Defaults to verbose (no '-q' given) and flushing every 1000 records\n"); printf("('-f 1000')\n"); printf("\n"); - exit(1); + HDexit(1); } int main(int argc, const char *argv[]) @@ -365,7 +365,7 @@ int main(int argc, const char *argv[]) switch(argv[u][1]) { /* # of records to write between flushing file */ case 'f': - flush_count = atol(argv[u + 1]); + flush_count = HDatol(argv[u + 1]); if(flush_count < 0) usage(); u += 2; diff --git a/test/swmr_start_write.c b/test/swmr_start_write.c index ed3d6f3..fe8690f 100644 --- a/test/swmr_start_write.c +++ b/test/swmr_start_write.c @@ -388,7 +388,7 @@ add_records(hid_t fid, unsigned verbose, unsigned long nrecords, unsigned long f unsigned long rec_to_flush; /* # of records left to write before flush */ unsigned long u, v; /* Local index variables */ - assert(fid >= 0); + HDassert(fid >= 0); /* Reset the record */ /* (record's 'info' field might need to change for each record written, also) */ @@ -511,7 +511,7 @@ usage(void) printf("v1 b-tree indexing (-i b1), compression ('-c -1'),\n"); printf("will generate a random seed (no -r given), and verbose (no '-q' given)\n"); printf("\n"); - exit(1); + HDexit(1); } /* usage() */ /* diff --git a/test/swmr_writer.c b/test/swmr_writer.c index 330599a..afeab7ee1 100644 --- a/test/swmr_writer.c +++ b/test/swmr_writer.c @@ -286,7 +286,7 @@ usage(void) printf("Defaults to verbose (no '-q' given), latest format when opening file (no '-o' given),\n"); printf("flushing every 10000 records ('-f 10000'), and will generate a random seed (no -r given).\n"); printf("\n"); - exit(1); + HDexit(1); } int main(int argc, const char *argv[]) diff --git a/test/vds_swmr_reader.c b/test/vds_swmr_reader.c index 34cb3eb..7a08c62 100644 --- a/test/vds_swmr_reader.c +++ b/test/vds_swmr_reader.c @@ -134,7 +134,7 @@ error: if(fsid >= 0) (void)H5Sclose(fsid); if(buffer != NULL) - free(buffer); + HDfree(buffer); } H5E_END_TRY HDfprintf(stderr, "ERROR: SWMR reader exited with errors\n"); diff --git a/test/vds_swmr_writer.c b/test/vds_swmr_writer.c index fa1d1a0..1029192 100644 --- a/test/vds_swmr_writer.c +++ b/test/vds_swmr_writer.c @@ -52,7 +52,7 @@ main(int argc, char *argv[]) return EXIT_FAILURE; } - file_number = atoi(argv[1]); + file_number = HDatoi(argv[1]); if(file_number < 0 || file_number >= N_SOURCES) TEST_ERROR @@ -110,8 +110,8 @@ main(int argc, char *argv[]) TEST_ERROR /* Wait one second between writing planes */ - delay = time(0) + 1; - while(time(0) < delay) + delay = HDtime(0) + 1; + while(HDtime(0) < delay) ; /* Flush */ |