Skip to content

Commit

Permalink
Remove HD prefix from HDlog10 calls (HDFGroup#3539)
Browse files Browse the repository at this point in the history
Was missed in a previous commit and causes building subfiling to
fail.
  • Loading branch information
derobins authored and qkoziol committed Sep 30, 2023
1 parent cc97685 commit b8ef1c6
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions testpar/t_subfiling_vfd.c
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ test_config_file(void)
VRFY(subfile_name, "malloc succeeded");

/* Verify the name of each subfile is in the configuration file */
num_digits = (int)(HDlog10(cfg.stripe_count) + 1);
num_digits = (int)(log10(cfg.stripe_count) + 1);
for (size_t i = 0; i < (size_t)cfg.stripe_count; i++) {
HDsnprintf(subfile_name, PATH_MAX, H5FD_SUBFILING_FILENAME_TEMPLATE, SUBF_FILENAME,
(uint64_t)file_info.st_ino, num_digits, (int)i + 1, cfg.stripe_count);
Expand Down Expand Up @@ -507,7 +507,7 @@ test_stripe_sizes(void)
FILE *subfile_ptr;

num_subfiles = 1;
num_digits = (int)(HDlog10(num_subfiles) + 1);
num_digits = (int)(log10(num_subfiles) + 1);

nbytes = (size_t)(cfg.stripe_size * num_subfiles);

Expand Down Expand Up @@ -669,7 +669,7 @@ test_stripe_sizes(void)
VRFY(file_ptr, "H5FDopen succeeded");

num_subfiles = num_iocs_g;
num_digits = (int)(HDlog10(num_subfiles) + 1);
num_digits = (int)(log10(num_subfiles) + 1);

nbytes = (size_t)(cfg.stripe_size * num_subfiles);

Expand Down Expand Up @@ -977,7 +977,7 @@ test_selection_strategies(void)
*/
VRFY((HDstat(SUBF_FILENAME, &file_info) >= 0), "HDstat succeeded");

num_digits = (int)(HDlog10(expected_num_subfiles) + 1);
num_digits = (int)(log10(expected_num_subfiles) + 1);

/* Ensure all the subfiles are present */
for (int i = 0; i < expected_num_subfiles; i++) {
Expand Down Expand Up @@ -1132,7 +1132,7 @@ test_read_different_stripe_size(void)
h5_stat_t file_info;
FILE *subfile_ptr;
int num_subfiles = cfg.stripe_count;
int num_digits = (int)(HDlog10(num_subfiles) + 1);
int num_digits = (int)(log10(num_subfiles) + 1);

VRFY((HDstat(SUBF_FILENAME, &file_info) >= 0), "HDstat succeeded");

Expand Down Expand Up @@ -1205,7 +1205,7 @@ test_read_different_stripe_size(void)
h5_stat_t file_info;
FILE *subfile_ptr;
int num_subfiles = cfg.stripe_count;
int num_digits = (int)(HDlog10(num_subfiles / 2) + 1);
int num_digits = (int)(log10(num_subfiles / 2) + 1);

VRFY((HDstat(SUBF_FILENAME, &file_info) >= 0), "HDstat succeeded");

Expand Down Expand Up @@ -1353,7 +1353,7 @@ test_subfiling_precreate_rank_0(void)
*/

num_subfiles = cfg.stripe_count;
num_digits = (int)(HDlog10(num_subfiles) + 1);
num_digits = (int)(log10(num_subfiles) + 1);

VRFY((HDstat(SUBF_FILENAME, &file_info) >= 0), "HDstat succeeded");

Expand Down Expand Up @@ -2013,7 +2013,7 @@ test_subfiling_h5fuse(void)
if (MAINPROCESS) {
char *filename_buf;
int num_subfiles = num_iocs_g;
int num_digits = (int)(HDlog10(num_subfiles) + 1);
int num_digits = (int)(log10(num_subfiles) + 1);

/* Delete the regular HDF5 file */
H5Pset_fapl_sec2(fapl_id);
Expand Down

0 comments on commit b8ef1c6

Please sign in to comment.