diff options
author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2023-06-28 15:31:32 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-06-28 15:31:32 (GMT) |
commit | 187ea8a9ae1405b5b46ca47a32fb1fb9e2686c98 (patch) | |
tree | baffa167d0796786241aef6b0ce76d4adec3b66e /tools/src/h5diff | |
parent | 7a44581a84778a1346a2fd5b6cca7d9db905a321 (diff) | |
download | hdf5-187ea8a9ae1405b5b46ca47a32fb1fb9e2686c98.zip hdf5-187ea8a9ae1405b5b46ca47a32fb1fb9e2686c98.tar.gz hdf5-187ea8a9ae1405b5b46ca47a32fb1fb9e2686c98.tar.bz2 |
Rename HD(f)printf() to (f)printf() (#3194)
Diffstat (limited to 'tools/src/h5diff')
-rw-r--r-- | tools/src/h5diff/h5diff_common.c | 38 | ||||
-rw-r--r-- | tools/src/h5diff/ph5diff_main.c | 14 |
2 files changed, 26 insertions, 26 deletions
diff --git a/tools/src/h5diff/h5diff_common.c b/tools/src/h5diff/h5diff_common.c index a2fe5d9..6248cd5 100644 --- a/tools/src/h5diff/h5diff_common.c +++ b/tools/src/h5diff/h5diff_common.c @@ -95,11 +95,11 @@ check_options(diff_opt_t *opts) * These options are mutually exclusive. */ if ((opts->delta_bool + opts->percent_bool + opts->use_system_epsilon) > 1) { - HDprintf("%s error: -d, -p and --use-system-epsilon options are mutually-exclusive;\n", PROGRAMNAME); - HDprintf("use no more than one.\n"); - HDprintf("Try '-h' or '--help' option for more information or see the %s entry in the 'HDF5 " - "Reference Manual'.\n", - PROGRAMNAME); + printf("%s error: -d, -p and --use-system-epsilon options are mutually-exclusive;\n", PROGRAMNAME); + printf("use no more than one.\n"); + printf("Try '-h' or '--help' option for more information or see the %s entry in the 'HDF5 " + "Reference Manual'.\n", + PROGRAMNAME); h5diff_exit(EXIT_FAILURE); } } @@ -218,7 +218,7 @@ parse_command_line(int argc, const char *const *argv, const char **fname1, const /* create linked list of excluding objects */ if ((exclude_node = (struct exclude_path_list *)HDmalloc(sizeof(struct exclude_path_list))) == NULL) { - HDprintf("Error: lack of memory!\n"); + printf("Error: lack of memory!\n"); h5diff_exit(EXIT_FAILURE); } @@ -250,7 +250,7 @@ parse_command_line(int argc, const char *const *argv, const char **fname1, const /* create linked list of excluding objects */ if ((exclude_attr_node = (struct exclude_path_list *)HDmalloc(sizeof(struct exclude_path_list))) == NULL) { - HDprintf("Error: lack of memory!\n"); + printf("Error: lack of memory!\n"); h5diff_exit(EXIT_FAILURE); } @@ -276,7 +276,7 @@ parse_command_line(int argc, const char *const *argv, const char **fname1, const opts->delta_bool = 1; if (check_d_input(H5_optarg) == -1) { - HDprintf("<-d %s> is not a valid option\n", H5_optarg); + printf("<-d %s> is not a valid option\n", H5_optarg); usage(); h5diff_exit(EXIT_FAILURE); } @@ -287,7 +287,7 @@ parse_command_line(int argc, const char *const *argv, const char **fname1, const case 'p': opts->percent_bool = 1; if (check_p_input(H5_optarg) == -1) { - HDprintf("<-p %s> is not a valid option\n", H5_optarg); + printf("<-p %s> is not a valid option\n", H5_optarg); usage(); h5diff_exit(EXIT_FAILURE); } @@ -301,7 +301,7 @@ parse_command_line(int argc, const char *const *argv, const char **fname1, const case 'n': opts->count_bool = 1; if (check_n_input(H5_optarg) == -1) { - HDprintf("<-n %s> is not a valid option\n", H5_optarg); + printf("<-n %s> is not a valid option\n", H5_optarg); usage(); h5diff_exit(EXIT_FAILURE); } @@ -392,7 +392,7 @@ parse_command_line(int argc, const char *const *argv, const char **fname1, const errno = 0; onion_fa_g_1.revision_num = HDstrtoull(opts->vfd_info[0].info, NULL, 10); if (errno == ERANGE) { - HDprintf("Invalid onion revision specified for file 1\n"); + printf("Invalid onion revision specified for file 1\n"); usage(); h5diff_exit(EXIT_FAILURE); } @@ -409,7 +409,7 @@ parse_command_line(int argc, const char *const *argv, const char **fname1, const errno = 0; onion_fa_g_2.revision_num = HDstrtoull(opts->vfd_info[1].info, NULL, 10); if (errno == ERANGE) { - HDprintf("Invalid onion revision specified for file 2\n"); + printf("Invalid onion revision specified for file 2\n"); usage(); h5diff_exit(EXIT_FAILURE); } @@ -480,20 +480,20 @@ print_info(diff_opt_t *opts) return; if (opts->cmn_objs == 0) { - HDprintf("No common objects found. Files are not comparable.\n"); + printf("No common objects found. Files are not comparable.\n"); if (!opts->mode_verbose) - HDprintf("Use -v for a list of objects.\n"); + printf("Use -v for a list of objects.\n"); } if (opts->not_cmp == 1) { if (opts->mode_list_not_cmp == 0) { - HDprintf("--------------------------------\n"); - HDprintf("Some objects are not comparable\n"); - HDprintf("--------------------------------\n"); + printf("--------------------------------\n"); + printf("Some objects are not comparable\n"); + printf("--------------------------------\n"); if (opts->mode_verbose) - HDprintf("Use -c for a list of objects without details of differences.\n"); + printf("Use -c for a list of objects without details of differences.\n"); else - HDprintf("Use -c for a list of objects.\n"); + printf("Use -c for a list of objects.\n"); } } } diff --git a/tools/src/h5diff/ph5diff_main.c b/tools/src/h5diff/ph5diff_main.c index f65d2b0..d1be2ff 100644 --- a/tools/src/h5diff/ph5diff_main.c +++ b/tools/src/h5diff/ph5diff_main.c @@ -67,7 +67,7 @@ main(int argc, char *argv[]) MPI_Comm_size(MPI_COMM_WORLD, &g_nTasks); if (g_nTasks == 1) { - HDprintf("Only 1 task available...doing serial diff\n"); + printf("Only 1 task available...doing serial diff\n"); g_Parallel = 0; @@ -141,11 +141,11 @@ ph5diff_worker(int nID) { /* Open the files */ if ((file1_id = H5Fopen(filenames[0], H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) { - HDprintf("h5diff Task [%d]: <%s>: unable to open file\n", nID, filenames[0]); + printf("h5diff Task [%d]: <%s>: unable to open file\n", nID, filenames[0]); MPI_Abort(MPI_COMM_WORLD, 0); } if ((file2_id = H5Fopen(filenames[1], H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) { - HDprintf("h5diff Task [%d]: <%s>: unable to open file\n", nID, filenames[1]); + printf("h5diff Task [%d]: <%s>: unable to open file\n", nID, filenames[1]); MPI_Abort(MPI_COMM_WORLD, 0); } /* enable error reporting */ @@ -160,7 +160,7 @@ ph5diff_worker(int nID) /* Make certain we've received the filenames and opened the files already */ if (file1_id < 0 || file2_id < 0) { - HDprintf("ph5diff_worker: ERROR: work received before/without filenames\n"); + printf("ph5diff_worker: ERROR: work received before/without filenames\n"); break; } @@ -225,7 +225,7 @@ ph5diff_worker(int nID) break; } else { - HDprintf("ph5diff_worker: ERROR: invalid tag (%d) received\n", Status.MPI_TAG); + printf("ph5diff_worker: ERROR: invalid tag (%d) received\n", Status.MPI_TAG); break; } } @@ -252,7 +252,7 @@ print_manager_output(void) { /* If there was something we buffered, let's print it now */ if ((outBuffOffset > 0) && g_Parallel) { - HDprintf("%s", outBuff); + printf("%s", outBuff); if (overflow_file) { int tmp; @@ -268,7 +268,7 @@ print_manager_output(void) outBuffOffset = 0; } else if ((outBuffOffset > 0) && !g_Parallel) { - HDfprintf(stderr, "h5diff error: outBuffOffset>0, but we're not in parallel!\n"); + fprintf(stderr, "h5diff error: outBuffOffset>0, but we're not in parallel!\n"); } } |