diff options
Diffstat (limited to 'tools')
56 files changed, 2476 insertions, 2491 deletions
diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c index c617ec3..8f8522b 100644 --- a/tools/lib/h5diff.c +++ b/tools/lib/h5diff.c @@ -116,7 +116,7 @@ print_incoming_data(void) MPI_Recv(data, PRINT_DATA_MAX_SIZE, MPI_CHAR, Status.MPI_SOURCE, MPI_TAG_PRINT_DATA, MPI_COMM_WORLD, &Status); - HDprintf("%s", data); + printf("%s", data); } } while (incomingMessage); } @@ -997,8 +997,7 @@ h5diff(const char *fname1, const char *fname2, const char *objname1, const char int i; if ((HDstrlen(fname1) > MAX_FILENAME) || (HDstrlen(fname2) > MAX_FILENAME)) { - HDfprintf(stderr, "The parallel diff only supports path names up to %d characters\n", - MAX_FILENAME); + fprintf(stderr, "The parallel diff only supports path names up to %d characters\n", MAX_FILENAME); MPI_Abort(MPI_COMM_WORLD, 0); } /* end if */ @@ -1248,7 +1247,7 @@ diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1, hid_t file2_id, /*Set up args to pass to worker task. */ if (HDstrlen(obj1_fullpath) > 255 || HDstrlen(obj2_fullpath) > 255) { - HDprintf("The parallel diff only supports object names up to 255 characters\n"); + printf("The parallel diff only supports object names up to 255 characters\n"); MPI_Abort(MPI_COMM_WORLD, 0); } /* end if */ @@ -1393,7 +1392,7 @@ diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1, hid_t file2_id, MPI_COMM_WORLD); } /* end else-if */ else { - HDprintf("ERROR: Invalid tag (%d) received \n", Status.MPI_TAG); + printf("ERROR: Invalid tag (%d) received \n", Status.MPI_TAG); MPI_Abort(MPI_COMM_WORLD, 0); MPI_Finalize(); } /* end else */ @@ -1478,10 +1477,10 @@ diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1, hid_t file2_id, MPI_Recv(data, PRINT_DATA_MAX_SIZE, MPI_CHAR, Status.MPI_SOURCE, MPI_TAG_PRINT_DATA, MPI_COMM_WORLD, &Status); - HDprintf("%s", data); + printf("%s", data); } /* end else-if */ else { - HDprintf("ph5diff-manager: ERROR!! Invalid tag (%d) received \n", Status.MPI_TAG); + printf("ph5diff-manager: ERROR!! Invalid tag (%d) received \n", Status.MPI_TAG); MPI_Abort(MPI_COMM_WORLD, 0); } /* end else */ } /* end while */ diff --git a/tools/lib/h5diff_util.c b/tools/lib/h5diff_util.c index 17b8d3c..fc74a39 100644 --- a/tools/lib/h5diff_util.c +++ b/tools/lib/h5diff_util.c @@ -321,7 +321,7 @@ print_found(hsize_t nfound) if (g_Parallel) parallel_print("%" PRIuHSIZE " differences found\n", nfound); else - HDfprintf(stdout, "%" PRIuHSIZE " differences found\n", nfound); + fprintf(stdout, "%" PRIuHSIZE " differences found\n", nfound); } /*----------------------------------------------------------------- diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c index e752895..e0e3e06 100644 --- a/tools/lib/h5tools.c +++ b/tools/lib/h5tools.c @@ -175,7 +175,7 @@ h5tools_close(void) if (h5tools_init_g) { /* special case where only data is output to stdout */ if ((rawoutstream == NULL) && rawdatastream && (rawdatastream == stdout)) - HDfprintf(rawdatastream, "\n"); + fprintf(rawdatastream, "\n"); if (tools_func) H5Eprint2(H5tools_ERR_STACK_g, rawerrorstream); diff --git a/tools/lib/h5tools.h b/tools/lib/h5tools.h index 753a83b..86fea01 100644 --- a/tools/lib/h5tools.h +++ b/tools/lib/h5tools.h @@ -36,10 +36,10 @@ HDfflush(S) #define PRINTSTREAM(S, F, ...) \ if (S != NULL) \ - HDfprintf(S, F, __VA_ARGS__) + fprintf(S, F, __VA_ARGS__) #define PRINTVALSTREAM(S, V) \ if (S != NULL) \ - HDfprintf(S, V) + fprintf(S, V) #define PUTSTREAM(X, S) \ do { \ if (S != NULL) \ diff --git a/tools/lib/h5tools_error.h b/tools/lib/h5tools_error.h index 5417eb9..0e30cdf 100644 --- a/tools/lib/h5tools_error.h +++ b/tools/lib/h5tools_error.h @@ -40,27 +40,27 @@ H5TOOLS_DLLVAR hid_t H5E_tools_min_dbg_id_g; \ /* Create new HDF5 error stack for the tools to use */ \ if ((H5tools_ERR_STACK_g = H5Ecreate_stack()) < 0) \ - HDfprintf(stderr, "Failed to create HDF5 tools error stack\n"); \ + fprintf(stderr, "Failed to create HDF5 tools error stack\n"); \ \ /* Register errors from the HDF5 tools as a new error class */ \ if ((H5tools_ERR_CLS_g = H5Eregister_class("H5tools", "HDF5:tools", lib_str)) < 0) \ - HDfprintf(stderr, "Failed to register HDF5 tools error class\n"); \ + fprintf(stderr, "Failed to register HDF5 tools error class\n"); \ \ /* Create a new HDF5 major error message for errors from the tools library */ \ if ((H5E_tools_g = H5Ecreate_msg(H5tools_ERR_CLS_g, H5E_MAJOR, "Failure in tools library")) < 0) \ - HDfprintf(stderr, "Failed to register major error message for tools library errors\n"); \ + fprintf(stderr, "Failed to register major error message for tools library errors\n"); \ \ /* Create a new HDF5 minor error message for errors from the tools library */ \ if ((H5E_tools_min_id_g = H5Ecreate_msg(H5tools_ERR_CLS_g, H5E_MINOR, "error in function")) < 0) \ - HDfprintf(stderr, "Failed to register minor error message for tools library errors\n"); \ + fprintf(stderr, "Failed to register minor error message for tools library errors\n"); \ \ /* Create a new HDF5 minor error message for info messages from the tools library */ \ if ((H5E_tools_min_info_id_g = H5Ecreate_msg(H5tools_ERR_CLS_g, H5E_MINOR, "function info")) < 0) \ - HDfprintf(stderr, "Failed to register minor error message for tools library info messages\n"); \ + fprintf(stderr, "Failed to register minor error message for tools library info messages\n"); \ \ /* Create a new HDF5 minor error message for debug messages from the tools library */ \ if ((H5E_tools_min_dbg_id_g = H5Ecreate_msg(H5tools_ERR_CLS_g, H5E_MINOR, "function debug")) < 0) \ - HDfprintf(stderr, "Failed to register minor error message for tools library debug messages\n"); \ + fprintf(stderr, "Failed to register minor error message for tools library debug messages\n"); \ } while (0) /* @@ -70,21 +70,21 @@ H5TOOLS_DLLVAR hid_t H5E_tools_min_dbg_id_g; do { \ /* Close all error messages created by H5TOOLS_INIT_ERROR() */ \ if (H5Eclose_msg(H5E_tools_min_dbg_id_g) < 0) \ - HDfprintf(stderr, "Failed to close minor error message for tools library debug messages\n"); \ + fprintf(stderr, "Failed to close minor error message for tools library debug messages\n"); \ if (H5Eclose_msg(H5E_tools_min_info_id_g) < 0) \ - HDfprintf(stderr, "Failed to close minor error message for tools library info messages\n"); \ + fprintf(stderr, "Failed to close minor error message for tools library info messages\n"); \ if (H5Eclose_msg(H5E_tools_min_id_g) < 0) \ - HDfprintf(stderr, "Failed to close minor error message for tools library errors\n"); \ + fprintf(stderr, "Failed to close minor error message for tools library errors\n"); \ if (H5Eclose_msg(H5E_tools_g) < 0) \ - HDfprintf(stderr, "Failed to close major error message for tools library errors\n"); \ + fprintf(stderr, "Failed to close major error message for tools library errors\n"); \ \ /* Unregister the HDF5 tools error class */ \ if (H5Eunregister_class(H5tools_ERR_CLS_g) < 0) \ - HDfprintf(stderr, "Failed to unregister the HDF5 tools error class\n"); \ + fprintf(stderr, "Failed to unregister the HDF5 tools error class\n"); \ \ /* Close the tools error stack */ \ if (H5Eclose_stack(H5tools_ERR_STACK_g) < 0) \ - HDfprintf(stderr, "Failed to close HDF5 tools error stack\n"); \ + fprintf(stderr, "Failed to close HDF5 tools error stack\n"); \ } while (0) /* @@ -98,8 +98,8 @@ H5TOOLS_DLLVAR hid_t H5E_tools_min_dbg_id_g; H5Epush2(estack_id, __FILE__, __func__, __LINE__, err_cls, maj_err_id, min_err_id, \ __VA_ARGS__); \ else { \ - HDfprintf(stderr, __VA_ARGS__); \ - HDfprintf(stderr, "\n"); \ + fprintf(stderr, __VA_ARGS__); \ + fprintf(stderr, "\n"); \ } \ } \ } while (0) @@ -166,25 +166,25 @@ H5TOOLS_DLLVAR hid_t H5E_tools_min_dbg_id_g; #define H5TOOLS_START_DEBUG(...) \ do { \ H5tools_INDENT_g += 2; \ - HDfprintf(stderr, "%*sENTER %s:%d in %s()...", H5tools_INDENT_g, "", __FILE__, __LINE__, __func__); \ - HDfprintf(stderr, __VA_ARGS__); \ - HDfprintf(stderr, "\n"); \ + fprintf(stderr, "%*sENTER %s:%d in %s()...", H5tools_INDENT_g, "", __FILE__, __LINE__, __func__); \ + fprintf(stderr, __VA_ARGS__); \ + fprintf(stderr, "\n"); \ HDfflush(stderr); \ } while (0) #define H5TOOLS_DEBUG(...) \ do { \ - HDfprintf(stderr, "%*s %s:%d in %s()...", H5tools_INDENT_g, "", __FILE__, __LINE__, __func__); \ - HDfprintf(stderr, __VA_ARGS__); \ - HDfprintf(stderr, "\n"); \ + fprintf(stderr, "%*s %s:%d in %s()...", H5tools_INDENT_g, "", __FILE__, __LINE__, __func__); \ + fprintf(stderr, __VA_ARGS__); \ + fprintf(stderr, "\n"); \ HDfflush(stderr); \ } while (0) #define H5TOOLS_ENDDEBUG(...) \ do { \ - HDfprintf(stderr, "%*sEXIT %s:%d in %s()...", H5tools_INDENT_g, "", __FILE__, __LINE__, __func__); \ - HDfprintf(stderr, __VA_ARGS__); \ - HDfprintf(stderr, "\n"); \ + fprintf(stderr, "%*sEXIT %s:%d in %s()...", H5tools_INDENT_g, "", __FILE__, __LINE__, __func__); \ + fprintf(stderr, __VA_ARGS__); \ + fprintf(stderr, "\n"); \ H5tools_INDENT_g -= 2; \ HDfflush(stderr); \ } while (0) diff --git a/tools/lib/h5tools_filters.c b/tools/lib/h5tools_filters.c index 899b7be..58a71b3 100644 --- a/tools/lib/h5tools_filters.c +++ b/tools/lib/h5tools_filters.c @@ -20,7 +20,7 @@ static void print_filter_warning(const char *dname, const char *fname) { - HDfprintf(stderr, "Warning: dataset <%s> cannot be read, %s filter is not available\n", dname, fname); + fprintf(stderr, "Warning: dataset <%s> cannot be read, %s filter is not available\n", dname, fname); } /*------------------------------------------------------------------------- diff --git a/tools/lib/h5tools_utils.c b/tools/lib/h5tools_utils.c index 46b27df..6cc9125 100644 --- a/tools/lib/h5tools_utils.c +++ b/tools/lib/h5tools_utils.c @@ -81,8 +81,8 @@ parallel_print(const char *format, ...) overflow_file = HDtmpfile(); if (overflow_file == NULL) - HDfprintf(rawerrorstream, - "warning: could not create overflow file. Output may be truncated.\n"); + fprintf(rawerrorstream, + "warning: could not create overflow file. Output may be truncated.\n"); else bytes_written = HDvfprintf(overflow_file, format, ap); } @@ -113,7 +113,7 @@ error_msg(const char *fmt, ...) FLUSHSTREAM(rawattrstream); FLUSHSTREAM(rawdatastream); FLUSHSTREAM(rawoutstream); - HDfprintf(rawerrorstream, "%s error: ", h5tools_getprogname()); + fprintf(rawerrorstream, "%s error: ", h5tools_getprogname()); HDvfprintf(rawerrorstream, fmt, ap); va_end(ap); @@ -137,7 +137,7 @@ warn_msg(const char *fmt, ...) FLUSHSTREAM(rawattrstream); FLUSHSTREAM(rawdatastream); FLUSHSTREAM(rawoutstream); - HDfprintf(rawerrorstream, "%s warning: ", h5tools_getprogname()); + fprintf(rawerrorstream, "%s warning: ", h5tools_getprogname()); HDvfprintf(rawerrorstream, fmt, ap); va_end(ap); } @@ -153,8 +153,8 @@ warn_msg(const char *fmt, ...) void help_ref_msg(FILE *output) { - HDfprintf(output, "Try '-h' or '--help' for more information or "); - HDfprintf(output, "see the <%s> entry in the 'HDF5 Reference Manual'.\n", h5tools_getprogname()); + fprintf(output, "Try '-h' or '--help' for more information or "); + fprintf(output, "see the <%s> entry in the 'HDF5 Reference Manual'.\n", h5tools_getprogname()); } /*------------------------------------------------------------------------- @@ -508,7 +508,7 @@ indentation(unsigned x) PRINTVALSTREAM(rawoutstream, " "); } else { - HDfprintf(rawerrorstream, "error: the indentation exceeds the number of cols.\n"); + fprintf(rawerrorstream, "error: the indentation exceeds the number of cols.\n"); HDexit(1); } } @@ -1130,19 +1130,19 @@ h5tools_populate_ros3_fapl(H5FD_ros3_fapl_t *fa, const char **values) /* e.g.? if (!populate()) { then failed } */ if (show_progress) { - HDprintf("called h5tools_populate_ros3_fapl\n"); + printf("called h5tools_populate_ros3_fapl\n"); } if (fa == NULL) { if (show_progress) { - HDprintf(" ERROR: null pointer to fapl_t\n"); + printf(" ERROR: null pointer to fapl_t\n"); } ret_value = 0; goto done; } if (show_progress) { - HDprintf(" preset fapl with default values\n"); + printf(" preset fapl with default values\n"); } fa->version = H5FD_CURR_ROS3_FAPL_T_VERSION; fa->authenticate = FALSE; @@ -1155,21 +1155,21 @@ h5tools_populate_ros3_fapl(H5FD_ros3_fapl_t *fa, const char **values) if (values != NULL) { if (values[0] == NULL) { if (show_progress) { - HDprintf(" ERROR: aws_region value cannot be NULL\n"); + printf(" ERROR: aws_region value cannot be NULL\n"); } ret_value = 0; goto done; } if (values[1] == NULL) { if (show_progress) { - HDprintf(" ERROR: secret_id value cannot be NULL\n"); + printf(" ERROR: secret_id value cannot be NULL\n"); } ret_value = 0; goto done; } if (values[2] == NULL) { if (show_progress) { - HDprintf(" ERROR: secret_key value cannot be NULL\n"); + printf(" ERROR: secret_key value cannot be NULL\n"); } ret_value = 0; goto done; @@ -1181,48 +1181,48 @@ h5tools_populate_ros3_fapl(H5FD_ros3_fapl_t *fa, const char **values) if (*values[0] != '\0' && *values[1] != '\0') { if (HDstrlen(values[0]) > H5FD_ROS3_MAX_REGION_LEN) { if (show_progress) { - HDprintf(" ERROR: aws_region value too long\n"); + printf(" ERROR: aws_region value too long\n"); } ret_value = 0; goto done; } HDmemcpy(fa->aws_region, values[0], (HDstrlen(values[0]) + 1)); if (show_progress) { - HDprintf(" aws_region set\n"); + printf(" aws_region set\n"); } if (HDstrlen(values[1]) > H5FD_ROS3_MAX_SECRET_ID_LEN) { if (show_progress) { - HDprintf(" ERROR: secret_id value too long\n"); + printf(" ERROR: secret_id value too long\n"); } ret_value = 0; goto done; } HDmemcpy(fa->secret_id, values[1], (HDstrlen(values[1]) + 1)); if (show_progress) { - HDprintf(" secret_id set\n"); + printf(" secret_id set\n"); } if (HDstrlen(values[2]) > H5FD_ROS3_MAX_SECRET_KEY_LEN) { if (show_progress) { - HDprintf(" ERROR: secret_key value too long\n"); + printf(" ERROR: secret_key value too long\n"); } ret_value = 0; goto done; } HDmemcpy(fa->secret_key, values[2], (HDstrlen(values[2]) + 1)); if (show_progress) { - HDprintf(" secret_key set\n"); + printf(" secret_key set\n"); } fa->authenticate = TRUE; if (show_progress) { - HDprintf(" set to authenticate\n"); + printf(" set to authenticate\n"); } } else if (*values[0] != '\0' || *values[1] != '\0' || *values[2] != '\0') { if (show_progress) { - HDprintf(" ERROR: invalid assortment of empty/non-empty values\n"); + printf(" ERROR: invalid assortment of empty/non-empty values\n"); } ret_value = 0; goto done; diff --git a/tools/lib/h5trav.c b/tools/lib/h5trav.c index b55d1f5..4ee2914 100644 --- a/tools/lib/h5trav.c +++ b/tools/lib/h5trav.c @@ -814,14 +814,14 @@ trav_attr(hid_t const char *buf = op_data->path; if ((strlen(buf) == 1) && (*buf == '/')) - HDprintf(" %-10s %s%s", "attribute", buf, attr_name); + printf(" %-10s %s%s", "attribute", buf, attr_name); else - HDprintf(" %-10s %s/%s", "attribute", buf, attr_name); + printf(" %-10s %s/%s", "attribute", buf, attr_name); #ifdef H5TRAV_PRINT_SPACE if (trav_verbosity < 2) { #endif - HDprintf("\n"); + printf("\n"); #ifdef H5TRAV_PRINT_SPACE } else { @@ -841,26 +841,26 @@ trav_attr(hid_t switch (space_type) { case H5S_SCALAR: /* scalar dataspace */ - HDprintf(" scalar\n"); + printf(" scalar\n"); break; case H5S_SIMPLE: /* simple dataspace */ - HDprintf(" {"); + printf(" {"); for (i = 0; i < ndims; i++) { - HDprintf("%s%" PRIuHSIZE, i ? ", " : "", size[i]); + printf("%s%" PRIuHSIZE, i ? ", " : "", size[i]); } - HDprintf("}\n"); + printf("}\n"); break; case H5S_NULL: /* null dataspace */ - HDprintf(" null\n"); + printf(" null\n"); break; default: /* Unknown dataspace type */ - HDprintf(" unknown\n"); + printf(" unknown\n"); break; } /* end switch */ @@ -892,22 +892,22 @@ trav_print_visit_obj(const char *path, const H5O_info2_t *oinfo, const char *alr */ switch (oinfo->type) { case H5O_TYPE_GROUP: - HDprintf(" %-10s %s", "group", path); + printf(" %-10s %s", "group", path); break; case H5O_TYPE_DATASET: - HDprintf(" %-10s %s", "dataset", path); + printf(" %-10s %s", "dataset", path); break; case H5O_TYPE_NAMED_DATATYPE: - HDprintf(" %-10s %s", "datatype", path); + printf(" %-10s %s", "datatype", path); break; case H5O_TYPE_MAP: case H5O_TYPE_UNKNOWN: case H5O_TYPE_NTYPES: default: - HDprintf(" %-10s %s", "unknown object type", path); + printf(" %-10s %s", "unknown object type", path); break; } /* end switch */ @@ -917,14 +917,14 @@ trav_print_visit_obj(const char *path, const H5O_info2_t *oinfo, const char *alr op_data.path = path; /* Finish printing line about object */ - HDprintf("\n"); + printf("\n"); if (trav_verbosity > 0) H5Aiterate_by_name(print_udata->fid, path, trav_index_by, trav_index_order, NULL, trav_attr, &op_data, H5P_DEFAULT); } else /* Print the link's original name */ - HDprintf(" -> %s\n", already_visited); + printf(" -> %s\n", already_visited); return (0); } /* end trav_print_visit_obj() */ @@ -951,12 +951,12 @@ trav_print_visit_lnk(const char *path, const H5L_info2_t *linfo, void *udata) if (targbuf) { if (H5Lget_val(print_udata->fid, path, targbuf, linfo->u.val_size + 1, H5P_DEFAULT) < 0) targbuf[0] = 0; - HDprintf(" %-10s %s -> %s\n", "link", path, targbuf); + printf(" %-10s %s -> %s\n", "link", path, targbuf); HDfree(targbuf); } } /* end if */ else - HDprintf(" %-10s %s ->\n", "link", path); + printf(" %-10s %s ->\n", "link", path); break; case H5L_TYPE_EXTERNAL: @@ -970,12 +970,12 @@ trav_print_visit_lnk(const char *path, const H5L_info2_t *linfo, void *udata) if (H5Lget_val(print_udata->fid, path, targbuf, linfo->u.val_size + 1, H5P_DEFAULT) < 0) targbuf[0] = 0; if (H5Lunpack_elink_val(targbuf, linfo->u.val_size, NULL, &filename, &objname) >= 0) - HDprintf(" %-10s %s -> %s %s\n", "ext link", path, filename, objname); + printf(" %-10s %s -> %s %s\n", "ext link", path, filename, objname); HDfree(targbuf); } } /* end if */ else - HDprintf(" %-10s %s ->\n", "ext link", path); + printf(" %-10s %s ->\n", "ext link", path); break; case H5L_TYPE_HARD: @@ -985,7 +985,7 @@ trav_print_visit_lnk(const char *path, const H5L_info2_t *linfo, void *udata) case H5L_TYPE_ERROR: case H5L_TYPE_MAX: default: - HDprintf(" %-10s %s -> ???\n", "unknown type of UD link", path); + printf(" %-10s %s -> ???\n", "unknown type of UD link", path); break; } /* end switch() */ diff --git a/tools/lib/io_timer.c b/tools/lib/io_timer.c index d565264..17d20f5 100644 --- a/tools/lib/io_timer.c +++ b/tools/lib/io_timer.c @@ -158,7 +158,7 @@ io_time_set(io_time_t *pt, timer_type t, int start_stop) break; #else case MPI_CLOCK: - HDfprintf(stderr, "MPI clock set in serial library\n"); + fprintf(stderr, "MPI clock set in serial library\n"); return NULL; #endif /* H5_HAVE_PARALLEL */ case SYS_CLOCK: @@ -192,7 +192,7 @@ io_time_set(io_time_t *pt, timer_type t, int start_stop) break; default: - HDfprintf(stderr, "Unknown time clock type (%d)\n", pt->type); + fprintf(stderr, "Unknown time clock type (%d)\n", pt->type); return NULL; } /* end switch */ diff --git a/tools/libtest/h5tools_test_utils.c b/tools/libtest/h5tools_test_utils.c index 5fc5dc1..d59978b 100644 --- a/tools/libtest/h5tools_test_utils.c +++ b/tools/libtest/h5tools_test_utils.c @@ -100,7 +100,7 @@ H5_GCC_CLANG_DIAG_OFF("format") */ #define JSFAILED_AT() \ { \ - HDprintf("*FAILED* at %s:%d in %s()...\n", __FILE__, __LINE__, __func__); \ + printf("*FAILED* at %s:%d in %s()...\n", __FILE__, __LINE__, __func__); \ } /*---------------------------------------------------------------------------- @@ -189,10 +189,10 @@ H5_GCC_CLANG_DIAG_OFF("format") { \ JSFAILED_AT() \ if (reason != NULL) { \ - HDprintf("%s\n", (reason)); \ + printf("%s\n", (reason)); \ } \ else { \ - HDprintf(" ! Expected %ld\n ! Actual %ld\n", (long)(expected), (long)(actual)); \ + printf(" ! Expected %ld\n ! Actual %ld\n", (long)(expected), (long)(actual)); \ } \ } @@ -228,10 +228,10 @@ H5_GCC_CLANG_DIAG_OFF("format") { \ JSFAILED_AT() \ if ((reason) != NULL) { \ - HDprintf("%s\n", (reason)); \ + printf("%s\n", (reason)); \ } \ else { \ - HDprintf("!!! Expected:\n%s\n!!!Actual:\n%s\n", (expected), (actual)); \ + printf("!!! Expected:\n%s\n!!!Actual:\n%s\n", (expected), (actual)); \ } \ } @@ -536,7 +536,7 @@ test_parse_tuple(void) assert(cpy == NULL); tc = cases[i]; if (show_progress == TRUE) { - HDprintf("testing %d: %s...\n", i, tc.test_msg); + printf("testing %d: %s...\n", i, tc.test_msg); } /* VERIFY @@ -635,7 +635,7 @@ test_populate_ros3_fa(void) const char *values[] = {"x", "y", "z"}; if (show_progress) { - HDprintf("NULL fapl pointer\n"); + printf("NULL fapl pointer\n"); } JSVERIFY(0, h5tools_populate_ros3_fapl(NULL, values), "fapl pointer cannot be null") @@ -647,7 +647,7 @@ test_populate_ros3_fa(void) H5FD_ros3_fapl_t fa = {bad_version, TRUE, "u", "v", "w"}; if (show_progress) { - HDprintf("NULL values pointer\n"); + printf("NULL values pointer\n"); } JSVERIFY(1, h5tools_populate_ros3_fapl(&fa, NULL), "NULL values pointer yields \"default\" fapl") @@ -666,7 +666,7 @@ test_populate_ros3_fa(void) const char *values[] = {"", "", ""}; if (show_progress) { - HDprintf("all empty values\n"); + printf("all empty values\n"); } JSVERIFY(1, h5tools_populate_ros3_fapl(&fa, values), "empty values yields \"default\" fapl") @@ -685,7 +685,7 @@ test_populate_ros3_fa(void) const char *values[] = {"x", "y", "z", "a"}; if (show_progress) { - HDprintf("successful full set\n"); + printf("successful full set\n"); } JSVERIFY(1, h5tools_populate_ros3_fapl(&fa, values), "four values") @@ -704,7 +704,7 @@ test_populate_ros3_fa(void) const char *values[] = {NULL, "y", "z", NULL}; if (show_progress) { - HDprintf("NULL region\n"); + printf("NULL region\n"); } JSVERIFY(0, h5tools_populate_ros3_fapl(&fa, values), "could not fill fapl") @@ -723,7 +723,7 @@ test_populate_ros3_fa(void) const char *values[] = {"", "y", "z", NULL}; if (show_progress) { - HDprintf("empty region; non-empty id, key\n"); + printf("empty region; non-empty id, key\n"); } JSVERIFY(0, h5tools_populate_ros3_fapl(&fa, values), "could not fill fapl") @@ -744,7 +744,7 @@ test_populate_ros3_fa(void) "y", "z"}; if (show_progress) { - HDprintf("region overflow\n"); + printf("region overflow\n"); } assert(HDstrlen(values[0]) > H5FD_ROS3_MAX_REGION_LEN); @@ -765,7 +765,7 @@ test_populate_ros3_fa(void) const char *values[] = {"x", NULL, "z", NULL}; if (show_progress) { - HDprintf("NULL id\n"); + printf("NULL id\n"); } JSVERIFY(0, h5tools_populate_ros3_fapl(&fa, values), "could not fill fapl") @@ -784,7 +784,7 @@ test_populate_ros3_fa(void) const char *values[] = {"x", "", "z", NULL}; if (show_progress) { - HDprintf("empty id; non-empty region and key\n"); + printf("empty id; non-empty region and key\n"); } JSVERIFY(0, h5tools_populate_ros3_fapl(&fa, values), "could not fill fapl") @@ -814,7 +814,7 @@ test_populate_ros3_fa(void) "z"}; if (show_progress) { - HDprintf("id overflow\n"); + printf("id overflow\n"); } assert(HDstrlen(values[1]) > H5FD_ROS3_MAX_SECRET_ID_LEN); @@ -835,7 +835,7 @@ test_populate_ros3_fa(void) const char *values[] = {"x", "y", NULL, NULL}; if (show_progress) { - HDprintf("NULL key\n"); + printf("NULL key\n"); } JSVERIFY(0, h5tools_populate_ros3_fapl(&fa, values), "could not fill fapl") @@ -854,7 +854,7 @@ test_populate_ros3_fa(void) const char *values[] = {"x", "y", "", NULL}; if (show_progress) { - HDprintf("empty key; non-empty region and id\n"); + printf("empty key; non-empty region and id\n"); } JSVERIFY(1, h5tools_populate_ros3_fapl(&fa, values), "could not fill fapl") @@ -873,7 +873,7 @@ test_populate_ros3_fa(void) const char *values[] = {"", "y", "", NULL}; if (show_progress) { - HDprintf("empty key and region; non-empty id\n"); + printf("empty key and region; non-empty id\n"); } JSVERIFY(0, h5tools_populate_ros3_fapl(&fa, values), "could not fill fapl") @@ -892,7 +892,7 @@ test_populate_ros3_fa(void) const char *values[] = {"x", "", "", NULL}; if (show_progress) { - HDprintf("empty key and id; non-empty region\n"); + printf("empty key and id; non-empty region\n"); } JSVERIFY(0, h5tools_populate_ros3_fapl(&fa, values), "could not fill fapl") @@ -921,7 +921,7 @@ test_populate_ros3_fa(void) "Can you separate the various parts of the problem?"}; if (show_progress) { - HDprintf("key overflow\n"); + printf("key overflow\n"); } assert(HDstrlen(values[2]) > H5FD_ROS3_MAX_SECRET_KEY_LEN); @@ -1134,7 +1134,7 @@ test_set_configured_fapl(void) fapl_id = H5I_INVALID_HID; #if UTIL_TEST_DEBUG - HDfprintf(stderr, "setup test %d\t%s\n", i, C.message); + fprintf(stderr, "setup test %d\t%s\n", i, C.message); fflush(stderr); #endif /* UTIL_TEST_DEBUG */ @@ -1148,7 +1148,7 @@ test_set_configured_fapl(void) } #if UTIL_TEST_DEBUG - HDfprintf(stderr, "before test\n"); + fprintf(stderr, "before test\n"); fflush(stderr); #endif /* UTIL_TEST_DEBUG */ @@ -1165,7 +1165,7 @@ test_set_configured_fapl(void) } #if UTIL_TEST_DEBUG - HDfprintf(stderr, "after test\n"); + fprintf(stderr, "after test\n"); fflush(stderr); #endif /* UTIL_TEST_DEBUG */ @@ -1176,13 +1176,13 @@ test_set_configured_fapl(void) fapl_id = H5I_INVALID_HID; #if UTIL_TEST_DEBUG - HDfprintf(stderr, "after cleanup\n"); + fprintf(stderr, "after cleanup\n"); fflush(stderr); #endif /* UTIL_TEST_DEBUG */ } #if UTIL_TEST_DEBUG - HDfprintf(stderr, "after loop\n"); + fprintf(stderr, "after loop\n"); fflush(stderr); #endif /* UTIL_TEST_DEBUG */ @@ -1195,7 +1195,7 @@ error: ***********/ #if UTIL_TEST_DEBUG - HDfprintf(stderr, "ERROR\n"); + fprintf(stderr, "ERROR\n"); fflush(stderr); #endif /* UTIL_TEST_DEBUG */ @@ -1234,18 +1234,18 @@ main(void) h5reset(); /* h5test? */ #endif /* _H5TEST_ */ - HDfprintf(stdout, "Testing h5tools_utils corpus.\n"); + fprintf(stdout, "Testing h5tools_utils corpus.\n"); nerrors += test_parse_tuple(); nerrors += test_populate_ros3_fa(); nerrors += test_set_configured_fapl(); if (nerrors > 0) { - HDfprintf(stdout, "***** %d h5tools_utils TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : ""); + fprintf(stdout, "***** %d h5tools_utils TEST%s FAILED! *****\n", nerrors, nerrors > 1 ? "S" : ""); nerrors = 1; } else { - HDfprintf(stdout, "All h5tools_utils tests passed\n"); + fprintf(stdout, "All h5tools_utils tests passed\n"); } return (int)nerrors; diff --git a/tools/src/h5copy/h5copy.c b/tools/src/h5copy/h5copy.c index 43b78b3..62a3905 100644 --- a/tools/src/h5copy/h5copy.c +++ b/tools/src/h5copy/h5copy.c @@ -369,10 +369,10 @@ main(int argc, char *argv[]) *-------------------------------------------------------------------------*/ if (verbose) { - HDprintf("Copying file <%s> and object <%s> to file <%s> and object <%s>\n", fname_src, oname_src, - fname_dst, oname_dst); + printf("Copying file <%s> and object <%s> to file <%s> and object <%s>\n", fname_src, oname_src, + fname_dst, oname_dst); if (flag) { - HDprintf("Using %s flag\n", str_flag); + printf("Using %s flag\n", str_flag); } } @@ -406,7 +406,7 @@ main(int argc, char *argv[]) /* Display some output if requested */ if (verbose) - HDprintf("%s: Creating parent groups\n", h5tools_getprogname()); + printf("%s: Creating parent groups\n", h5tools_getprogname()); } /* end if */ else { /* error, if parent groups doesn't already exist in destination file */ @@ -475,7 +475,7 @@ main(int argc, char *argv[]) leave(EXIT_SUCCESS); done: - HDprintf("Error in copy...Exiting\n"); + printf("Error in copy...Exiting\n"); /* free link info path */ if (linkinfo.trg_path) 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"); } } diff --git a/tools/src/h5dump/h5dump.c b/tools/src/h5dump/h5dump.c index 2a5eeb7..6b1d520 100644 --- a/tools/src/h5dump/h5dump.c +++ b/tools/src/h5dump/h5dump.c @@ -1232,11 +1232,11 @@ end_collect: errno = 0; onion_fa_g.revision_num = HDstrtoull(vfd_info_g.info, NULL, 10); if (errno == ERANGE) { - HDprintf("Invalid onion revision specified\n"); + printf("Invalid onion revision specified\n"); goto error; } - HDprintf("Using revision %" PRIu64 "\n", onion_fa_g.revision_num); + printf("Using revision %" PRIu64 "\n", onion_fa_g.revision_num); } } else @@ -1374,7 +1374,7 @@ main(int argc, char *argv[]) goto done; } - HDprintf("The number of revisions for the onion file is %" PRIu64 "\n", revision_count); + printf("The number of revisions for the onion file is %" PRIu64 "\n", revision_count); goto done; } else diff --git a/tools/src/h5format_convert/h5format_convert.c b/tools/src/h5format_convert/h5format_convert.c index 82f91e7..ac98b25 100644 --- a/tools/src/h5format_convert/h5format_convert.c +++ b/tools/src/h5format_convert/h5format_convert.c @@ -55,31 +55,31 @@ static struct h5_long_options l_opts[] = {{"help", no_arg, 'h'}, {"version", static void usage(const char *prog) { - HDfprintf(stdout, "usage: %s [OPTIONS] file_name\n", prog); - HDfprintf(stdout, " OPTIONS\n"); - HDfprintf(stdout, " -h, --help Print a usage message and exit\n"); - HDfprintf(stdout, " -V, --version Print version number and exit\n"); - HDfprintf(stdout, " -v, --verbose Turn on verbose mode\n"); - HDfprintf(stdout, " -d dname, --dname=dataset_name Pathname for the dataset\n"); - HDfprintf(stdout, " -n, --noop Perform all the steps except the actual conversion\n"); - HDfprintf(stdout, "\n"); - HDfprintf(stdout, "Examples of use:\n"); - HDfprintf(stdout, "\n"); - HDfprintf(stdout, "h5format_convert -d /group/dataset file_name\n"); - HDfprintf(stdout, " Convert the dataset </group/dataset> in the HDF5 file <file_name>:\n"); - HDfprintf(stdout, " a. chunked dataset: convert the chunk indexing type to version 1 B-tree\n"); - HDfprintf(stdout, " b. compact/contiguous dataset: downgrade the layout version to 3\n"); - HDfprintf(stdout, " c. virtual dataset: no action\n"); - HDfprintf(stdout, "\n"); - HDfprintf(stdout, "h5format_convert file_name\n"); - HDfprintf(stdout, " Convert all datasets in the HDF5 file <file_name>:\n"); - HDfprintf(stdout, " a. chunked dataset: convert the chunk indexing type to version 1 B-tree\n"); - HDfprintf(stdout, " b. compact/contiguous dataset: downgrade the layout version to 3\n"); - HDfprintf(stdout, " c. virtual dataset: no action\n"); - HDfprintf(stdout, "\n"); - HDfprintf(stdout, "h5format_convert -n -d /group/dataset file_name\n"); - HDfprintf(stdout, " Go through all the steps except the actual conversion when \n"); - HDfprintf(stdout, " converting the dataset </group/dataset> in the HDF5 file <file_name>.\n"); + fprintf(stdout, "usage: %s [OPTIONS] file_name\n", prog); + fprintf(stdout, " OPTIONS\n"); + fprintf(stdout, " -h, --help Print a usage message and exit\n"); + fprintf(stdout, " -V, --version Print version number and exit\n"); + fprintf(stdout, " -v, --verbose Turn on verbose mode\n"); + fprintf(stdout, " -d dname, --dname=dataset_name Pathname for the dataset\n"); + fprintf(stdout, " -n, --noop Perform all the steps except the actual conversion\n"); + fprintf(stdout, "\n"); + fprintf(stdout, "Examples of use:\n"); + fprintf(stdout, "\n"); + fprintf(stdout, "h5format_convert -d /group/dataset file_name\n"); + fprintf(stdout, " Convert the dataset </group/dataset> in the HDF5 file <file_name>:\n"); + fprintf(stdout, " a. chunked dataset: convert the chunk indexing type to version 1 B-tree\n"); + fprintf(stdout, " b. compact/contiguous dataset: downgrade the layout version to 3\n"); + fprintf(stdout, " c. virtual dataset: no action\n"); + fprintf(stdout, "\n"); + fprintf(stdout, "h5format_convert file_name\n"); + fprintf(stdout, " Convert all datasets in the HDF5 file <file_name>:\n"); + fprintf(stdout, " a. chunked dataset: convert the chunk indexing type to version 1 B-tree\n"); + fprintf(stdout, " b. compact/contiguous dataset: downgrade the layout version to 3\n"); + fprintf(stdout, " c. virtual dataset: no action\n"); + fprintf(stdout, "\n"); + fprintf(stdout, "h5format_convert -n -d /group/dataset file_name\n"); + fprintf(stdout, " Go through all the steps except the actual conversion when \n"); + fprintf(stdout, " converting the dataset </group/dataset> in the HDF5 file <file_name>.\n"); } /* usage() */ /*------------------------------------------------------------------------- @@ -214,7 +214,7 @@ convert(hid_t fid, const char *dname) goto error; } else if (verbose_g) - HDfprintf(stdout, "Open the dataset\n"); + fprintf(stdout, "Open the dataset\n"); /* Get the dataset's creation property list */ if ((dcpl = H5Dget_create_plist(did)) < 0) { @@ -230,12 +230,12 @@ convert(hid_t fid, const char *dname) goto error; } else if (verbose_g) - HDfprintf(stdout, "Retrieve the dataset's layout\n"); + fprintf(stdout, "Retrieve the dataset's layout\n"); switch (layout_type) { case H5D_CHUNKED: if (verbose_g) - HDfprintf(stdout, "Dataset is a chunked dataset\n"); + fprintf(stdout, "Dataset is a chunked dataset\n"); /* Get the dataset's chunk indexing type */ if (H5Dget_chunk_index_type(did, &idx_type) < 0) { @@ -244,34 +244,33 @@ convert(hid_t fid, const char *dname) goto error; } else if (verbose_g) - HDfprintf(stdout, "Retrieve the dataset's chunk indexing type\n"); + fprintf(stdout, "Retrieve the dataset's chunk indexing type\n"); if (idx_type == H5D_CHUNK_IDX_BTREE) { if (verbose_g) - HDfprintf( - stdout, - "Dataset's chunk indexing type is already version 1 B-tree: no further action\n"); + fprintf(stdout, + "Dataset's chunk indexing type is already version 1 B-tree: no further action\n"); h5tools_setstatus(EXIT_SUCCESS); goto done; } else if (verbose_g) - HDfprintf(stdout, "Dataset's chunk indexing type is not version 1 B-tree\n"); + fprintf(stdout, "Dataset's chunk indexing type is not version 1 B-tree\n"); break; case H5D_CONTIGUOUS: if (verbose_g) - HDfprintf(stdout, "Dataset is a contiguous dataset: downgrade layout version as needed\n"); + fprintf(stdout, "Dataset is a contiguous dataset: downgrade layout version as needed\n"); break; case H5D_COMPACT: if (verbose_g) - HDfprintf(stdout, "Dataset is a compact dataset: downgrade layout version as needed\n"); + fprintf(stdout, "Dataset is a compact dataset: downgrade layout version as needed\n"); break; case H5D_VIRTUAL: if (verbose_g) - HDfprintf(stdout, "No further action for virtual dataset\n"); + fprintf(stdout, "No further action for virtual dataset\n"); goto done; case H5D_NLAYOUTS: @@ -286,13 +285,13 @@ convert(hid_t fid, const char *dname) /* No further action if it is a noop */ if (noop_g) { if (verbose_g) - HDfprintf(stdout, "Not converting the dataset\n"); + fprintf(stdout, "Not converting the dataset\n"); h5tools_setstatus(EXIT_SUCCESS); goto done; } if (verbose_g) - HDfprintf(stdout, "Converting the dataset...\n"); + fprintf(stdout, "Converting the dataset...\n"); /* Downgrade the dataset */ if (H5Dformat_convert(did) < 0) { @@ -301,7 +300,7 @@ convert(hid_t fid, const char *dname) goto error; } else if (verbose_g) - HDfprintf(stdout, "Done\n"); + fprintf(stdout, "Done\n"); done: /* Close the dataset */ @@ -311,7 +310,7 @@ done: goto error; } else if (verbose_g) - HDfprintf(stdout, "Close the dataset\n"); + fprintf(stdout, "Close the dataset\n"); /* Close the dataset creation property list */ if (H5Pclose(dcpl) < 0) { @@ -320,13 +319,13 @@ done: goto error; } else if (verbose_g) - HDprintf("Close the dataset creation property list\n"); + printf("Close the dataset creation property list\n"); return 0; error: if (verbose_g) - HDfprintf(stdout, "Error encountered\n"); + fprintf(stdout, "Error encountered\n"); H5E_BEGIN_TRY { @@ -357,7 +356,7 @@ convert_dsets_cb(const char *path, const H5O_info2_t *oi, const char *already_vi if (NULL == already_visited) { if (oi->type == H5O_TYPE_DATASET) { if (verbose_g) - HDfprintf(stdout, "Going to process dataset:%s...\n", path); + fprintf(stdout, "Going to process dataset:%s...\n", path); if (convert(fid, path) < 0) goto error; } /* end if */ @@ -395,10 +394,10 @@ main(int argc, char *argv[]) if (parse_command_line(argc, (const char *const *)argv) < 0) goto done; else if (verbose_g) - HDfprintf(stdout, "Process command line options\n"); + fprintf(stdout, "Process command line options\n"); if (noop_g && verbose_g) - HDfprintf(stdout, "It is noop...\n"); + fprintf(stdout, "It is noop...\n"); /* enable error reporting if command line option */ h5tools_error_report(); @@ -410,28 +409,28 @@ main(int argc, char *argv[]) goto done; } else if (verbose_g) - HDfprintf(stdout, "Open the file %s\n", fname_g); + fprintf(stdout, "Open the file %s\n", fname_g); if (dset_g) { /* Convert a specified dataset in the file */ if (verbose_g) - HDfprintf(stdout, "Going to process dataset: %s...\n", dname_g); + fprintf(stdout, "Going to process dataset: %s...\n", dname_g); if (convert(fid, dname_g) < 0) goto done; } else { /* Convert all datasets in the file */ if (verbose_g) - HDfprintf(stdout, "Processing all datasets in the file...\n"); + fprintf(stdout, "Processing all datasets in the file...\n"); if (h5trav_visit(fid, "/", TRUE, TRUE, convert_dsets_cb, NULL, &fid, H5O_INFO_BASIC) < 0) goto done; } /* end else */ if (verbose_g) { if (noop_g) { - HDfprintf(stdout, "Not processing the file's superblock...\n"); + fprintf(stdout, "Not processing the file's superblock...\n"); h5tools_setstatus(EXIT_SUCCESS); goto done; } /* end if */ - HDfprintf(stdout, "Processing the file's superblock...\n"); + fprintf(stdout, "Processing the file's superblock...\n"); } /* end if */ /* Process superblock */ @@ -449,7 +448,7 @@ done: h5tools_setstatus(EXIT_FAILURE); } else if (verbose_g) { - HDfprintf(stdout, "Close the file\n"); + fprintf(stdout, "Close the file\n"); } } /* end if */ diff --git a/tools/src/h5import/h5import.c b/tools/src/h5import/h5import.c index 428d32f..05f51e4 100644 --- a/tools/src/h5import/h5import.c +++ b/tools/src/h5import/h5import.c @@ -113,7 +113,7 @@ main(int argc, char *argv[]) * validate the number of command line arguments */ if (argc < 2) { - (void)HDfprintf(stderr, err1, argc); + (void)fprintf(stderr, err1, argc); usage(argv[0]); goto err; } @@ -140,7 +140,7 @@ main(int argc, char *argv[]) opt->fcount++; } else { - (void)HDfprintf(stderr, err9, argv[i]); + (void)fprintf(stderr, err9, argv[i]); goto err; } @@ -159,7 +159,7 @@ main(int argc, char *argv[]) case 5: /* get outfile found */ if (HDstrlen(argv[i]) > MAX_PATH_NAME_LENGTH) { - (void)HDfprintf(stderr, err10, argv[i]); + (void)fprintf(stderr, err10, argv[i]); goto err; } (void)HDstrcpy(opt->outfile, argv[i]); @@ -176,7 +176,7 @@ main(int argc, char *argv[]) case 8: /* read dimensions */ if (parseDimensions(in, argv[i]) == -1) { - (void)HDfprintf(stderr, err6, argv[i]); + (void)fprintf(stderr, err6, argv[i]); goto err; } break; @@ -186,7 +186,7 @@ main(int argc, char *argv[]) case 10: /* read path name */ if (parsePathInfo(&in->path, argv[i]) == -1) { - (void)HDfprintf(stderr, err5, argv[i]); + (void)fprintf(stderr, err5, argv[i]); goto err; } break; @@ -196,7 +196,7 @@ main(int argc, char *argv[]) case 12: /* read data type */ if (getInputClass(in, argv[i]) == -1) { - (void)HDfprintf(stderr, err7, argv[i]); + (void)fprintf(stderr, err7, argv[i]); goto err; } @@ -213,7 +213,7 @@ main(int argc, char *argv[]) case 14: /* read data size */ if (getInputSize(in, (int)HDstrtol(argv[i], NULL, BASE_10)) == -1) { - (void)HDfprintf(stderr, err8, argv[i]); + (void)fprintf(stderr, err8, argv[i]); goto err; } /*set default value for output-size */ @@ -222,14 +222,14 @@ main(int argc, char *argv[]) case ERR: /* command syntax error */ default: - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); usage(argv[0]); goto err; } } if (FALSE == outfile_named) { - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); usage(argv[0]); goto err; } @@ -256,7 +256,7 @@ main(int argc, char *argv[]) return EXIT_SUCCESS; err: - (void)HDfprintf(stderr, "%s", err4); + (void)fprintf(stderr, "%s", err4); for (i = 0; i < opt->fcount; i++) { in = &(opt->infiles[i].in); if (in->sizeOfDimension) @@ -329,7 +329,7 @@ gtoken(char *s) } if (token == ERR) - (void)HDfprintf(stderr, err1, s); + (void)fprintf(stderr, err1, s); } else { /* filename */ token = FILNAME; @@ -376,7 +376,7 @@ processDataFile(char *infile, struct Input *in, hid_t file_id) if (in->inputClass == 4 /* "IN" */ || in->inputClass == 3 /* "FP" */ || in->inputClass == 7 /* "UIN" */) { if ((strm = HDfopen(infile, READ_OPEN_FLAGS)) == NULL) { - (void)HDfprintf(stderr, err1, infile); + (void)fprintf(stderr, err1, infile); goto error; } } @@ -386,7 +386,7 @@ processDataFile(char *infile, struct Input *in, hid_t file_id) */ else { if ((strm = HDfopen(infile, "r")) == NULL) { - (void)HDfprintf(stderr, err1, infile); + (void)fprintf(stderr, err1, infile); goto error; } } @@ -395,12 +395,12 @@ processDataFile(char *infile, struct Input *in, hid_t file_id) case 0: /* TEXTIN */ case 4: /* IN */ if (allocateIntegerStorage(in) == -1) { - (void)HDfprintf(stderr, err2, infile); + (void)fprintf(stderr, err2, infile); goto error; } if (readIntegerData(strm, in) == -1) { - (void)HDfprintf(stderr, err4, infile); + (void)fprintf(stderr, err4, infile); goto error; } break; @@ -409,12 +409,12 @@ processDataFile(char *infile, struct Input *in, hid_t file_id) case 2: /* TEXTFPE */ case 3: /* FP */ if (allocateFloatStorage(in) == -1) { - (void)HDfprintf(stderr, err3, infile); + (void)fprintf(stderr, err3, infile); goto error; } if (readFloatData(strm, in) == -1) { - (void)HDfprintf(stderr, err5, infile); + (void)fprintf(stderr, err5, infile); goto error; } break; @@ -422,13 +422,13 @@ processDataFile(char *infile, struct Input *in, hid_t file_id) case 5: /* STR */ if (in->h5dumpInput) { if (processStrHDFData(strm, in, file_id) == -1) { - (void)HDfprintf(stderr, err11, infile); + (void)fprintf(stderr, err11, infile); goto error; } } else { if (processStrData(strm, in, file_id) == -1) { - (void)HDfprintf(stderr, err11, infile); + (void)fprintf(stderr, err11, infile); goto error; } } @@ -438,17 +438,17 @@ processDataFile(char *infile, struct Input *in, hid_t file_id) case 6: /* TEXTUIN */ case 7: /* UIN */ if (allocateUIntegerStorage(in) == -1) { - (void)HDfprintf(stderr, err6, infile); + (void)fprintf(stderr, err6, infile); goto error; } if (readUIntegerData(strm, in) == -1) { - (void)HDfprintf(stderr, err7, infile); + (void)fprintf(stderr, err7, infile); goto error; } break; default: - (void)HDfprintf(stderr, "%s", err10); + (void)fprintf(stderr, "%s", err10); goto error; } @@ -492,7 +492,7 @@ readIntegerData(FILE *strm, struct Input *in) in08 = (H5DT_INT8 *)in->data; for (i = 0; i < len; i++, in08++) { if (HDfscanf(strm, "%hd", &temp16) != 1) { - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } (*in08) = (H5DT_INT8)temp16; @@ -503,17 +503,17 @@ readIntegerData(FILE *strm, struct Input *in) in08 = (H5DT_INT8 *)in->data; for (i = 0; i < len; i++, in08++) { if (HDfread((char *)in08, sizeof(H5DT_INT8), 1, strm) != 1) { - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } #ifdef H5DEBUGIMPORT - HDprintf("readIntegerData %d (0x%.8X)\n", *in08, *in08); + printf("readIntegerData %d (0x%.8X)\n", *in08, *in08); #endif } break; default: - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } break; @@ -524,7 +524,7 @@ readIntegerData(FILE *strm, struct Input *in) case 0: /* TEXTIN */ for (i = 0; i < len; i++, in16++) { if (HDfscanf(strm, "%hd", in16) != 1) { - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } } @@ -534,7 +534,7 @@ readIntegerData(FILE *strm, struct Input *in) case 4: /* IN */ for (i = 0; i < len; i++, in16++) { if (HDfread((char *)&temp16, sizeof(H5DT_INT16), 1, strm) != 1) { - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } /* @@ -544,13 +544,13 @@ readIntegerData(FILE *strm, struct Input *in) */ *in16 = temp16; #ifdef H5DEBUGIMPORT - HDprintf("readIntegerData %d (0x%.8X)\n", *in16, temp16); + printf("readIntegerData %d (0x%.8X)\n", *in16, temp16); #endif } break; default: - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } break; @@ -561,7 +561,7 @@ readIntegerData(FILE *strm, struct Input *in) case 0: /* TEXTIN */ for (i = 0; i < len; i++, in32++) { if (HDfscanf(strm, "%d", in32) != 1) { - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } } @@ -570,7 +570,7 @@ readIntegerData(FILE *strm, struct Input *in) case 4: /* IN */ for (i = 0; i < len; i++, in32++) { if (HDfread((char *)&temp32, sizeof(H5DT_INT32), 1, strm) != 1) { - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } /* @@ -580,13 +580,13 @@ readIntegerData(FILE *strm, struct Input *in) */ *in32 = temp32; #ifdef H5DEBUGIMPORT - HDprintf("readIntegerData %d (0x%.8X = 0x%.8X)\n", *in32, *in32, temp32); + printf("readIntegerData %d (0x%.8X = 0x%.8X)\n", *in32, *in32, temp32); #endif } break; default: - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } break; @@ -597,7 +597,7 @@ readIntegerData(FILE *strm, struct Input *in) case 0: /* TEXTIN */ for (i = 0; i < len; i++, in64++) { if (HDfscanf(strm, "%s", buffer) < 1) { - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } *in64 = (H5DT_INT64)HDstrtoll(buffer, NULL, 10); @@ -607,7 +607,7 @@ readIntegerData(FILE *strm, struct Input *in) case 4: /* IN */ for (i = 0; i < len; i++, in64++) { if (HDfread((char *)&temp64, sizeof(H5DT_INT64), 1, strm) != 1) { - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } /* @@ -617,19 +617,19 @@ readIntegerData(FILE *strm, struct Input *in) */ *in64 = temp64; #ifdef H5DEBUGIMPORT - HDprintf("readIntegerData %d (0x%.8X)\n", *in64, temp64); + printf("readIntegerData %d (0x%.8X)\n", *in64, temp64); #endif } break; default: - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } break; default: - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); break; } return (0); @@ -663,7 +663,7 @@ readUIntegerData(FILE *strm, struct Input *in) in08 = (H5DT_UINT8 *)in->data; for (i = 0; i < len; i++, in08++) { if (HDfscanf(strm, "%hu", &temp16) != 1) { - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } (*in08) = (H5DT_UINT8)temp16; @@ -674,14 +674,14 @@ readUIntegerData(FILE *strm, struct Input *in) in08 = (H5DT_UINT8 *)in->data; for (i = 0; i < len; i++, in08++) { if (HDfread((char *)in08, sizeof(H5DT_UINT8), 1, strm) != 1) { - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } } break; default: - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } break; @@ -692,7 +692,7 @@ readUIntegerData(FILE *strm, struct Input *in) case 6: /* TEXTUIN */ for (i = 0; i < len; i++, in16++) { if (HDfscanf(strm, "%hu", in16) != 1) { - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } } @@ -701,7 +701,7 @@ readUIntegerData(FILE *strm, struct Input *in) case 7: /* UIN */ for (i = 0; i < len; i++, in16++) { if (HDfread((char *)&temp16, sizeof(H5DT_UINT16), 1, strm) != 1) { - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } /* @@ -711,13 +711,13 @@ readUIntegerData(FILE *strm, struct Input *in) */ *in16 = temp16; #ifdef H5DEBUGIMPORT - HDprintf("readUIntegerData %d (0x%.4X = 0x%.4X)\n", *in16, *in16, temp16); + printf("readUIntegerData %d (0x%.4X = 0x%.4X)\n", *in16, *in16, temp16); #endif } break; default: - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } break; @@ -728,7 +728,7 @@ readUIntegerData(FILE *strm, struct Input *in) case 6: /* TEXTUIN */ for (i = 0; i < len; i++, in32++) { if (HDfscanf(strm, "%u", in32) != 1) { - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } } @@ -737,7 +737,7 @@ readUIntegerData(FILE *strm, struct Input *in) case 7: /* UIN */ for (i = 0; i < len; i++, in32++) { if (HDfread((char *)&temp32, sizeof(H5DT_UINT32), 1, strm) != 1) { - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } /* @@ -747,13 +747,13 @@ readUIntegerData(FILE *strm, struct Input *in) */ *in32 = temp32; #ifdef H5DEBUGIMPORT - HDprintf("readUIntegerData %d (0x%.8X = 0x%.8X)\n", *in32, *in32, temp32); + printf("readUIntegerData %d (0x%.8X = 0x%.8X)\n", *in32, *in32, temp32); #endif } break; default: - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } break; @@ -764,7 +764,7 @@ readUIntegerData(FILE *strm, struct Input *in) case 6: /* TEXTUIN */ for (i = 0; i < len; i++, in64++) { if (HDfscanf(strm, "%s", buffer) < 1) { - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } *in64 = (H5DT_UINT64)HDstrtoll(buffer, NULL, 10); @@ -774,7 +774,7 @@ readUIntegerData(FILE *strm, struct Input *in) case 7: /* UIN */ for (i = 0; i < len; i++, in64++) { if (HDfread((char *)&temp64, sizeof(H5DT_UINT64), 1, strm) != 1) { - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } /* @@ -784,19 +784,19 @@ readUIntegerData(FILE *strm, struct Input *in) */ *in64 = temp64; #ifdef H5DEBUGIMPORT - HDprintf("readUIntegerData %ld (0x%.8X = 0x%.8X)\n", *in64, *in64, temp64); + printf("readUIntegerData %ld (0x%.8X = 0x%.8X)\n", *in64, *in64, temp64); #endif } break; default: - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } break; default: - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); break; } return (0); @@ -829,7 +829,7 @@ readFloatData(FILE *strm, struct Input *in) case 1: /* TEXTFP */ for (i = 0; i < len; i++, fp32++) { if (HDfscanf(strm, "%f", fp32) != 1) { - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } } @@ -842,7 +842,7 @@ readFloatData(FILE *strm, struct Input *in) for (i = 0; i < len; i++, fp32++) { if (HDfscanf(strm, "%f", fp32) != 1) { - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } } @@ -854,7 +854,7 @@ readFloatData(FILE *strm, struct Input *in) bfp32 = (uint32_t *)in->data; for (i = 0; i < len; i++, bfp32++) { if (HDfread((char *)&temp32, sizeof(uint32_t), 1, strm) != 1) { - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } /* @@ -864,13 +864,13 @@ readFloatData(FILE *strm, struct Input *in) */ *bfp32 = temp32; #ifdef H5DEBUGIMPORT - HDprintf("readFloatData %ld (0x%.8X = 0x%.8X)\n", *bfp32, *bfp32, temp32); + printf("readFloatData %ld (0x%.8X = 0x%.8X)\n", *bfp32, *bfp32, temp32); #endif } break; default: - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } break; @@ -881,7 +881,7 @@ readFloatData(FILE *strm, struct Input *in) case 1: /* TEXTFP */ for (i = 0; i < len; i++, fp64++) { if (HDfscanf(strm, "%lf", fp64) != 1) { - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } } @@ -894,7 +894,7 @@ readFloatData(FILE *strm, struct Input *in) for (i = 0; i < len; i++, fp64++) { if (HDfscanf(strm, "%lf", fp64) != 1) { - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } } @@ -906,7 +906,7 @@ readFloatData(FILE *strm, struct Input *in) bfp64 = (uint64_t *)in->data; for (i = 0; i < len; i++, bfp64++) { if (HDfread((char *)&temp64, sizeof(uint64_t), 1, strm) != 1) { - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } /* @@ -916,19 +916,19 @@ readFloatData(FILE *strm, struct Input *in) */ *bfp64 = temp64; #ifdef H5DEBUGIMPORT - HDprintf("readFloatData %ld (0x%.16lX)\n", *bfp64, temp64); + printf("readFloatData %ld (0x%.16lX)\n", *bfp64, temp64); #endif } break; default: - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } break; default: - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); break; } return (0); @@ -1111,7 +1111,7 @@ processStrHDFData(FILE *strm, struct Input *in, hid_t file_id) *------------------------------------------------------------------------- */ #ifdef H5DEBUGIMPORT - HDprintf("processStrHDFData DATATYPE STRING\n"); + printf("processStrHDFData DATATYPE STRING\n"); #endif if ((type_id = H5Tcopy(H5T_C_S1)) < 0) @@ -1149,7 +1149,7 @@ processStrHDFData(FILE *strm, struct Input *in, hid_t file_id) } H5E_END_TRY #ifdef H5DEBUGIMPORT - HDprintf("processStrHDFData DATATYPE STRING groups created\n"); + printf("processStrHDFData DATATYPE STRING groups created\n"); #endif if ((space_id = H5Screate_simple(in->rank, in->sizeOfDimension, NULL)) < 0) @@ -1163,7 +1163,7 @@ processStrHDFData(FILE *strm, struct Input *in, hid_t file_id) goto out; #ifdef H5DEBUGIMPORT - HDprintf("processStrHDFData DATATYPE STRING ready to process strings\n"); + printf("processStrHDFData DATATYPE STRING ready to process strings\n"); #endif line = 0; j = 0; @@ -1173,27 +1173,27 @@ processStrHDFData(FILE *strm, struct Input *in, hid_t file_id) str2 = NULL; str3 = NULL; #ifdef H5DEBUGIMPORT - HDprintf("processStrHDFData DATATYPE STRING[%llu]={%s}\n", (unsigned long long)line, str1); + printf("processStrHDFData DATATYPE STRING[%llu]={%s}\n", (unsigned long long)line, str1); #endif /* process string to remove the first and last quote char */ str2 = strchr(str1, '"'); if (str2 != NULL) { #ifdef H5DEBUGIMPORT - HDprintf("processStrHDFData DATATYPE STRING len:%d for {%s}\n", HDstrlen(str2), str2); + printf("processStrHDFData DATATYPE STRING len:%d for {%s}\n", HDstrlen(str2), str2); #endif str2++; #ifdef H5DEBUGIMPORT - HDprintf("processStrHDFData DATATYPE STRING len:%d for {%s}\n", HDstrlen(str2), str2); + printf("processStrHDFData DATATYPE STRING len:%d for {%s}\n", HDstrlen(str2), str2); #endif str3 = strrchr(str2, '"'); if (str3 != NULL) { #ifdef H5DEBUGIMPORT - HDprintf("processStrHDFData DATATYPE STRING len:%d for {%s}\n", HDstrlen(str3), str3); + printf("processStrHDFData DATATYPE STRING len:%d for {%s}\n", HDstrlen(str3), str3); #endif *str3 = '\0'; #ifdef H5DEBUGIMPORT - HDprintf("processStrHDFData DATATYPE STRING len:%d for {%s}\n", HDstrlen(str2), str2); + printf("processStrHDFData DATATYPE STRING len:%d for {%s}\n", HDstrlen(str2), str2); #endif if (HDstrlen(str2) > 0) { @@ -1202,8 +1202,8 @@ processStrHDFData(FILE *strm, struct Input *in, hid_t file_id) hsize_t count[1] = {1}; #ifdef H5DEBUGIMPORT - HDprintf("processStrHDFData DATATYPE STRING[%llu] store %s\n", (unsigned long long)line, - str2); + printf("processStrHDFData DATATYPE STRING[%llu] store %s\n", (unsigned long long)line, + str2); #endif if ((fspace_id = H5Dget_space(dset_id)) < 0) goto out; @@ -1225,7 +1225,7 @@ processStrHDFData(FILE *strm, struct Input *in, hid_t file_id) j++; } #ifdef H5DEBUGIMPORT - HDprintf("processStrHDFData DATATYPE STRING eof reached\n"); + printf("processStrHDFData DATATYPE STRING eof reached\n"); #endif /* close */ @@ -1238,7 +1238,7 @@ processStrHDFData(FILE *strm, struct Input *in, hid_t file_id) out: #ifdef H5DEBUGIMPORT - HDprintf("processStrHDFData DATATYPE STRING error exit\n"); + printf("processStrHDFData DATATYPE STRING error exit\n"); #endif /* disable error reporting */ H5E_BEGIN_TRY @@ -1268,34 +1268,34 @@ allocateIntegerStorage(struct Input *in) switch (in->inputSize) { case 8: if ((in->data = (VOIDP)HDmalloc((size_t)len * sizeof(H5DT_INT8))) == NULL) { - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } break; case 16: if ((in->data = (VOIDP)HDmalloc((size_t)len * sizeof(H5DT_INT16))) == NULL) { - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } break; case 32: if ((in->data = (VOIDP)HDmalloc((size_t)len * sizeof(H5DT_INT32))) == NULL) { - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } break; case 64: if ((in->data = (VOIDP)HDmalloc((size_t)len * sizeof(H5DT_INT64))) == NULL) { - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } break; default: - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); break; } return (0); @@ -1315,34 +1315,34 @@ allocateUIntegerStorage(struct Input *in) switch (in->inputSize) { case 8: if ((in->data = (VOIDP)HDmalloc((size_t)len * sizeof(H5DT_UINT8))) == NULL) { - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } break; case 16: if ((in->data = (VOIDP)HDmalloc((size_t)len * sizeof(H5DT_UINT16))) == NULL) { - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } break; case 32: if ((in->data = (VOIDP)HDmalloc((size_t)len * sizeof(H5DT_UINT32))) == NULL) { - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } break; case 64: if ((in->data = (VOIDP)HDmalloc((size_t)len * sizeof(H5DT_UINT64))) == NULL) { - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } break; default: - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); break; } return (0); @@ -1362,20 +1362,20 @@ allocateFloatStorage(struct Input *in) switch (in->inputSize) { case 32: if ((in->data = (VOIDP)HDmalloc((size_t)len * sizeof(H5DT_FLOAT32))) == NULL) { - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } break; case 64: if ((in->data = (VOIDP)HDmalloc((size_t)len * sizeof(H5DT_FLOAT64))) == NULL) { - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } break; default: - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); break; } return (0); @@ -1446,24 +1446,24 @@ processConfigurationFile(char *infile, struct Input *in) /* 0 for big endian, 1 for little endian. */ if ((*((volatile uint8_t *)(&ibyte))) == 0x67) { if ((kindex = OutputByteOrderStrToInt("LE")) == -1) { - (void)HDfprintf(stderr, "%s", err11e); + (void)fprintf(stderr, "%s", err11e); return (-1); } } else { if ((kindex = OutputByteOrderStrToInt("BE")) == -1) { - (void)HDfprintf(stderr, "%s", err11e); + (void)fprintf(stderr, "%s", err11e); return (-1); } } in->inputByteOrder = kindex; #ifdef H5DEBUGIMPORT - HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder); + printf("h5dump inputByteOrder %d\n", in->inputByteOrder); #endif in->inputArchitecture = 0; /* default to NATIVE */ if ((strm = HDfopen(infile, "r")) == NULL) { - (void)HDfprintf(stderr, err1, infile); + (void)fprintf(stderr, err1, infile); goto error; } @@ -1471,7 +1471,7 @@ processConfigurationFile(char *infile, struct Input *in) if ((scanret == 1) && !HDstrcmp("HDF5", key)) { #ifdef H5DEBUGIMPORT int pndx; - HDprintf("\nh5dump file\n"); + printf("\nh5dump file\n"); #endif in->h5dumpInput = 1; scanret = HDfscanf(strm, "%254s", temp); /* filename */ @@ -1480,51 +1480,51 @@ processConfigurationFile(char *infile, struct Input *in) while (scanret == 1) { if (!HDstrcmp("DATASET", key)) { /* PATH */ #ifdef H5DEBUGIMPORT - HDprintf("h5dump DATASET key\n"); + printf("h5dump DATASET key\n"); #endif if (in->configOptionVector[PATH] == 1) { - (void)HDfprintf(stderr, err3a, infile); + (void)fprintf(stderr, err3a, infile); goto error; } if (HDfscanf(strm, "%254s", temp) != 1) { - (void)HDfprintf(stderr, "%s", err18); + (void)fprintf(stderr, "%s", err18); goto error; } #ifdef H5DEBUGIMPORT - HDprintf("h5dump DATASET %s found\n", temp); + printf("h5dump DATASET %s found\n", temp); #endif if (parsePathInfo(&in->path, temp) == -1) { - (void)HDfprintf(stderr, err3b, infile); + (void)fprintf(stderr, err3b, infile); goto error; } in->configOptionVector[PATH] = 1; scanret = HDfscanf(strm, "%254s", temp); /* start bracket */ #ifdef H5DEBUGIMPORT - HDprintf("h5dump DATASET %s found\n", temp); + printf("h5dump DATASET %s found\n", temp); #endif } /* if(!HDstrcmp("DATASET", key)) PATH */ else if (!HDstrcmp("DATATYPE", key)) { /* INPUT-CLASS */ #ifdef H5DEBUGIMPORT - HDprintf("h5dump DATATYPE key\n"); + printf("h5dump DATATYPE key\n"); #endif if (in->configOptionVector[INPUT_CLASS] == 1) { - (void)HDfprintf(stderr, err4a, infile); + (void)fprintf(stderr, err4a, infile); goto error; } if (HDfscanf(strm, "%254s", temp) != 1) { - (void)HDfprintf(stderr, "%s", err18); + (void)fprintf(stderr, "%s", err18); goto error; } #ifdef H5DEBUGIMPORT - HDprintf("h5dump DATATYPE %s found\n", temp); + printf("h5dump DATATYPE %s found\n", temp); #endif if ((kindex = getInputClassType(in, temp)) == -1) { - (void)HDfprintf(stderr, err4b, infile); + (void)fprintf(stderr, err4b, infile); goto error; } #ifdef H5DEBUGIMPORT - HDprintf("h5dump DATATYPE type %d inputClass\n", in->inputClass); + printf("h5dump DATATYPE type %d inputClass\n", in->inputClass); #endif in->configOptionVector[INPUT_CLASS] = 1; @@ -1539,80 +1539,80 @@ processConfigurationFile(char *infile, struct Input *in) in->outputClass = 2; } #ifdef H5DEBUGIMPORT - HDprintf("h5dump DATATYPE type %d outputClass\n", in->outputClass); + printf("h5dump DATATYPE type %d outputClass\n", in->outputClass); #endif if (in->inputClass == 5) { /* STRING */ int get_next_prop = 1; in->outputClass = -1; #ifdef H5DEBUGIMPORT - HDprintf("h5dump DATATYPE STRING found\n"); + printf("h5dump DATATYPE STRING found\n"); #endif if (HDfscanf(strm, "%254s", temp) != 1) { /* start bracket */ - (void)HDfprintf(stderr, "%s", err18); + (void)fprintf(stderr, "%s", err18); goto error; } #ifdef H5DEBUGIMPORT - HDprintf("h5dump DATATYPE STRING %s found\n", temp); + printf("h5dump DATATYPE STRING %s found\n", temp); #endif if (HDfscanf(strm, "%254s", temp) != 1) { /* string properties */ - (void)HDfprintf(stderr, "%s", err18); + (void)fprintf(stderr, "%s", err18); goto error; } while (get_next_prop) { if (!HDstrcmp("STRSIZE", temp)) { /* STRSIZE */ if (HDfscanf(strm, "%254s", temp) != 1) { - (void)HDfprintf(stderr, "%s", err19); + (void)fprintf(stderr, "%s", err19); goto error; } #ifdef H5DEBUGIMPORT - HDprintf("h5dump DATATYPE STRING STRSIZE %s found\n", temp); + printf("h5dump DATATYPE STRING STRSIZE %s found\n", temp); #endif if (HDstrcmp("H5T_VARIABLE;", temp) != 0) { char *more = temp; ival = (int)HDstrtol(more, &more, 10); if (getInputSize(in, ival) == -1) { - (void)HDfprintf(stderr, err5b, infile); + (void)fprintf(stderr, err5b, infile); goto error; } #ifdef H5DEBUGIMPORT - HDprintf("h5dump DATATYPE STRING %d InputSize\n", in->inputSize); + printf("h5dump DATATYPE STRING %d InputSize\n", in->inputSize); #endif } } else if (!HDstrcmp("STRPAD", temp)) { /* STRPAD */ if (HDfscanf(strm, "%254s", temp) != 1) { /* STRPAD type */ - (void)HDfprintf(stderr, "%s", err18); + (void)fprintf(stderr, "%s", err18); goto error; } #ifdef H5DEBUGIMPORT - HDprintf("h5dump DATATYPE STRING STRPAD %s found\n", temp); + printf("h5dump DATATYPE STRING STRPAD %s found\n", temp); #endif } else if (!HDstrcmp("CSET", key)) { /* CSET */ if (HDfscanf(strm, "%254s", temp) != 1) { /* CSET type */ - (void)HDfprintf(stderr, "%s", err18); + (void)fprintf(stderr, "%s", err18); goto error; } #ifdef H5DEBUGIMPORT - HDprintf("h5dump DATATYPE STRING CSET %s found\n", temp); + printf("h5dump DATATYPE STRING CSET %s found\n", temp); #endif } else if (!HDstrcmp("CTYPE", temp)) { /* CTYPE */ if (HDfscanf(strm, "%254s", temp) != 1) { /* CTYPE type */ - (void)HDfprintf(stderr, "%s", err18); + (void)fprintf(stderr, "%s", err18); goto error; } #ifdef H5DEBUGIMPORT - HDprintf("h5dump DATATYPE STRING CTYPE %s found\n", temp); + printf("h5dump DATATYPE STRING CTYPE %s found\n", temp); #endif } /* if(!HDstrcmp("CSET", key)) */ if (HDfscanf(strm, "%254s", temp) != 1) { - (void)HDfprintf(stderr, "%s", err18); + (void)fprintf(stderr, "%s", err18); goto error; } #ifdef H5DEBUGIMPORT - HDprintf("h5dump DATATYPE STRING %s found\n", temp); + printf("h5dump DATATYPE STRING %s found\n", temp); #endif if (!HDstrcmp("}", temp)) { /* end bracket */ get_next_prop = 0; @@ -1624,58 +1624,58 @@ processConfigurationFile(char *infile, struct Input *in) hsize_t temp_dims[MAX_NUM_DIMENSION]; #ifdef H5DEBUGIMPORT - HDprintf("h5dump DATASPACE key\n"); + printf("h5dump DATASPACE key\n"); #endif if (HDfscanf(strm, "%254s", temp) != 1) { - (void)HDfprintf(stderr, "%s", err18); + (void)fprintf(stderr, "%s", err18); goto error; } if (!HDstrcmp("SCALAR", temp)) { /* SCALAR */ in->rank = 0; } /* if(!HDstrcmp("SCALAR", key)) */ else if (!HDstrcmp("NULL", temp)) { /* NULL */ - (void)HDfprintf(stderr, err6b, infile); + (void)fprintf(stderr, err6b, infile); goto error; } /* else if(!HDstrcmp("NULL", key)) */ else if (!HDstrcmp("SIMPLE", temp)) { /* SIMPLE */ int icount = 0; #ifdef H5DEBUGIMPORT - HDprintf("h5dump DATASPACE SIMPLE found\n"); + printf("h5dump DATASPACE SIMPLE found\n"); #endif if (HDfscanf(strm, "%254s", temp) != 1) { /* start bracket */ - (void)HDfprintf(stderr, err6b, infile); + (void)fprintf(stderr, err6b, infile); goto error; } #ifdef H5DEBUGIMPORT - HDprintf("h5dump DATASPACE SIMPLE %s found\n", temp); + printf("h5dump DATASPACE SIMPLE %s found\n", temp); #endif if (HDfscanf(strm, "%254s", temp) != 1) { /* start paren */ - (void)HDfprintf(stderr, err6b, infile); + (void)fprintf(stderr, err6b, infile); goto error; } #ifdef H5DEBUGIMPORT - HDprintf("h5dump DATASPACE SIMPLE %s found\n", temp); + printf("h5dump DATASPACE SIMPLE %s found\n", temp); #endif if (!HDstrcmp("(", temp)) { /* start paren */ int get_next_dim = 1; int i = 0; if (HDfscanf(strm, "%254s", temp) != 1) { /* Dimension with optional comma */ - (void)HDfprintf(stderr, err16c, infile); + (void)fprintf(stderr, err16c, infile); goto error; } #ifdef H5DEBUGIMPORT - HDprintf("h5dump DATASPACE SIMPLE %s found\n", temp); + printf("h5dump DATASPACE SIMPLE %s found\n", temp); #endif while (get_next_dim) { char *more = temp; temp_dims[icount] = HDstrtoull(more, &more, 10); if (HDfscanf(strm, "%254s", temp) != 1) { /* Dimension or end paren */ - (void)HDfprintf(stderr, err6b, infile); + (void)fprintf(stderr, err6b, infile); goto error; } #ifdef H5DEBUGIMPORT - HDprintf("h5dump DATASPACE SIMPLE %s found\n", temp); + printf("h5dump DATASPACE SIMPLE %s found\n", temp); #endif if (!HDstrcmp(")", temp)) { /* end paren */ in->rank = ++icount; @@ -1685,7 +1685,7 @@ processConfigurationFile(char *infile, struct Input *in) else { /* Dimension */ icount++; if (icount > MAX_NUM_DIMENSION) { - (void)HDfprintf(stderr, "Invalid value for rank.\n"); + (void)fprintf(stderr, "Invalid value for rank.\n"); goto error; } } @@ -1696,30 +1696,30 @@ processConfigurationFile(char *infile, struct Input *in) goto error; } #ifdef H5DEBUGIMPORT - HDprintf("h5dump DATASPACE SIMPLE %ld rank\n", in->rank); + printf("h5dump DATASPACE SIMPLE %ld rank\n", in->rank); #endif for (i = 0; i < in->rank; i++) { in->sizeOfDimension[i] = temp_dims[i]; } #ifdef H5DEBUGIMPORT - HDprintf("h5dump DATASPACE SIMPLE dims[%ld]:", in->rank); + printf("h5dump DATASPACE SIMPLE dims[%ld]:", in->rank); for (pndx = 0; pndx < in->rank; pndx++) { - HDprintf(" %ld", in->sizeOfDimension[pndx]); + printf(" %ld", in->sizeOfDimension[pndx]); } - HDprintf("\n"); + printf("\n"); #endif in->configOptionVector[DIM] = 1; } /* if(!HDstrcmp("(", key)) start paren */ else { - (void)HDfprintf(stderr, err5b, infile); + (void)fprintf(stderr, err5b, infile); goto error; } if (HDfscanf(strm, "%254s", temp) != 1) { - (void)HDfprintf(stderr, "%s", err18); + (void)fprintf(stderr, "%s", err18); goto error; } #ifdef H5DEBUGIMPORT - HDprintf("h5dump DATASPACE SIMPLE %s found\n", temp); + printf("h5dump DATASPACE SIMPLE %s found\n", temp); #endif if (!HDstrcmp("/", temp)) { /* / max dims */ if ((in->maxsizeOfDimension = @@ -1727,29 +1727,29 @@ processConfigurationFile(char *infile, struct Input *in) goto error; } if (HDfscanf(strm, "%254s", temp) != 1) { /* start paren */ - (void)HDfprintf(stderr, err6b, infile); + (void)fprintf(stderr, err6b, infile); goto error; } #ifdef H5DEBUGIMPORT - HDprintf("h5dump DATASPACE SIMPLE %s found\n", temp); + printf("h5dump DATASPACE SIMPLE %s found\n", temp); #endif if (!HDstrcmp("(", temp)) { /* start paren */ int get_next_dim = 1; int i = 0; #ifdef H5DEBUGIMPORT - HDprintf("h5dump DATASPACE SIMPLE process max dim values\n"); + printf("h5dump DATASPACE SIMPLE process max dim values\n"); #endif if (HDfscanf(strm, "%254s", temp) != 1) { /* max dim with optional comma */ - (void)HDfprintf(stderr, err16c, infile); + (void)fprintf(stderr, err16c, infile); goto error; } #ifdef H5DEBUGIMPORT - HDprintf("h5dump DATASPACE SIMPLE %s found\n", temp); + printf("h5dump DATASPACE SIMPLE %s found\n", temp); #endif while (get_next_dim) { #ifdef H5DEBUGIMPORT - HDprintf("h5dump DATASPACE SIMPLE get max dim value\n"); + printf("h5dump DATASPACE SIMPLE get max dim value\n"); #endif if (!HDstrcmp("H5S_UNLIMITED", temp) || !HDstrcmp("H5S_UNLIMITED,", temp)) { /* unlimited */ @@ -1761,11 +1761,11 @@ processConfigurationFile(char *infile, struct Input *in) in->maxsizeOfDimension[i] = HDstrtoull(more, &more, 10); } if (HDfscanf(strm, "%254s", temp) != 1) { /* max dim or end paren */ - (void)HDfprintf(stderr, err16c, infile); + (void)fprintf(stderr, err16c, infile); goto error; } #ifdef H5DEBUGIMPORT - HDprintf("h5dump DATASPACE SIMPLE %s found\n", temp); + printf("h5dump DATASPACE SIMPLE %s found\n", temp); #endif if (!HDstrcmp(")", temp)) { /* end paren */ get_next_dim = 0; @@ -1773,85 +1773,85 @@ processConfigurationFile(char *infile, struct Input *in) else { /* comma */ i++; if (i >= MAX_NUM_DIMENSION) { - (void)HDfprintf(stderr, "Invalid value for rank.\n"); + (void)fprintf(stderr, "Invalid value for rank.\n"); goto error; } } } /* while (get_next_dim) */ #ifdef H5DEBUGIMPORT - HDprintf("h5dump DATASPACE SIMPLE maxdims[%ld]:", in->rank); + printf("h5dump DATASPACE SIMPLE maxdims[%ld]:", in->rank); for (pndx = 0; pndx < in->rank; pndx++) { - HDprintf(" %ld", in->maxsizeOfDimension[pndx]); + printf(" %ld", in->maxsizeOfDimension[pndx]); } - HDprintf("\n"); - HDprintf("h5dump DATASPACE SIMPLE get max dim finished\n"); + printf("\n"); + printf("h5dump DATASPACE SIMPLE get max dim finished\n"); #endif } /* if(!HDstrcmp("(", key)) start paren */ else { - (void)HDfprintf(stderr, err16c, infile); + (void)fprintf(stderr, err16c, infile); goto error; } scanret = HDfscanf(strm, "%254s", temp); /* end bracket */ #ifdef H5DEBUGIMPORT - HDprintf("h5dump DATASPACE SIMPLE %s found\n", temp); + printf("h5dump DATASPACE SIMPLE %s found\n", temp); #endif } /* if(!HDstrcmp("/", key)) max dims separator */ } /* else if(!HDstrcmp("SIMPLE", key)) */ else { - (void)HDfprintf(stderr, err5b, infile); + (void)fprintf(stderr, err5b, infile); goto error; } } /* else if(!HDstrcmp("DATASPACE", key)) RANK and DIMENSIONS */ else if (!HDstrcmp("STORAGE_LAYOUT", key)) { /* CHUNKED-DIMENSION-SIZES */ #ifdef H5DEBUGIMPORT - HDprintf("h5dump STORAGE_LAYOUT key\n"); + printf("h5dump STORAGE_LAYOUT key\n"); #endif if (HDfscanf(strm, "%254s", temp) != 1) { /* start bracket */ - (void)HDfprintf(stderr, err6b, infile); + (void)fprintf(stderr, err6b, infile); goto error; } #ifdef H5DEBUGIMPORT - HDprintf("h5dump STORAGE_LAYOUT %s found\n", temp); + printf("h5dump STORAGE_LAYOUT %s found\n", temp); #endif if (HDfscanf(strm, "%254s", temp) != 1) { /* CHUNKED */ - (void)HDfprintf(stderr, err6b, infile); + (void)fprintf(stderr, err6b, infile); goto error; } #ifdef H5DEBUGIMPORT - HDprintf("h5dump STORAGE_LAYOUT %s found\n", temp); + printf("h5dump STORAGE_LAYOUT %s found\n", temp); #endif if (!HDstrcmp("CHUNKED", temp)) { /* CHUNKED */ if ((in->sizeOfChunk = (hsize_t *)HDmalloc((size_t)in->rank * sizeof(hsize_t))) == NULL) { - (void)HDfprintf(stderr, "Unable to allocate dynamic memory.\n"); + (void)fprintf(stderr, "Unable to allocate dynamic memory.\n"); goto error; } if (HDfscanf(strm, "%254s", temp) != 1) { /* start paren */ - (void)HDfprintf(stderr, err6b, infile); + (void)fprintf(stderr, err6b, infile); goto error; } #ifdef H5DEBUGIMPORT - HDprintf("h5dump STORAGE_LAYOUT CHUNKED %s found\n", temp); + printf("h5dump STORAGE_LAYOUT CHUNKED %s found\n", temp); #endif if (!HDstrcmp("(", temp)) { /* start paren */ int get_next_dim = 1; int icount = 0; if (HDfscanf(strm, "%254s", temp) != 1) { /* Dimension with optional comma */ - (void)HDfprintf(stderr, err16c, infile); + (void)fprintf(stderr, err16c, infile); goto error; } #ifdef H5DEBUGIMPORT - HDprintf("h5dump STORAGE_LAYOUT CHUNKED %s found\n", temp); + printf("h5dump STORAGE_LAYOUT CHUNKED %s found\n", temp); #endif while (get_next_dim) { char *more = temp; in->sizeOfChunk[icount] = HDstrtoull(more, &more, 10); if (HDfscanf(strm, "%254s", temp) != 1) { /* Dimension or end paren */ - (void)HDfprintf(stderr, err6b, infile); + (void)fprintf(stderr, err6b, infile); goto error; } #ifdef H5DEBUGIMPORT - HDprintf("h5dump STORAGE_LAYOUT CHUNKED %s found\n", temp); + printf("h5dump STORAGE_LAYOUT CHUNKED %s found\n", temp); #endif if (!HDstrcmp(")", temp)) { /* end paren */ in->configOptionVector[RANK] = 1; @@ -1860,47 +1860,47 @@ processConfigurationFile(char *infile, struct Input *in) else { /* Dimension */ icount++; if (icount > MAX_NUM_DIMENSION) { - (void)HDfprintf(stderr, "Invalid value for rank.\n"); + (void)fprintf(stderr, "Invalid value for rank.\n"); goto error; } } } /* while (get_next_dim) */ #ifdef H5DEBUGIMPORT - HDprintf("h5dump STORAGE_LAYOUT CHUNKED dims [%ld]:", in->rank); + printf("h5dump STORAGE_LAYOUT CHUNKED dims [%ld]:", in->rank); for (pndx = 0; pndx < in->rank; pndx++) { - HDprintf(" %ld", in->sizeOfChunk[pndx]); + printf(" %ld", in->sizeOfChunk[pndx]); } - HDprintf("\n"); + printf("\n"); #endif in->configOptionVector[DIM] = 1; } /* if(!HDstrcmp("(", key)) start paren */ else { - (void)HDfprintf(stderr, err5b, infile); + (void)fprintf(stderr, err5b, infile); goto error; } if (HDfscanf(strm, "%254s", temp) != 1) { /* SIZE */ - (void)HDfprintf(stderr, err6b, infile); + (void)fprintf(stderr, err6b, infile); goto error; } #ifdef H5DEBUGIMPORT - HDprintf("h5dump STORAGE_LAYOUT CHUNKED %s found\n", temp); + printf("h5dump STORAGE_LAYOUT CHUNKED %s found\n", temp); #endif if (!HDstrcmp("SIZE", temp)) { /* SIZE */ if (HDfscanf(strm, "%d", (&ival)) != 1) { - (void)HDfprintf(stderr, "%s", err19); + (void)fprintf(stderr, "%s", err19); goto error; } #ifdef H5DEBUGIMPORT - HDprintf("h5dump STORAGE_LAYOUT CHUNKED SIZE %d found\n", ival); + printf("h5dump STORAGE_LAYOUT CHUNKED SIZE %d found\n", ival); #endif } while (HDstrcmp("}", temp) != 0) { if (HDfscanf(strm, "%254s", temp) != 1) { /* end bracket */ - (void)HDfprintf(stderr, "%s", err18); + (void)fprintf(stderr, "%s", err18); goto error; } #ifdef H5DEBUGIMPORT - HDprintf("h5dump STORAGE_LAYOUT CHUNKED %s found\n", temp); + printf("h5dump STORAGE_LAYOUT CHUNKED %s found\n", temp); #endif } in->configOptionVector[CHUNK] = 1; @@ -1908,135 +1908,135 @@ processConfigurationFile(char *infile, struct Input *in) } /* else if(!HDstrcmp("STORAGE_LAYOUT", key)) CHUNKED-DIMENSION-SIZES */ else if (!HDstrcmp("FILTERS", key)) { /* FILTERS */ #ifdef H5DEBUGIMPORT - HDprintf("h5dump FILTERS key\n"); + printf("h5dump FILTERS key\n"); #endif if (HDfscanf(strm, "%254s", temp) != 1) { /* start bracket */ - (void)HDfprintf(stderr, err6b, infile); + (void)fprintf(stderr, err6b, infile); goto error; } #ifdef H5DEBUGIMPORT - HDprintf("h5dump FILTERS %s found\n", temp); + printf("h5dump FILTERS %s found\n", temp); #endif if (HDfscanf(strm, "%254s", temp) != 1) { - (void)HDfprintf(stderr, err6b, infile); + (void)fprintf(stderr, err6b, infile); goto error; } #ifdef H5DEBUGIMPORT - HDprintf("h5dump FILTERS %s found\n", temp); + printf("h5dump FILTERS %s found\n", temp); #endif if (!HDstrcmp("COMPRESSION", temp)) { /* COMPRESSION */ #ifdef H5DEBUGIMPORT - HDprintf("h5dump FILTERS COMPRESSION found\n"); + printf("h5dump FILTERS COMPRESSION found\n"); #endif if (HDfscanf(strm, "%254s", temp) != 1) { /* DEFLATE */ - (void)HDfprintf(stderr, "%s", err18); + (void)fprintf(stderr, "%s", err18); goto error; } #ifdef H5DEBUGIMPORT - HDprintf("h5dump FILTERS COMPRESSION %s found\n", temp); + printf("h5dump FILTERS COMPRESSION %s found\n", temp); #endif if (HDfscanf(strm, "%254s", temp) != 1) { /* bgin bracket */ - (void)HDfprintf(stderr, "%s", err18); + (void)fprintf(stderr, "%s", err18); goto error; } #ifdef H5DEBUGIMPORT - HDprintf("h5dump FILTERS COMPRESSION %s found\n", temp); + printf("h5dump FILTERS COMPRESSION %s found\n", temp); #endif if (HDfscanf(strm, "%254s", temp) != 1) { /* LEVEL */ - (void)HDfprintf(stderr, "%s", err18); + (void)fprintf(stderr, "%s", err18); goto error; } #ifdef H5DEBUGIMPORT - HDprintf("h5dump FILTERS COMPRESSION %s found\n", temp); + printf("h5dump FILTERS COMPRESSION %s found\n", temp); #endif if (HDfscanf(strm, "%d", (&ival)) != 1) { - (void)HDfprintf(stderr, "%s", err19); + (void)fprintf(stderr, "%s", err19); goto error; } #ifdef H5DEBUGIMPORT - HDprintf("h5dump FILTERS COMPRESSION LEVEL %d found\n", ival); + printf("h5dump FILTERS COMPRESSION LEVEL %d found\n", ival); #endif in->compressionParam = ival; if (HDfscanf(strm, "%254s", temp) != 1) { /* end bracket */ - (void)HDfprintf(stderr, "%s", err18); + (void)fprintf(stderr, "%s", err18); goto error; } #ifdef H5DEBUGIMPORT - HDprintf("h5dump FILTERS COMPRESSION %s found\n", temp); + printf("h5dump FILTERS COMPRESSION %s found\n", temp); #endif in->compressionType = 0; /* ONLY GZIP supported */ in->configOptionVector[COMPRESS] = 1; } else if (!HDstrcmp("CONTIGUOUS", temp)) { /* CONTIGUOUS */ #ifdef H5DEBUGIMPORT - HDprintf("h5dump FILTERS CONTIGUOUS found\n"); + printf("h5dump FILTERS CONTIGUOUS found\n"); #endif in->configOptionVector[COMPRESS] = 0; } else if (!HDstrcmp("NONE", temp)) { /* NONE */ #ifdef H5DEBUGIMPORT - HDprintf("h5dump FILTERS NONE found\n"); + printf("h5dump FILTERS NONE found\n"); #endif in->configOptionVector[COMPRESS] = 0; } if (HDfscanf(strm, "%254s", temp) != 1) { /* end bracket */ - (void)HDfprintf(stderr, "%s", err18); + (void)fprintf(stderr, "%s", err18); goto error; } #ifdef H5DEBUGIMPORT - HDprintf("h5dump FILTERS %s found\n", temp); + printf("h5dump FILTERS %s found\n", temp); #endif } else if (!HDstrcmp("SUBSET", key)) { /* reduce dimensions */ hsize_t temp_dims[MAX_NUM_DIMENSION]; int get_next_prop = 1; #ifdef H5DEBUGIMPORT - HDprintf("h5dump SUBSET key\n"); + printf("h5dump SUBSET key\n"); #endif if (HDfscanf(strm, "%254s", temp) != 1) { /* start bracket */ - (void)HDfprintf(stderr, err20, infile); + (void)fprintf(stderr, err20, infile); goto error; } #ifdef H5DEBUGIMPORT - HDprintf("h5dump SUBSET %s found\n", temp); + printf("h5dump SUBSET %s found\n", temp); #endif if (HDfscanf(strm, "%254s", temp) != 1) { /* SUBSET keyword */ - (void)HDfprintf(stderr, "%s", err18); + (void)fprintf(stderr, "%s", err18); goto error; } #ifdef H5DEBUGIMPORT - HDprintf("h5dump SUBSET %s found\n", temp); + printf("h5dump SUBSET %s found\n", temp); #endif while (get_next_prop) { if (!HDstrcmp("COUNT", temp)) { /* COUNT */ int icount = 0; if (HDfscanf(strm, "%254s", temp) != 1) { /* start paren */ - (void)HDfprintf(stderr, err6b, infile); + (void)fprintf(stderr, err6b, infile); goto error; } #ifdef H5DEBUGIMPORT - HDprintf("h5dump SUBSET %s found\n", temp); + printf("h5dump SUBSET %s found\n", temp); #endif if (!HDstrcmp("(", temp)) { /* start paren */ int get_next_dim = 1; int i = 0; if (HDfscanf(strm, "%254s", temp) != 1) { /* Dimension with optional comma */ - (void)HDfprintf(stderr, err16c, infile); + (void)fprintf(stderr, err16c, infile); goto error; } #ifdef H5DEBUGIMPORT - HDprintf("h5dump SUBSET COUNT [%s] found\n", temp); + printf("h5dump SUBSET COUNT [%s] found\n", temp); #endif while (get_next_dim) { char *more = temp; temp_dims[icount] = HDstrtoull(more, &more, 10); if (HDfscanf(strm, "%254s", temp) != 1) { /* Dimension or end paren */ - (void)HDfprintf(stderr, err6b, infile); + (void)fprintf(stderr, err6b, infile); goto error; } #ifdef H5DEBUGIMPORT - HDprintf("h5dump SUBSET COUNT %s found\n", temp); + printf("h5dump SUBSET COUNT %s found\n", temp); #endif if (!HDstrcmp(");", temp)) { /* end paren */ in->rank = ++icount; @@ -2046,7 +2046,7 @@ processConfigurationFile(char *infile, struct Input *in) else { /* Dimension */ icount++; if (icount >= MAX_NUM_DIMENSION) { - (void)HDfprintf(stderr, "Invalid value for rank.\n"); + (void)fprintf(stderr, "Invalid value for rank.\n"); goto error; } } @@ -2055,11 +2055,11 @@ processConfigurationFile(char *infile, struct Input *in) in->sizeOfDimension[i] = temp_dims[i]; } #ifdef H5DEBUGIMPORT - HDprintf("h5dump SUBSET COUNT dims: [%d]", in->rank); + printf("h5dump SUBSET COUNT dims: [%d]", in->rank); for (pndx = 0; pndx < in->rank; pndx++) { - HDprintf(" %ld", in->sizeOfDimension[pndx]); + printf(" %ld", in->sizeOfDimension[pndx]); } - HDprintf("\n"); + printf("\n"); #endif in->configOptionVector[DIM] = 1; } /* if(!HDstrcmp("(", key)) start paren */ @@ -2067,32 +2067,32 @@ processConfigurationFile(char *infile, struct Input *in) if (!HDstrcmp("BLOCK", temp)) { /* BLOCK */ int icount = 0; if (HDfscanf(strm, "%254s", temp) != 1) { /* start paren */ - (void)HDfprintf(stderr, err6b, infile); + (void)fprintf(stderr, err6b, infile); goto error; } #ifdef H5DEBUGIMPORT - HDprintf("h5dump SUBSET %s found\n", temp); + printf("h5dump SUBSET %s found\n", temp); #endif if (!HDstrcmp("(", temp)) { /* start paren */ int get_next_dim = 1; int i = 0; if (HDfscanf(strm, "%254s", temp) != 1) { /* Dimension with optional comma */ - (void)HDfprintf(stderr, err16c, infile); + (void)fprintf(stderr, err16c, infile); goto error; } #ifdef H5DEBUGIMPORT - HDprintf("h5dump SUBSET BLOCK [%s] found\n", temp); + printf("h5dump SUBSET BLOCK [%s] found\n", temp); #endif while (get_next_dim) { char *more = temp; temp_dims[icount] = HDstrtoull(more, &more, 10); if (HDfscanf(strm, "%254s", temp) != 1) { /* Dimension or end paren */ - (void)HDfprintf(stderr, err6b, infile); + (void)fprintf(stderr, err6b, infile); goto error; } #ifdef H5DEBUGIMPORT - HDprintf("h5dump SUBSET BLOCK %s found\n", temp); + printf("h5dump SUBSET BLOCK %s found\n", temp); #endif if (!HDstrcmp(");", temp)) { /* end paren */ in->rank = ++icount; @@ -2102,7 +2102,7 @@ processConfigurationFile(char *infile, struct Input *in) else { /* Dimension */ icount++; if (icount > MAX_NUM_DIMENSION) { - (void)HDfprintf(stderr, "Invalid value for rank.\n"); + (void)fprintf(stderr, "Invalid value for rank.\n"); goto error; } } @@ -2111,21 +2111,21 @@ processConfigurationFile(char *infile, struct Input *in) in->sizeOfDimension[i] = in->sizeOfDimension[i] * temp_dims[i]; } #ifdef H5DEBUGIMPORT - HDprintf("h5dump SUBSET BLOCK dims: [%d]", in->rank); + printf("h5dump SUBSET BLOCK dims: [%d]", in->rank); for (pndx = 0; pndx < in->rank; pndx++) { - HDprintf(" %ld", in->sizeOfDimension[pndx]); + printf(" %ld", in->sizeOfDimension[pndx]); } - HDprintf("\n"); + printf("\n"); #endif in->configOptionVector[DIM] = 1; } /* if(!HDstrcmp("(", key)) start paren */ } /* if(!HDstrcmp("BLOCK", temp)) BLOCK */ if (HDfscanf(strm, "%254s", temp) != 1) { - (void)HDfprintf(stderr, "%s", err18); + (void)fprintf(stderr, "%s", err18); goto error; } #ifdef H5DEBUGIMPORT - HDprintf("h5dump SUBSET %s found\n", temp); + printf("h5dump SUBSET %s found\n", temp); #endif if (!HDstrcmp("}", temp)) { /* end bracket */ get_next_prop = 0; @@ -2134,7 +2134,7 @@ processConfigurationFile(char *infile, struct Input *in) } /* else if(!HDstrcmp("SUBSET", key)) */ else if (!HDstrcmp("DATA", key)) { /* FINISHED */ #ifdef H5DEBUGIMPORT - HDprintf("h5dump DATA key\n"); + printf("h5dump DATA key\n"); #endif scanret = 0; break; @@ -2142,50 +2142,50 @@ processConfigurationFile(char *infile, struct Input *in) scanret = HDfscanf(strm, "%254s", key); } #ifdef H5DEBUGIMPORT - HDprintf("h5dump path"); + printf("h5dump path"); for (pndx = 0; pndx < in->path.count; pndx++) { - HDprintf(" : %s", in->path.group[pndx]); + printf(" : %s", in->path.group[pndx]); } - HDprintf("\n"); - HDprintf("h5dump inputClass=%d\n", in->inputClass); - HDprintf("h5dump inputSize=%d\n", in->inputSize); - HDprintf("h5dump inputArchitecture=%d\n", in->inputArchitecture); - HDprintf("h5dump inputByteOrder=%d\n", in->inputByteOrder); - HDprintf("h5dump rank=%d\n", in->rank); - HDprintf("h5dump outputClass=%d\n", in->outputClass); - HDprintf("h5dump outputSize=%d\n", in->outputSize); - HDprintf("h5dump outputArchitecture=%d\n", in->outputArchitecture); - HDprintf("h5dump outputByteOrder=%d\n", in->outputByteOrder); - HDprintf("h5dump compressionType=%d\n", in->compressionType); - HDprintf("h5dump compressionParam=%d\n", in->compressionParam); - HDprintf("h5dump externFilename=%s\n", in->externFilename); - HDprintf("h5dump sizeOfDimensions:\n"); + printf("\n"); + printf("h5dump inputClass=%d\n", in->inputClass); + printf("h5dump inputSize=%d\n", in->inputSize); + printf("h5dump inputArchitecture=%d\n", in->inputArchitecture); + printf("h5dump inputByteOrder=%d\n", in->inputByteOrder); + printf("h5dump rank=%d\n", in->rank); + printf("h5dump outputClass=%d\n", in->outputClass); + printf("h5dump outputSize=%d\n", in->outputSize); + printf("h5dump outputArchitecture=%d\n", in->outputArchitecture); + printf("h5dump outputByteOrder=%d\n", in->outputByteOrder); + printf("h5dump compressionType=%d\n", in->compressionType); + printf("h5dump compressionParam=%d\n", in->compressionParam); + printf("h5dump externFilename=%s\n", in->externFilename); + printf("h5dump sizeOfDimensions:\n"); for (pndx = 0; pndx < in->rank; pndx++) { - HDprintf(" %ld\n", in->sizeOfDimension[pndx]); + printf(" %ld\n", in->sizeOfDimension[pndx]); } #endif } else { #ifdef H5DEBUGIMPORT - HDprintf("original option keyword parsing\n"); + printf("original option keyword parsing\n"); #endif while (scanret == 1) { if ((kindex = mapKeywordToIndex(key)) == -1) { - (void)HDfprintf(stderr, err2, key, infile); + (void)fprintf(stderr, err2, key, infile); goto error; } switch (kindex) { case 0: /* PATH */ if (in->configOptionVector[PATH] == 1) { - (void)HDfprintf(stderr, err3a, infile); + (void)fprintf(stderr, err3a, infile); goto error; } if (HDfscanf(strm, "%254s", temp) != 1) { - (void)HDfprintf(stderr, "%s", err18); + (void)fprintf(stderr, "%s", err18); goto error; } if (parsePathInfo(&in->path, temp) == -1) { - (void)HDfprintf(stderr, err3b, infile); + (void)fprintf(stderr, err3b, infile); goto error; } in->configOptionVector[PATH] = 1; @@ -2193,16 +2193,16 @@ processConfigurationFile(char *infile, struct Input *in) case 1: /* INPUT-CLASS */ if (in->configOptionVector[INPUT_CLASS] == 1) { - (void)HDfprintf(stderr, err4a, infile); + (void)fprintf(stderr, err4a, infile); goto error; } if (HDfscanf(strm, "%254s", temp) != 1) { - (void)HDfprintf(stderr, "%s", err18); + (void)fprintf(stderr, "%s", err18); goto error; } if (getInputClass(in, temp) == -1) { - (void)HDfprintf(stderr, err4b, infile); + (void)fprintf(stderr, err4b, infile); goto error; } @@ -2221,15 +2221,15 @@ processConfigurationFile(char *infile, struct Input *in) case 2: /* INPUT-SIZE */ if (in->configOptionVector[INPUT_SIZE] == 1) { - (void)HDfprintf(stderr, err5a, infile); + (void)fprintf(stderr, err5a, infile); goto error; } if (HDfscanf(strm, "%254d", (&ival)) != 1) { - (void)HDfprintf(stderr, "%s", err19); + (void)fprintf(stderr, "%s", err19); goto error; } if (getInputSize(in, ival) == -1) { - (void)HDfprintf(stderr, err5b, infile); + (void)fprintf(stderr, err5b, infile); goto error; } in->configOptionVector[INPUT_SIZE] = 1; @@ -2241,12 +2241,12 @@ processConfigurationFile(char *infile, struct Input *in) case 3: /* RANK */ if (in->configOptionVector[RANK] == 1) { - (void)HDfprintf(stderr, err6a, infile); + (void)fprintf(stderr, err6a, infile); goto error; } if (getRank(in, strm) == -1) { - (void)HDfprintf(stderr, err6b, infile); + (void)fprintf(stderr, err6b, infile); goto error; } in->configOptionVector[RANK] = 1; @@ -2254,16 +2254,16 @@ processConfigurationFile(char *infile, struct Input *in) case 4: /* DIMENSION-SIZES */ if (in->configOptionVector[DIM] == 1) { - (void)HDfprintf(stderr, err7a, infile); + (void)fprintf(stderr, err7a, infile); goto error; } if (in->configOptionVector[RANK] == 0) { - (void)HDfprintf(stderr, err7b, infile); + (void)fprintf(stderr, err7b, infile); goto error; } if (getDimensionSizes(in, strm) == -1) { - (void)HDfprintf(stderr, err7c, infile); + (void)fprintf(stderr, err7c, infile); goto error; } in->configOptionVector[DIM] = 1; @@ -2271,12 +2271,12 @@ processConfigurationFile(char *infile, struct Input *in) case 5: /* OUTPUT-CLASS */ if (in->configOptionVector[OUTPUT_CLASS] == 1) { - (void)HDfprintf(stderr, err8a, infile); + (void)fprintf(stderr, err8a, infile); goto error; } if (getOutputClass(in, strm) == -1) { - (void)HDfprintf(stderr, err8b, infile); + (void)fprintf(stderr, err8b, infile); goto error; } in->configOptionVector[OUTPUT_CLASS] = 1; @@ -2284,12 +2284,12 @@ processConfigurationFile(char *infile, struct Input *in) case 6: /* OUTPUT-SIZE */ if (in->configOptionVector[OUTPUT_SIZE] == 1) { - (void)HDfprintf(stderr, err9a, infile); + (void)fprintf(stderr, err9a, infile); goto error; } if (getOutputSize(in, strm) == -1) { - (void)HDfprintf(stderr, err9b, infile); + (void)fprintf(stderr, err9b, infile); goto error; } in->configOptionVector[OUTPUT_SIZE] = 1; @@ -2297,12 +2297,12 @@ processConfigurationFile(char *infile, struct Input *in) case 7: /* OUTPUT-ARCHITECTURE */ if (in->configOptionVector[OUTPUT_ARCH] == 1) { - (void)HDfprintf(stderr, err10a, infile); + (void)fprintf(stderr, err10a, infile); goto error; } if (getOutputArchitecture(in, strm) == -1) { - (void)HDfprintf(stderr, err10b, infile); + (void)fprintf(stderr, err10b, infile); goto error; } in->configOptionVector[OUTPUT_ARCH] = 1; @@ -2310,12 +2310,12 @@ processConfigurationFile(char *infile, struct Input *in) case 8: /* OUTPUT-BYTE-ORDER */ if (in->configOptionVector[OUTPUT_B_ORDER] == 1) { - (void)HDfprintf(stderr, err11a, infile); + (void)fprintf(stderr, err11a, infile); goto error; } if (getOutputByteOrder(in, strm) == -1) { - (void)HDfprintf(stderr, err11b, infile); + (void)fprintf(stderr, err11b, infile); goto error; } in->configOptionVector[OUTPUT_B_ORDER] = 1; @@ -2323,17 +2323,17 @@ processConfigurationFile(char *infile, struct Input *in) case 9: /* CHUNKED-DIMENSION-SIZES */ if (in->configOptionVector[CHUNK] == 1) { - (void)HDfprintf(stderr, err12a, infile); + (void)fprintf(stderr, err12a, infile); goto error; } /* can't appear before dimension sizes have been provided */ if (in->configOptionVector[DIM] == 0) { - (void)HDfprintf(stderr, err12b, infile); + (void)fprintf(stderr, err12b, infile); goto error; } if (getChunkedDimensionSizes(in, strm) == -1) { - (void)HDfprintf(stderr, err12c, infile); + (void)fprintf(stderr, err12c, infile); goto error; } in->configOptionVector[CHUNK] = 1; @@ -2341,12 +2341,12 @@ processConfigurationFile(char *infile, struct Input *in) case 10: /* COMPRESSION-TYPE */ if (in->configOptionVector[COMPRESS] == 1) { - (void)HDfprintf(stderr, err13a, infile); + (void)fprintf(stderr, err13a, infile); goto error; } if (getCompressionType(in, strm) == -1) { - (void)HDfprintf(stderr, err13b, infile); + (void)fprintf(stderr, err13b, infile); goto error; } in->configOptionVector[COMPRESS] = 1; @@ -2359,12 +2359,12 @@ processConfigurationFile(char *infile, struct Input *in) case 11: /* COMPRESSION-PARAM */ if (in->configOptionVector[COMPRESS_PARAM] == 1) { - (void)HDfprintf(stderr, err14a, infile); + (void)fprintf(stderr, err14a, infile); goto error; } if (getCompressionParameter(in, strm) == -1) { - (void)HDfprintf(stderr, err14b, infile); + (void)fprintf(stderr, err14b, infile); goto error; } @@ -2377,12 +2377,12 @@ processConfigurationFile(char *infile, struct Input *in) case 12: /* EXTERNAL-STORAGE */ if (in->configOptionVector[EXTERNALSTORE] == 1) { - (void)HDfprintf(stderr, err15a, infile); + (void)fprintf(stderr, err15a, infile); goto error; } if (getExternalFilename(in, strm) == -1) { - (void)HDfprintf(stderr, err15b, infile); + (void)fprintf(stderr, err15b, infile); goto error; } in->configOptionVector[EXTERNALSTORE] = 1; @@ -2390,16 +2390,16 @@ processConfigurationFile(char *infile, struct Input *in) case 13: /* MAXIMUM-DIMENSIONS */ if (in->configOptionVector[EXTEND] == 1) { - (void)HDfprintf(stderr, err16a, infile); + (void)fprintf(stderr, err16a, infile); goto error; } /* can't appear before dimension sizes have been provided */ if (in->configOptionVector[DIM] == 0) { - (void)HDfprintf(stderr, err16b, infile); + (void)fprintf(stderr, err16b, infile); goto error; } if (getMaximumDimensionSizes(in, strm) == -1) { - (void)HDfprintf(stderr, err16c, infile); + (void)fprintf(stderr, err16c, infile); goto error; } in->configOptionVector[EXTEND] = 1; @@ -2407,12 +2407,12 @@ processConfigurationFile(char *infile, struct Input *in) case 14: /* INPUT-BYTE-ORDER */ if (in->configOptionVector[INPUT_B_ORDER] == 1) { - (void)HDfprintf(stderr, err11c, infile); + (void)fprintf(stderr, err11c, infile); goto error; } if (getInputByteOrder(in, strm) == -1) { - (void)HDfprintf(stderr, err11d, infile); + (void)fprintf(stderr, err11d, infile); goto error; } in->configOptionVector[INPUT_B_ORDER] = 1; @@ -2430,7 +2430,7 @@ processConfigurationFile(char *infile, struct Input *in) */ if (validateConfigurationParameters(in) == -1) { - (void)HDfprintf(stderr, err17, infile); + (void)fprintf(stderr, err17, infile); goto error; } } @@ -2463,21 +2463,21 @@ validateConfigurationParameters(struct Input *in) return (0); if ((in->configOptionVector[DIM] != 1) || (in->configOptionVector[RANK] != 1)) { - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } if (in->configOptionVector[EXTERNALSTORE] == 1) { if ((in->configOptionVector[COMPRESS] == 1) || (in->configOptionVector[CHUNK] == 1) || (in->configOptionVector[EXTEND] == 1)) { - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } } if ((in->configOptionVector[COMPRESS] == 1) || (in->configOptionVector[EXTEND] == 1)) { if (in->configOptionVector[CHUNK] != 1) { - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } } @@ -2485,20 +2485,20 @@ validateConfigurationParameters(struct Input *in) /* Arch can't be STD if O/p class is FP */ if (in->outputArchitecture == 1) if (in->outputClass == 1) { - (void)HDfprintf(stderr, "%s", err4a); + (void)fprintf(stderr, "%s", err4a); return (-1); } /* Arch can't be IEEE if O/p class is IN */ if (in->outputArchitecture == 2) if (in->outputClass == 0) { - (void)HDfprintf(stderr, "%s", err4b); + (void)fprintf(stderr, "%s", err4b); return (-1); } if (in->outputClass == 1) if (in->outputSize != 32 && in->outputSize != 64) { - (void)HDfprintf(stderr, "%s", err5); + (void)fprintf(stderr, "%s", err5); return (-1); } @@ -2526,7 +2526,7 @@ parsePathInfo(struct path_info *path, char *temp) token = HDstrtok(temp, delimiter); if (HDstrlen(token) >= MAX_PATH_NAME_LENGTH) { - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } HDstrcpy(path->group[i++], token); @@ -2536,7 +2536,7 @@ parsePathInfo(struct path_info *path, char *temp) if (token == NULL) break; if (HDstrlen(token) >= MAX_PATH_NAME_LENGTH) { - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } HDstrcpy(path->group[i++], token); @@ -2566,7 +2566,7 @@ parseDimensions(struct Input *in, char *strm) } in->rank = i + 1; if ((in->sizeOfDimension = (hsize_t *)HDmalloc((size_t)in->rank * sizeof(hsize_t))) == NULL) { - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } @@ -2593,12 +2593,12 @@ getOutputClass(struct Input *in, FILE *strm) const char *err2 = "Invalid value for output class.\n"; if (HDfscanf(strm, "%254s", temp) != 1) { - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } if ((kindex = OutputClassStrToInt(temp)) == -1) { - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } @@ -2628,7 +2628,7 @@ getOutputSize(struct Input *in, FILE *strm) const char *err2 = "Invalid value for output size.\n"; if (HDfscanf(strm, "%d", (&ival)) != 1) { - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } @@ -2637,7 +2637,7 @@ getOutputSize(struct Input *in, FILE *strm) in->outputSize = ival; return (0); } - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } @@ -2648,7 +2648,7 @@ getInputClass(struct Input *in, char *temp) const char *err1 = "Invalid value for input class.\n"; if ((kindex = InputClassStrToInt(temp)) == -1) { - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } @@ -2669,18 +2669,18 @@ getInputClassType(struct Input *in, char *buffer) in->configOptionVector[INPUT_SIZE] = 1; if ((kindex = OutputArchStrToInt("STD")) == -1) { - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } in->outputArchitecture = kindex; if ((kindex = OutputByteOrderStrToInt("BE")) == -1) { - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } in->outputByteOrder = kindex; #ifdef H5DEBUGIMPORT - HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder); + printf("h5dump inputByteOrder %d\n", in->inputByteOrder); #endif kindex = 4; @@ -2690,18 +2690,18 @@ getInputClassType(struct Input *in, char *buffer) in->configOptionVector[INPUT_SIZE] = 1; if ((kindex = OutputArchStrToInt("STD")) == -1) { - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } in->outputArchitecture = kindex; if ((kindex = OutputByteOrderStrToInt("LE")) == -1) { - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } in->outputByteOrder = kindex; #ifdef H5DEBUGIMPORT - HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder); + printf("h5dump inputByteOrder %d\n", in->inputByteOrder); #endif kindex = 4; @@ -2711,18 +2711,18 @@ getInputClassType(struct Input *in, char *buffer) in->configOptionVector[INPUT_SIZE] = 1; if ((kindex = OutputArchStrToInt("STD")) == -1) { - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } in->outputArchitecture = kindex; if ((kindex = OutputByteOrderStrToInt("BE")) == -1) { - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } in->outputByteOrder = kindex; #ifdef H5DEBUGIMPORT - HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder); + printf("h5dump inputByteOrder %d\n", in->inputByteOrder); #endif kindex = 4; @@ -2732,18 +2732,18 @@ getInputClassType(struct Input *in, char *buffer) in->configOptionVector[INPUT_SIZE] = 1; if ((kindex = OutputArchStrToInt("STD")) == -1) { - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } in->outputArchitecture = kindex; if ((kindex = OutputByteOrderStrToInt("LE")) == -1) { - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } in->outputByteOrder = kindex; #ifdef H5DEBUGIMPORT - HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder); + printf("h5dump inputByteOrder %d\n", in->inputByteOrder); #endif kindex = 4; @@ -2753,18 +2753,18 @@ getInputClassType(struct Input *in, char *buffer) in->configOptionVector[INPUT_SIZE] = 1; if ((kindex = OutputArchStrToInt("STD")) == -1) { - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } in->outputArchitecture = kindex; if ((kindex = OutputByteOrderStrToInt("BE")) == -1) { - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } in->outputByteOrder = kindex; #ifdef H5DEBUGIMPORT - HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder); + printf("h5dump inputByteOrder %d\n", in->inputByteOrder); #endif kindex = 4; @@ -2774,18 +2774,18 @@ getInputClassType(struct Input *in, char *buffer) in->configOptionVector[INPUT_SIZE] = 1; if ((kindex = OutputArchStrToInt("STD")) == -1) { - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } in->outputArchitecture = kindex; if ((kindex = OutputByteOrderStrToInt("LE")) == -1) { - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } in->outputByteOrder = kindex; #ifdef H5DEBUGIMPORT - HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder); + printf("h5dump inputByteOrder %d\n", in->inputByteOrder); #endif kindex = 4; @@ -2795,18 +2795,18 @@ getInputClassType(struct Input *in, char *buffer) in->configOptionVector[INPUT_SIZE] = 1; if ((kindex = OutputArchStrToInt("STD")) == -1) { - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } in->outputArchitecture = kindex; if ((kindex = OutputByteOrderStrToInt("BE")) == -1) { - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } in->outputByteOrder = kindex; #ifdef H5DEBUGIMPORT - HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder); + printf("h5dump inputByteOrder %d\n", in->inputByteOrder); #endif kindex = 4; @@ -2816,18 +2816,18 @@ getInputClassType(struct Input *in, char *buffer) in->configOptionVector[INPUT_SIZE] = 1; if ((kindex = OutputArchStrToInt("STD")) == -1) { - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } in->outputArchitecture = kindex; if ((kindex = OutputByteOrderStrToInt("LE")) == -1) { - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } in->outputByteOrder = kindex; #ifdef H5DEBUGIMPORT - HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder); + printf("h5dump inputByteOrder %d\n", in->inputByteOrder); #endif kindex = 4; @@ -2837,18 +2837,18 @@ getInputClassType(struct Input *in, char *buffer) in->configOptionVector[INPUT_SIZE] = 1; if ((kindex = OutputArchStrToInt("STD")) == -1) { - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } in->outputArchitecture = kindex; if ((kindex = OutputByteOrderStrToInt("BE")) == -1) { - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } in->outputByteOrder = kindex; #ifdef H5DEBUGIMPORT - HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder); + printf("h5dump inputByteOrder %d\n", in->inputByteOrder); #endif kindex = 7; @@ -2858,18 +2858,18 @@ getInputClassType(struct Input *in, char *buffer) in->configOptionVector[INPUT_SIZE] = 1; if ((kindex = OutputArchStrToInt("STD")) == -1) { - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } in->outputArchitecture = kindex; if ((kindex = OutputByteOrderStrToInt("LE")) == -1) { - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } in->outputByteOrder = kindex; #ifdef H5DEBUGIMPORT - HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder); + printf("h5dump inputByteOrder %d\n", in->inputByteOrder); #endif kindex = 7; @@ -2879,18 +2879,18 @@ getInputClassType(struct Input *in, char *buffer) in->configOptionVector[INPUT_SIZE] = 1; if ((kindex = OutputArchStrToInt("STD")) == -1) { - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } in->outputArchitecture = kindex; if ((kindex = OutputByteOrderStrToInt("BE")) == -1) { - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } in->outputByteOrder = kindex; #ifdef H5DEBUGIMPORT - HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder); + printf("h5dump inputByteOrder %d\n", in->inputByteOrder); #endif kindex = 7; @@ -2900,18 +2900,18 @@ getInputClassType(struct Input *in, char *buffer) in->configOptionVector[INPUT_SIZE] = 1; if ((kindex = OutputArchStrToInt("STD")) == -1) { - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } in->outputArchitecture = kindex; if ((kindex = OutputByteOrderStrToInt("LE")) == -1) { - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } in->outputByteOrder = kindex; #ifdef H5DEBUGIMPORT - HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder); + printf("h5dump inputByteOrder %d\n", in->inputByteOrder); #endif kindex = 7; @@ -2921,18 +2921,18 @@ getInputClassType(struct Input *in, char *buffer) in->configOptionVector[INPUT_SIZE] = 1; if ((kindex = OutputArchStrToInt("STD")) == -1) { - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } in->outputArchitecture = kindex; if ((kindex = OutputByteOrderStrToInt("BE")) == -1) { - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } in->outputByteOrder = kindex; #ifdef H5DEBUGIMPORT - HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder); + printf("h5dump inputByteOrder %d\n", in->inputByteOrder); #endif kindex = 7; @@ -2942,18 +2942,18 @@ getInputClassType(struct Input *in, char *buffer) in->configOptionVector[INPUT_SIZE] = 1; if ((kindex = OutputArchStrToInt("STD")) == -1) { - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } in->outputArchitecture = kindex; if ((kindex = OutputByteOrderStrToInt("LE")) == -1) { - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } in->outputByteOrder = kindex; #ifdef H5DEBUGIMPORT - HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder); + printf("h5dump inputByteOrder %d\n", in->inputByteOrder); #endif kindex = 7; @@ -2963,18 +2963,18 @@ getInputClassType(struct Input *in, char *buffer) in->configOptionVector[INPUT_SIZE] = 1; if ((kindex = OutputArchStrToInt("STD")) == -1) { - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } in->outputArchitecture = kindex; if ((kindex = OutputByteOrderStrToInt("BE")) == -1) { - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } in->outputByteOrder = kindex; #ifdef H5DEBUGIMPORT - HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder); + printf("h5dump inputByteOrder %d\n", in->inputByteOrder); #endif kindex = 7; @@ -2984,18 +2984,18 @@ getInputClassType(struct Input *in, char *buffer) in->configOptionVector[INPUT_SIZE] = 1; if ((kindex = OutputArchStrToInt("STD")) == -1) { - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } in->outputArchitecture = kindex; if ((kindex = OutputByteOrderStrToInt("LE")) == -1) { - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } in->outputByteOrder = kindex; #ifdef H5DEBUGIMPORT - HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder); + printf("h5dump inputByteOrder %d\n", in->inputByteOrder); #endif kindex = 7; @@ -3005,7 +3005,7 @@ getInputClassType(struct Input *in, char *buffer) in->configOptionVector[INPUT_SIZE] = 1; if ((kindex = OutputArchStrToInt("NATIVE")) == -1) { - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } in->outputArchitecture = kindex; @@ -3017,7 +3017,7 @@ getInputClassType(struct Input *in, char *buffer) in->configOptionVector[INPUT_SIZE] = 1; if ((kindex = OutputArchStrToInt("NATIVE")) == -1) { - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } in->outputArchitecture = kindex; @@ -3029,7 +3029,7 @@ getInputClassType(struct Input *in, char *buffer) in->configOptionVector[INPUT_SIZE] = 1; if ((kindex = OutputArchStrToInt("NATIVE")) == -1) { - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } in->outputArchitecture = kindex; @@ -3041,7 +3041,7 @@ getInputClassType(struct Input *in, char *buffer) in->configOptionVector[INPUT_SIZE] = 1; if ((kindex = OutputArchStrToInt("NATIVE")) == -1) { - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } in->outputArchitecture = kindex; @@ -3053,7 +3053,7 @@ getInputClassType(struct Input *in, char *buffer) in->configOptionVector[INPUT_SIZE] = 1; if ((kindex = OutputArchStrToInt("NATIVE")) == -1) { - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } in->outputArchitecture = kindex; @@ -3065,7 +3065,7 @@ getInputClassType(struct Input *in, char *buffer) in->configOptionVector[INPUT_SIZE] = 1; if ((kindex = OutputArchStrToInt("NATIVE")) == -1) { - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } in->outputArchitecture = kindex; @@ -3077,7 +3077,7 @@ getInputClassType(struct Input *in, char *buffer) in->configOptionVector[INPUT_SIZE] = 1; if ((kindex = OutputArchStrToInt("NATIVE")) == -1) { - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } in->outputArchitecture = kindex; @@ -3089,7 +3089,7 @@ getInputClassType(struct Input *in, char *buffer) in->configOptionVector[INPUT_SIZE] = 1; if ((kindex = OutputArchStrToInt("NATIVE")) == -1) { - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } in->outputArchitecture = kindex; @@ -3101,7 +3101,7 @@ getInputClassType(struct Input *in, char *buffer) in->configOptionVector[INPUT_SIZE] = 1; if ((kindex = OutputArchStrToInt("NATIVE")) == -1) { - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } in->outputArchitecture = kindex; @@ -3113,7 +3113,7 @@ getInputClassType(struct Input *in, char *buffer) in->configOptionVector[INPUT_SIZE] = 1; if ((kindex = OutputArchStrToInt("NATIVE")) == -1) { - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } in->outputArchitecture = kindex; @@ -3125,18 +3125,18 @@ getInputClassType(struct Input *in, char *buffer) in->configOptionVector[INPUT_SIZE] = 1; if ((kindex = OutputArchStrToInt("IEEE")) == -1) { - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } in->outputArchitecture = kindex; if ((kindex = OutputByteOrderStrToInt("BE")) == -1) { - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } in->outputByteOrder = kindex; #ifdef H5DEBUGIMPORT - HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder); + printf("h5dump inputByteOrder %d\n", in->inputByteOrder); #endif kindex = 3; @@ -3146,18 +3146,18 @@ getInputClassType(struct Input *in, char *buffer) in->configOptionVector[INPUT_SIZE] = 1; if ((kindex = OutputArchStrToInt("IEEE")) == -1) { - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } in->outputArchitecture = kindex; if ((kindex = OutputByteOrderStrToInt("LE")) == -1) { - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } in->outputByteOrder = kindex; #ifdef H5DEBUGIMPORT - HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder); + printf("h5dump inputByteOrder %d\n", in->inputByteOrder); #endif kindex = 3; @@ -3167,18 +3167,18 @@ getInputClassType(struct Input *in, char *buffer) in->configOptionVector[INPUT_SIZE] = 1; if ((kindex = OutputArchStrToInt("IEEE")) == -1) { - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } in->outputArchitecture = kindex; if ((kindex = OutputByteOrderStrToInt("BE")) == -1) { - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } in->outputByteOrder = kindex; #ifdef H5DEBUGIMPORT - HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder); + printf("h5dump inputByteOrder %d\n", in->inputByteOrder); #endif kindex = 3; @@ -3188,18 +3188,18 @@ getInputClassType(struct Input *in, char *buffer) in->configOptionVector[INPUT_SIZE] = 1; if ((kindex = OutputArchStrToInt("IEEE")) == -1) { - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } in->outputArchitecture = kindex; if ((kindex = OutputByteOrderStrToInt("LE")) == -1) { - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } in->outputByteOrder = kindex; #ifdef H5DEBUGIMPORT - HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder); + printf("h5dump inputByteOrder %d\n", in->inputByteOrder); #endif kindex = 3; @@ -3221,7 +3221,7 @@ getInputClassType(struct Input *in, char *buffer) in->configOptionVector[INPUT_SIZE] = 1; if ((kindex = OutputArchStrToInt("NATIVE")) == -1) { - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } in->outputArchitecture = kindex; @@ -3233,7 +3233,7 @@ getInputClassType(struct Input *in, char *buffer) in->configOptionVector[INPUT_SIZE] = 1; if ((kindex = OutputArchStrToInt("NATIVE")) == -1) { - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } in->outputArchitecture = kindex; @@ -3245,7 +3245,7 @@ getInputClassType(struct Input *in, char *buffer) in->configOptionVector[INPUT_SIZE] = 1; if ((kindex = OutputArchStrToInt("NATIVE")) == -1) { - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } in->outputArchitecture = kindex; @@ -3262,18 +3262,18 @@ getInputClassType(struct Input *in, char *buffer) else if (!HDstrcmp(buffer, "H5T_STD_B8BE")) { if ((kindex = OutputArchStrToInt("STD")) == -1) { - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } in->outputArchitecture = kindex; if ((kindex = OutputByteOrderStrToInt("BE")) == -1) { - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } in->outputByteOrder = kindex; #ifdef H5DEBUGIMPORT - HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder); + printf("h5dump inputByteOrder %d\n", in->inputByteOrder); #endif kindex = -1; @@ -3281,18 +3281,18 @@ getInputClassType(struct Input *in, char *buffer) else if (!HDstrcmp(buffer, "H5T_STD_B8LE")) { if ((kindex = OutputArchStrToInt("STD")) == -1) { - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } in->outputArchitecture = kindex; if ((kindex = OutputByteOrderStrToInt("LE")) == -1) { - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } in->outputByteOrder = kindex; #ifdef H5DEBUGIMPORT - HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder); + printf("h5dump inputByteOrder %d\n", in->inputByteOrder); #endif kindex = -1; @@ -3300,18 +3300,18 @@ getInputClassType(struct Input *in, char *buffer) else if (!HDstrcmp(buffer, "H5T_STD_B16BE")) { if ((kindex = OutputArchStrToInt("STD")) == -1) { - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } in->outputArchitecture = kindex; if ((kindex = OutputByteOrderStrToInt("BE")) == -1) { - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } in->outputByteOrder = kindex; #ifdef H5DEBUGIMPORT - HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder); + printf("h5dump inputByteOrder %d\n", in->inputByteOrder); #endif kindex = -1; @@ -3319,18 +3319,18 @@ getInputClassType(struct Input *in, char *buffer) else if (!HDstrcmp(buffer, "H5T_STD_B16LE")) { if ((kindex = OutputArchStrToInt("STD")) == -1) { - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } in->outputArchitecture = kindex; if ((kindex = OutputByteOrderStrToInt("LE")) == -1) { - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } in->outputByteOrder = kindex; #ifdef H5DEBUGIMPORT - HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder); + printf("h5dump inputByteOrder %d\n", in->inputByteOrder); #endif kindex = -1; @@ -3338,18 +3338,18 @@ getInputClassType(struct Input *in, char *buffer) else if (!HDstrcmp(buffer, "H5T_STD_B32BE")) { if ((kindex = OutputArchStrToInt("STD")) == -1) { - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } in->outputArchitecture = kindex; if ((kindex = OutputByteOrderStrToInt("BE")) == -1) { - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } in->outputByteOrder = kindex; #ifdef H5DEBUGIMPORT - HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder); + printf("h5dump inputByteOrder %d\n", in->inputByteOrder); #endif kindex = -1; @@ -3357,18 +3357,18 @@ getInputClassType(struct Input *in, char *buffer) else if (!HDstrcmp(buffer, "H5T_STD_B32LE")) { if ((kindex = OutputArchStrToInt("STD")) == -1) { - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } in->outputArchitecture = kindex; if ((kindex = OutputByteOrderStrToInt("LE")) == -1) { - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } in->outputByteOrder = kindex; #ifdef H5DEBUGIMPORT - HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder); + printf("h5dump inputByteOrder %d\n", in->inputByteOrder); #endif kindex = -1; @@ -3376,18 +3376,18 @@ getInputClassType(struct Input *in, char *buffer) else if (!HDstrcmp(buffer, "H5T_STD_B64BE")) { if ((kindex = OutputArchStrToInt("STD")) == -1) { - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } in->outputArchitecture = kindex; if ((kindex = OutputByteOrderStrToInt("BE")) == -1) { - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } in->outputByteOrder = kindex; #ifdef H5DEBUGIMPORT - HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder); + printf("h5dump inputByteOrder %d\n", in->inputByteOrder); #endif kindex = -1; @@ -3395,18 +3395,18 @@ getInputClassType(struct Input *in, char *buffer) else if (!HDstrcmp(buffer, "H5T_STD_B64LE")) { if ((kindex = OutputArchStrToInt("STD")) == -1) { - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } in->outputArchitecture = kindex; if ((kindex = OutputByteOrderStrToInt("LE")) == -1) { - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } in->outputByteOrder = kindex; #ifdef H5DEBUGIMPORT - HDprintf("h5dump inputByteOrder %d\n", in->inputByteOrder); + printf("h5dump inputByteOrder %d\n", in->inputByteOrder); #endif kindex = -1; @@ -3437,7 +3437,7 @@ getInputClassType(struct Input *in, char *buffer) } if (kindex == -1) { - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } @@ -3445,9 +3445,9 @@ getInputClassType(struct Input *in, char *buffer) if (in->configOptionVector[OUTPUT_SIZE] == 0) in->outputSize = in->inputSize; #ifdef H5DEBUGIMPORT - HDprintf("h5dump DATATYPE InClass %d inputSize\n", in->inputSize); - HDprintf("h5dump DATATYPE InClass %d outputSize\n", in->outputSize); - HDprintf("h5dump DATATYPE InClass %d outputArchitecture\n", in->outputArchitecture); + printf("h5dump DATATYPE InClass %d inputSize\n", in->inputSize); + printf("h5dump DATATYPE InClass %d outputSize\n", in->outputSize); + printf("h5dump DATATYPE InClass %d outputArchitecture\n", in->outputArchitecture); #endif in->inputClass = kindex; @@ -3478,7 +3478,7 @@ getInputSize(struct Input *in, int ival) in->inputSize = ival; return (0); } - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } @@ -3491,12 +3491,12 @@ getInputByteOrder(struct Input *in, FILE *strm) const char *err2 = "Invalid value for input byte-order.\n"; if (HDfscanf(strm, "%254s", temp) != 1) { - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } if ((kindex = OutputByteOrderStrToInt(temp)) == -1) { - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } @@ -3513,7 +3513,7 @@ getRank(struct Input *in, FILE *strm) const char *err2 = "Invalid value for rank.\n"; if (HDfscanf(strm, "%d", (&ival)) != 1) { - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } if (ival >= MIN_NUM_DIMENSION && ival <= MAX_NUM_DIMENSION) { @@ -3521,7 +3521,7 @@ getRank(struct Input *in, FILE *strm) return (0); } - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } @@ -3537,7 +3537,7 @@ getDimensionSizes(struct Input *in, FILE *strm) "No. of dimensions for which dimension sizes provided is not equal to provided rank.\n"; if ((in->sizeOfDimension = (hsize_t *)HDmalloc((size_t)in->rank * sizeof(hsize_t))) == NULL) { - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } @@ -3545,7 +3545,7 @@ getDimensionSizes(struct Input *in, FILE *strm) in->sizeOfDimension[i++] = ullval; if (in->rank != i) { - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } return (0); @@ -3563,7 +3563,7 @@ getChunkedDimensionSizes(struct Input *in, FILE *strm) const char *err3 = "The CHUNKED-DIMENSION-SIZES cannot exceed the sizes of DIMENSION-SIZES\n"; if ((in->sizeOfChunk = (hsize_t *)HDmalloc((size_t)in->rank * sizeof(hsize_t))) == NULL) { - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } @@ -3571,13 +3571,13 @@ getChunkedDimensionSizes(struct Input *in, FILE *strm) in->sizeOfChunk[i++] = ullval; if (in->rank != i) { - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } for (i = 0; i < in->rank; i++) if (in->sizeOfChunk[i] > in->sizeOfDimension[i]) { - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } return (0); @@ -3596,7 +3596,7 @@ getMaximumDimensionSizes(struct Input *in, FILE *strm) "can be -1 to indicate unlimited size\n"; if ((in->maxsizeOfDimension = (hsize_t *)HDmalloc((size_t)in->rank * sizeof(hsize_t))) == NULL) { - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } @@ -3608,14 +3608,14 @@ getMaximumDimensionSizes(struct Input *in, FILE *strm) } if (in->rank != i) { - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } for (i = 0; i < in->rank; i++) { if (in->maxsizeOfDimension[i] != H5S_UNLIMITED) if (in->maxsizeOfDimension[i] < in->sizeOfDimension[i]) { - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } } @@ -3631,12 +3631,12 @@ getOutputArchitecture(struct Input *in, FILE *strm) const char *err2 = "Invalid value for output architecture.\n"; if (HDfscanf(strm, "%254s", temp) != 1) { - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } if ((kindex = OutputArchStrToInt(temp)) == -1) { - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } @@ -3664,12 +3664,12 @@ getOutputByteOrder(struct Input *in, FILE *strm) const char *err2 = "Invalid value for output byte-order.\n"; if (HDfscanf(strm, "%254s", temp) != 1) { - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } if ((kindex = OutputByteOrderStrToInt(temp)) == -1) { - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } @@ -3697,12 +3697,12 @@ getCompressionType(struct Input *in, FILE *strm) const char *err2 = "Invalid value for compression.\n"; if (HDfscanf(strm, "%254s", temp) != 1) { - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } if ((kindex = CompressionTypeStrToInt(temp)) == -1) { - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } @@ -3739,19 +3739,19 @@ getCompressionParameter(struct Input *in, FILE *strm) switch (in->compressionType) { case 0: /* GZIP */ if (HDfscanf(strm, "%d", (&ival)) != 1) { - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } if (ival < 0 || ival > 9) { - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } in->compressionParam = ival; return (0); default: - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } } @@ -3764,7 +3764,7 @@ getExternalFilename(struct Input *in, FILE *strm) const char *err1 = "Unable to get 'string' value.\n"; if (HDfscanf(strm, "%254s", temp) != 1) { - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } @@ -3836,7 +3836,7 @@ createOutputDataType(struct Input *in) break; default: - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } switch (in->outputByteOrder) { @@ -3851,7 +3851,7 @@ createOutputDataType(struct Input *in) break; default: - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } break; @@ -3870,7 +3870,7 @@ createOutputDataType(struct Input *in) break; default: - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } break; @@ -3887,7 +3887,7 @@ createOutputDataType(struct Input *in) break; default: - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } break; @@ -3904,7 +3904,7 @@ createOutputDataType(struct Input *in) break; default: - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } break; @@ -3921,19 +3921,19 @@ createOutputDataType(struct Input *in) break; default: - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } break; default: - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } break; default: - (void)HDfprintf(stderr, "%s", err4); + (void)fprintf(stderr, "%s", err4); return (-1); } break; @@ -3951,7 +3951,7 @@ createOutputDataType(struct Input *in) break; default: - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } switch (in->outputByteOrder) { @@ -3966,13 +3966,13 @@ createOutputDataType(struct Input *in) break; default: - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } break; case 1: - (void)HDfprintf(stderr, "%s", err5); + (void)fprintf(stderr, "%s", err5); return (-1); case 2: @@ -3989,7 +3989,7 @@ createOutputDataType(struct Input *in) break; default: - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } break; @@ -4006,19 +4006,19 @@ createOutputDataType(struct Input *in) break; default: - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } break; default: - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } break; default: - (void)HDfprintf(stderr, "%s", err4); + (void)fprintf(stderr, "%s", err4); return (-1); } break; @@ -4044,7 +4044,7 @@ createOutputDataType(struct Input *in) break; default: - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } switch (in->outputByteOrder) { @@ -4059,7 +4059,7 @@ createOutputDataType(struct Input *in) break; default: - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } break; @@ -4078,7 +4078,7 @@ createOutputDataType(struct Input *in) break; default: - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } break; @@ -4095,7 +4095,7 @@ createOutputDataType(struct Input *in) break; default: - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } break; @@ -4112,7 +4112,7 @@ createOutputDataType(struct Input *in) break; default: - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } break; @@ -4129,29 +4129,29 @@ createOutputDataType(struct Input *in) break; default: - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } break; default: - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } break; case 2: - (void)HDfprintf(stderr, "%s", err6); + (void)fprintf(stderr, "%s", err6); return (-1); default: - (void)HDfprintf(stderr, "%s", err4); + (void)fprintf(stderr, "%s", err4); return (-1); } break; default: - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } return new_type; @@ -4191,7 +4191,7 @@ createInputDataType(struct Input *in) break; default: - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } switch (in->inputByteOrder) { @@ -4206,7 +4206,7 @@ createInputDataType(struct Input *in) break; default: - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } break; @@ -4225,7 +4225,7 @@ createInputDataType(struct Input *in) break; default: - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } break; @@ -4242,7 +4242,7 @@ createInputDataType(struct Input *in) break; default: - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } break; @@ -4259,7 +4259,7 @@ createInputDataType(struct Input *in) break; default: - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } break; @@ -4276,19 +4276,19 @@ createInputDataType(struct Input *in) break; default: - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } break; default: - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } break; default: - (void)HDfprintf(stderr, "%s", err4); + (void)fprintf(stderr, "%s", err4); return (-1); } break; @@ -4306,7 +4306,7 @@ createInputDataType(struct Input *in) break; default: - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } switch (in->inputByteOrder) { @@ -4321,13 +4321,13 @@ createInputDataType(struct Input *in) break; default: - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } break; case 1: - (void)HDfprintf(stderr, "%s", err5); + (void)fprintf(stderr, "%s", err5); return (-1); case 2: @@ -4344,7 +4344,7 @@ createInputDataType(struct Input *in) break; default: - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } break; @@ -4361,19 +4361,19 @@ createInputDataType(struct Input *in) break; default: - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } break; default: - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } break; default: - (void)HDfprintf(stderr, "%s", err4); + (void)fprintf(stderr, "%s", err4); return (-1); } break; @@ -4399,7 +4399,7 @@ createInputDataType(struct Input *in) break; default: - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } switch (in->inputByteOrder) { @@ -4414,7 +4414,7 @@ createInputDataType(struct Input *in) break; default: - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } break; @@ -4433,7 +4433,7 @@ createInputDataType(struct Input *in) break; default: - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } break; @@ -4450,7 +4450,7 @@ createInputDataType(struct Input *in) break; default: - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } break; @@ -4467,7 +4467,7 @@ createInputDataType(struct Input *in) break; default: - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } break; @@ -4484,29 +4484,29 @@ createInputDataType(struct Input *in) break; default: - (void)HDfprintf(stderr, "%s", err3); + (void)fprintf(stderr, "%s", err3); return (-1); } break; default: - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } break; case 2: - (void)HDfprintf(stderr, "%s", err6); + (void)fprintf(stderr, "%s", err6); return (-1); default: - (void)HDfprintf(stderr, "%s", err4); + (void)fprintf(stderr, "%s", err4); return (-1); } break; default: - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } } @@ -4532,7 +4532,7 @@ createInputDataType(struct Input *in) break; default: - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } break; @@ -4550,13 +4550,13 @@ createInputDataType(struct Input *in) break; default: - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } break; case 5: - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); break; @@ -4580,13 +4580,13 @@ createInputDataType(struct Input *in) break; default: - (void)HDfprintf(stderr, "%s", err2); + (void)fprintf(stderr, "%s", err2); return (-1); } break; default: - (void)HDfprintf(stderr, "%s", err1); + (void)fprintf(stderr, "%s", err1); return (-1); } } @@ -4624,7 +4624,7 @@ process(struct Options *opt) { if ((file_id = H5Fopen(opt->outfile, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { if ((file_id = H5Fcreate(opt->outfile, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) == FAIL) { - (void)HDfprintf(stderr, err1, opt->outfile); + (void)fprintf(stderr, err1, opt->outfile); return (-1); } } @@ -4635,13 +4635,13 @@ process(struct Options *opt) in = &(opt->infiles[k].in); if (opt->infiles[k].config == 1) { if (processConfigurationFile(opt->infiles[k].configfile, in) == -1) { - (void)HDfprintf(stderr, err2, opt->infiles[k].configfile); + (void)fprintf(stderr, err2, opt->infiles[k].configfile); return (-1); } } if (processDataFile(opt->infiles[k].datafile, in, file_id) == -1) { - (void)HDfprintf(stderr, err3, opt->infiles[k].datafile); + (void)fprintf(stderr, err3, opt->infiles[k].datafile); return (-1); } @@ -4683,7 +4683,7 @@ process(struct Options *opt) intype = createInputDataType(in); outtype = createOutputDataType(in); #ifdef H5DEBUGIMPORT - HDprintf("process intype %ld outtype %ld\n", intype, outtype); + printf("process intype %ld outtype %ld\n", intype, outtype); #endif /* create property list */ @@ -4701,7 +4701,7 @@ process(struct Options *opt) if (in->configOptionVector[EXTERNALSTORE] == 1) { /* creating the external file if it doesn't exist */ if ((extfile = HDfopen(in->externFilename, "ab")) == NULL) { - (void)HDfprintf(stderr, "%s", err4); + (void)fprintf(stderr, "%s", err4); H5Pclose(proplist); H5Sclose(dataspace); H5Fclose(file_id); @@ -4724,7 +4724,7 @@ process(struct Options *opt) /* create data set */ if ((dataset = H5Dcreate2(handle, in->path.group[j], outtype, dataspace, H5P_DEFAULT, proplist, H5P_DEFAULT)) < 0) { - (void)HDfprintf(stderr, "%s", err5); + (void)fprintf(stderr, "%s", err5); H5Pclose(proplist); H5Sclose(dataspace); H5Fclose(file_id); @@ -4737,7 +4737,7 @@ process(struct Options *opt) /* write dataset */ if (H5Dwrite(dataset, intype, H5S_ALL, H5S_ALL, H5P_DEFAULT, (VOIDP)in->data) < 0) { - (void)HDfprintf(stderr, "%s", err6); + (void)fprintf(stderr, "%s", err6); H5Dclose(dataset); H5Pclose(proplist); H5Sclose(dataspace); @@ -4813,292 +4813,292 @@ swap_uint64(uint64_t val) void help(char *name) { - (void)HDfprintf(stdout, "Name:\n\n"); - (void)HDfprintf(stdout, "\t%s\n\n", name); - (void)HDfprintf(stdout, "\t TOOL NAME:\n"); - (void)HDfprintf(stdout, "\t %s\n", name); - (void)HDfprintf(stdout, "\t SYNTAX:\n"); - (void)HDfprintf(stdout, "\t %s -h[elp], OR\n", name); - (void)HDfprintf(stdout, "\t %s <infile> -c[onfig] <configfile> [<infile> -c[config] <configfile>...]", - name); - (void)HDfprintf(stdout, "\t\t\t\t -o[utfile] <outfile>\n\n"); - (void)HDfprintf(stdout, "\t PURPOSE:\n"); - (void)HDfprintf(stdout, "\t To convert data stored in one or more ASCII or binary files\n"); - (void)HDfprintf(stdout, "\t into one or more datasets (in accordance with the \n"); - (void)HDfprintf(stdout, "\t user-specified type and storage properties) in an existing \n"); - (void)HDfprintf(stdout, "\t or new HDF5 file.\n\n"); - (void)HDfprintf(stdout, "\t DESCRIPTION:\n"); - (void)HDfprintf(stdout, "\t The primary objective of the utility is to convert floating\n"); - (void)HDfprintf(stdout, "\t point or integer data stored in ASCII text or binary form \n"); - (void)HDfprintf(stdout, "\t into a data-set according to the type and storage properties\n"); - (void)HDfprintf(stdout, "\t specified by the user. The utility can also accept ASCII\n"); - (void)HDfprintf(stdout, "\t text files and store the contents in a compact form as an\n"); - (void)HDfprintf(stdout, "\t array of one-dimensional strings.\n\n"); - (void)HDfprintf(stdout, "\t The input data to be written as a data-set can be provided\n"); - (void)HDfprintf(stdout, "\t to the utility in one of the following forms:\n"); - (void)HDfprintf(stdout, "\t 1. ASCII text file with numeric data (floating point or \n"); - (void)HDfprintf(stdout, "\t integer data). \n"); - (void)HDfprintf(stdout, "\t 2. Binary file with native floating point data (32-bit or \n"); - (void)HDfprintf(stdout, "\t 64-bit) \n"); - (void)HDfprintf(stdout, "\t 3. Binary file with native integer (signed or unsigned)\n"); - (void)HDfprintf(stdout, "\t data (8-bit or 16-bit or 32-bit or 64-bit). \n"); - (void)HDfprintf(stdout, "\t 4. ASCII text file containing strings (text data).\n"); - (void)HDfprintf(stdout, "\t \n"); - (void)HDfprintf(stdout, "\t Every input file is associated with a configuration file \n"); - (void)HDfprintf(stdout, "\t also provided as an input to the utility. (See Section \n"); - (void)HDfprintf(stdout, "\t \"CONFIGURATION FILE\" to know how it is to be organized).\n"); - (void)HDfprintf(stdout, "\t The class, size and dimensions of the input data is \n"); - (void)HDfprintf(stdout, "\t specified in this configuration file. A point to note is\n"); - (void)HDfprintf(stdout, "\t that the floating point data in the ASCII text file may be\n"); - (void)HDfprintf(stdout, "\t organized in the fixed floating form (for example 323.56)\n"); - (void)HDfprintf(stdout, "\t or in a scientific notation (for example 3.23E+02). A \n"); - (void)HDfprintf(stdout, "\t different input-class specification is to be used for both\n"); - (void)HDfprintf(stdout, "\t forms.\n\n"); - (void)HDfprintf(stdout, "\t The utility extracts the input data from the input file \n"); - (void)HDfprintf(stdout, "\t according to the specified parameters and saves it into \n"); - (void)HDfprintf(stdout, "\t an H5 dataset. \n\n"); - (void)HDfprintf(stdout, "\t The user can specify output type and storage properties in \n"); - (void)HDfprintf(stdout, "\t the configuration file. The user is required to specify the \n"); - (void)HDfprintf(stdout, "\t path of the dataset. If the groups in the path leading to \n"); - (void)HDfprintf(stdout, "\t the data-set do not exist, the groups will be created by the\n"); - (void)HDfprintf(stdout, "\t utility. If no group is specified, the dataset will be\n"); - (void)HDfprintf(stdout, "\t created under the root group.\n\n"); - (void)HDfprintf(stdout, "\t In addition to the name, the user is also required to \n"); - (void)HDfprintf(stdout, "\t provide the class and size of output data to be written to \n"); - (void)HDfprintf(stdout, "\t the dataset and may optionally specify the output-architecture,\n"); - (void)HDfprintf(stdout, "\t and the output-byte-order. If output-architecture is not \n"); - (void)HDfprintf(stdout, "\t specified the default is NATIVE. Output-byte-orders are fixed\n"); - (void)HDfprintf(stdout, "\t for some architectures and may be specified only if output-\n"); - (void)HDfprintf(stdout, "\t architecture is IEEE, UNIX or STD.\n\n"); - (void)HDfprintf(stdout, "\t Also, layout and other storage properties such as \n"); - (void)HDfprintf(stdout, "\t compression, external storage and extendible data-sets may be\n"); - (void)HDfprintf(stdout, "\t optionally specified. The layout and storage properties \n"); - (void)HDfprintf(stdout, "\t denote how raw data is to be organized on the disk. If these \n"); - (void)HDfprintf(stdout, "\t options are not specified the default is Contiguous layout \n"); - (void)HDfprintf(stdout, "\t and storage.\n\n"); - (void)HDfprintf(stdout, "\t The dataset can be organized in any of the following ways:\n"); - (void)HDfprintf(stdout, "\t 1. Contiguous.\n"); - (void)HDfprintf(stdout, "\t 2. Chunked.\n"); - (void)HDfprintf(stdout, "\t 3. External Storage File (has to be contiguous)\n"); - (void)HDfprintf(stdout, "\t 4. Extendible data sets (has to be chunked)\n"); - (void)HDfprintf(stdout, "\t 5. Compressed. (has to be chunked)\n"); - (void)HDfprintf(stdout, "\t 6. Compressed & Extendible (has to be chunked)\n\n"); - (void)HDfprintf(stdout, "\t If the user wants to store raw data in a non-HDF file then \n"); - (void)HDfprintf(stdout, "\t the external storage file option is to be used and the name \n"); - (void)HDfprintf(stdout, "\t of the file is to be specified. \n\n"); - (void)HDfprintf(stdout, "\t If the user wants the dimensions of the data-set to be\n"); - (void)HDfprintf(stdout, "\t unlimited, the extendible data set option can be chosen. \n\n"); - (void)HDfprintf(stdout, "\t The user may also specify the type of compression and the \n"); - (void)HDfprintf(stdout, "\t level to which the data set must be compresses by setting \n"); - (void)HDfprintf(stdout, "\t the compressed option.\n\n"); - (void)HDfprintf(stdout, "\t SYNOPSIS:\n"); - (void)HDfprintf(stdout, "\t h5import -h[elp], OR\n"); - (void)HDfprintf(stdout, "\t h5import <infile> -c[onfig] <configfile> \ + (void)fprintf(stdout, "Name:\n\n"); + (void)fprintf(stdout, "\t%s\n\n", name); + (void)fprintf(stdout, "\t TOOL NAME:\n"); + (void)fprintf(stdout, "\t %s\n", name); + (void)fprintf(stdout, "\t SYNTAX:\n"); + (void)fprintf(stdout, "\t %s -h[elp], OR\n", name); + (void)fprintf(stdout, "\t %s <infile> -c[onfig] <configfile> [<infile> -c[config] <configfile>...]", + name); + (void)fprintf(stdout, "\t\t\t\t -o[utfile] <outfile>\n\n"); + (void)fprintf(stdout, "\t PURPOSE:\n"); + (void)fprintf(stdout, "\t To convert data stored in one or more ASCII or binary files\n"); + (void)fprintf(stdout, "\t into one or more datasets (in accordance with the \n"); + (void)fprintf(stdout, "\t user-specified type and storage properties) in an existing \n"); + (void)fprintf(stdout, "\t or new HDF5 file.\n\n"); + (void)fprintf(stdout, "\t DESCRIPTION:\n"); + (void)fprintf(stdout, "\t The primary objective of the utility is to convert floating\n"); + (void)fprintf(stdout, "\t point or integer data stored in ASCII text or binary form \n"); + (void)fprintf(stdout, "\t into a data-set according to the type and storage properties\n"); + (void)fprintf(stdout, "\t specified by the user. The utility can also accept ASCII\n"); + (void)fprintf(stdout, "\t text files and store the contents in a compact form as an\n"); + (void)fprintf(stdout, "\t array of one-dimensional strings.\n\n"); + (void)fprintf(stdout, "\t The input data to be written as a data-set can be provided\n"); + (void)fprintf(stdout, "\t to the utility in one of the following forms:\n"); + (void)fprintf(stdout, "\t 1. ASCII text file with numeric data (floating point or \n"); + (void)fprintf(stdout, "\t integer data). \n"); + (void)fprintf(stdout, "\t 2. Binary file with native floating point data (32-bit or \n"); + (void)fprintf(stdout, "\t 64-bit) \n"); + (void)fprintf(stdout, "\t 3. Binary file with native integer (signed or unsigned)\n"); + (void)fprintf(stdout, "\t data (8-bit or 16-bit or 32-bit or 64-bit). \n"); + (void)fprintf(stdout, "\t 4. ASCII text file containing strings (text data).\n"); + (void)fprintf(stdout, "\t \n"); + (void)fprintf(stdout, "\t Every input file is associated with a configuration file \n"); + (void)fprintf(stdout, "\t also provided as an input to the utility. (See Section \n"); + (void)fprintf(stdout, "\t \"CONFIGURATION FILE\" to know how it is to be organized).\n"); + (void)fprintf(stdout, "\t The class, size and dimensions of the input data is \n"); + (void)fprintf(stdout, "\t specified in this configuration file. A point to note is\n"); + (void)fprintf(stdout, "\t that the floating point data in the ASCII text file may be\n"); + (void)fprintf(stdout, "\t organized in the fixed floating form (for example 323.56)\n"); + (void)fprintf(stdout, "\t or in a scientific notation (for example 3.23E+02). A \n"); + (void)fprintf(stdout, "\t different input-class specification is to be used for both\n"); + (void)fprintf(stdout, "\t forms.\n\n"); + (void)fprintf(stdout, "\t The utility extracts the input data from the input file \n"); + (void)fprintf(stdout, "\t according to the specified parameters and saves it into \n"); + (void)fprintf(stdout, "\t an H5 dataset. \n\n"); + (void)fprintf(stdout, "\t The user can specify output type and storage properties in \n"); + (void)fprintf(stdout, "\t the configuration file. The user is required to specify the \n"); + (void)fprintf(stdout, "\t path of the dataset. If the groups in the path leading to \n"); + (void)fprintf(stdout, "\t the data-set do not exist, the groups will be created by the\n"); + (void)fprintf(stdout, "\t utility. If no group is specified, the dataset will be\n"); + (void)fprintf(stdout, "\t created under the root group.\n\n"); + (void)fprintf(stdout, "\t In addition to the name, the user is also required to \n"); + (void)fprintf(stdout, "\t provide the class and size of output data to be written to \n"); + (void)fprintf(stdout, "\t the dataset and may optionally specify the output-architecture,\n"); + (void)fprintf(stdout, "\t and the output-byte-order. If output-architecture is not \n"); + (void)fprintf(stdout, "\t specified the default is NATIVE. Output-byte-orders are fixed\n"); + (void)fprintf(stdout, "\t for some architectures and may be specified only if output-\n"); + (void)fprintf(stdout, "\t architecture is IEEE, UNIX or STD.\n\n"); + (void)fprintf(stdout, "\t Also, layout and other storage properties such as \n"); + (void)fprintf(stdout, "\t compression, external storage and extendible data-sets may be\n"); + (void)fprintf(stdout, "\t optionally specified. The layout and storage properties \n"); + (void)fprintf(stdout, "\t denote how raw data is to be organized on the disk. If these \n"); + (void)fprintf(stdout, "\t options are not specified the default is Contiguous layout \n"); + (void)fprintf(stdout, "\t and storage.\n\n"); + (void)fprintf(stdout, "\t The dataset can be organized in any of the following ways:\n"); + (void)fprintf(stdout, "\t 1. Contiguous.\n"); + (void)fprintf(stdout, "\t 2. Chunked.\n"); + (void)fprintf(stdout, "\t 3. External Storage File (has to be contiguous)\n"); + (void)fprintf(stdout, "\t 4. Extendible data sets (has to be chunked)\n"); + (void)fprintf(stdout, "\t 5. Compressed. (has to be chunked)\n"); + (void)fprintf(stdout, "\t 6. Compressed & Extendible (has to be chunked)\n\n"); + (void)fprintf(stdout, "\t If the user wants to store raw data in a non-HDF file then \n"); + (void)fprintf(stdout, "\t the external storage file option is to be used and the name \n"); + (void)fprintf(stdout, "\t of the file is to be specified. \n\n"); + (void)fprintf(stdout, "\t If the user wants the dimensions of the data-set to be\n"); + (void)fprintf(stdout, "\t unlimited, the extendible data set option can be chosen. \n\n"); + (void)fprintf(stdout, "\t The user may also specify the type of compression and the \n"); + (void)fprintf(stdout, "\t level to which the data set must be compresses by setting \n"); + (void)fprintf(stdout, "\t the compressed option.\n\n"); + (void)fprintf(stdout, "\t SYNOPSIS:\n"); + (void)fprintf(stdout, "\t h5import -h[elp], OR\n"); + (void)fprintf(stdout, "\t h5import <infile> -c[onfig] <configfile> \ [<infile> -c[config] <confile2>...] -o[utfile] <outfile>\n\n"); - (void)HDfprintf(stdout, "\t -h[elp]:\n"); - (void)HDfprintf(stdout, "\t Prints this summary of usage, and exits.\n\n"); - (void)HDfprintf(stdout, "\t <infile(s)>:\n"); - (void)HDfprintf(stdout, "\t Name of the Input file(s), containing a \n"); - (void)HDfprintf(stdout, "\t single n-dimensional floating point or integer array \n"); - (void)HDfprintf(stdout, "\t in either ASCII text, native floating point(32-bit \n"); - (void)HDfprintf(stdout, "\t or 64-bit) or native integer(8-bit or 16-bit or \n"); - (void)HDfprintf(stdout, "\t 32-bit or 64-bit). Data to be specified in the order\n"); - (void)HDfprintf(stdout, "\t of fastest changing dimensions first.\n\n"); - (void)HDfprintf(stdout, "\t -c[config] <configfile>:\n"); - (void)HDfprintf(stdout, "\t Every input file should be associated with a \n"); - (void)HDfprintf(stdout, "\t configuration file and this is done by the -c option.\n"); - (void)HDfprintf(stdout, "\t <configfile> is the name of the configuration file.\n"); - (void)HDfprintf(stdout, "\t (See Section \"CONFIGURATION FILE\")\n\n"); - (void)HDfprintf(stdout, "\t -o[utfile] <outfile>:\n"); - (void)HDfprintf(stdout, "\t Name of the HDF5 output file. Data from one or more \n"); - (void)HDfprintf(stdout, "\t input files are stored as one or more data sets in \n"); - (void)HDfprintf(stdout, "\t <outfile>. The output file may be an existing file or \n"); - (void)HDfprintf(stdout, "\t it maybe new in which case it will be created.\n\n\n"); - (void)HDfprintf(stdout, "\t CONFIGURATION FILE:\n"); - (void)HDfprintf(stdout, "\t The configuration file is an ASCII text file and must be \n"); - (void)HDfprintf(stdout, "\t the ddl formatted file (without data values) produced by h5dump \n"); - (void)HDfprintf(stdout, "\t when used with the options '-o outfilename -b' of a single dataset (-d) \n"); - (void)HDfprintf(stdout, "\t OR organized as \"CONFIG-KEYWORD VALUE\" pairs, one pair on each \n"); - (void)HDfprintf(stdout, "\t line.\n\n"); - (void)HDfprintf(stdout, "\t The configuration file may have the following keywords each \n"); - (void)HDfprintf(stdout, "\t followed by an acceptable value.\n\n"); - (void)HDfprintf(stdout, "\t Required KEYWORDS:\n"); - (void)HDfprintf(stdout, "\t PATH\n"); - (void)HDfprintf(stdout, "\t INPUT-CLASS\n"); - (void)HDfprintf(stdout, "\t INPUT-SIZE\n"); - (void)HDfprintf(stdout, "\t INPUT-BYTE-ORDER\n"); - (void)HDfprintf(stdout, "\t RANK\n"); - (void)HDfprintf(stdout, "\t DIMENSION-SIZES\n"); - (void)HDfprintf(stdout, "\t OUTPUT-CLASS\n"); - (void)HDfprintf(stdout, "\t OUTPUT-SIZE\n\n"); - (void)HDfprintf(stdout, "\t Optional KEYWORDS:\n"); - (void)HDfprintf(stdout, "\t OUTPUT-ARCHITECTURE\n"); - (void)HDfprintf(stdout, "\t OUTPUT-BYTE-ORDER\n"); - (void)HDfprintf(stdout, "\t CHUNKED-DIMENSION-SIZES\n"); - (void)HDfprintf(stdout, "\t COMPRESSION-TYPE\n"); - (void)HDfprintf(stdout, "\t COMPRESSION-PARAM\n"); - (void)HDfprintf(stdout, "\t EXTERNAL-STORAGE\n"); - (void)HDfprintf(stdout, "\t MAXIMUM-DIMENSIONS\n\n\n"); - (void)HDfprintf(stdout, "\t Values for keywords:\n"); - (void)HDfprintf(stdout, "\t PATH:\n"); - (void)HDfprintf(stdout, "\t Strings separated by spaces to represent\n"); - (void)HDfprintf(stdout, "\t the path of the data-set. If the groups in\n"); - (void)HDfprintf(stdout, "\t the path do not exist, they will be created. \n"); - (void)HDfprintf(stdout, "\t For example,\n"); - (void)HDfprintf(stdout, "\t PATH grp1/grp2/dataset1\n"); - (void)HDfprintf(stdout, "\t PATH: keyword\n"); - (void)HDfprintf(stdout, "\t grp1: group under the root. If\n"); - (void)HDfprintf(stdout, "\t non-existent will be created.\n"); - (void)HDfprintf(stdout, "\t grp2: group under grp1. If \n"); - (void)HDfprintf(stdout, "\t non-existent will be created \n"); - (void)HDfprintf(stdout, "\t under grp1.\n"); - (void)HDfprintf(stdout, "\t dataset1: the name of the data-set \n"); - (void)HDfprintf(stdout, "\t to be created.\n\n"); - (void)HDfprintf(stdout, "\t INPUT-CLASS:\n"); - (void)HDfprintf(stdout, "\t String denoting the type of input data.\n"); - (void)HDfprintf(stdout, "\t (\"TEXTIN\", \"TEXTFP\", \"FP\", \"IN\", \n"); - (void)HDfprintf(stdout, "\t \"STR\", \"TEXTUIN\", \"UIN\"). \n"); - (void)HDfprintf(stdout, "\t INPUT-CLASS \"TEXTIN\" denotes an ASCII text \n"); - (void)HDfprintf(stdout, "\t file with signed integer data in ASCII form,\n"); - (void)HDfprintf(stdout, "\t INPUT-CLASS \"TEXTUIN\" denotes an ASCII text \n"); - (void)HDfprintf(stdout, "\t file with unsigned integer data in ASCII form,\n"); - (void)HDfprintf(stdout, "\t \"TEXTFP\" denotes an ASCII text file containing\n"); - (void)HDfprintf(stdout, "\t floating point data in the fixed notation\n"); - (void)HDfprintf(stdout, "\t (325.34),\n"); - (void)HDfprintf(stdout, "\t \"FP\" denotes a floating point binary file,\n"); - (void)HDfprintf(stdout, "\t \"IN\" denotes a signed integer binary file,\n"); - (void)HDfprintf(stdout, "\t \"UIN\" denotes an unsigned integer binary file,\n"); - (void)HDfprintf(stdout, "\t & \"STR\" denotes an ASCII text file the \n"); - (void)HDfprintf(stdout, "\t contents of which should be stored as an 1-D \n"); - (void)HDfprintf(stdout, "\t array of strings.\n"); - (void)HDfprintf(stdout, "\t If INPUT-CLASS is \"STR\", then RANK, \n"); - (void)HDfprintf(stdout, "\t DIMENSION-SIZES, OUTPUT-CLASS, OUTPUT-SIZE, \n"); - (void)HDfprintf(stdout, "\t OUTPUT-ARCHITECTURE and OUTPUT-BYTE-ORDER \n"); - (void)HDfprintf(stdout, "\t will be ignored.\n\n\n"); - (void)HDfprintf(stdout, "\t INPUT-SIZE:\n"); - (void)HDfprintf(stdout, "\t Integer denoting the size of the input data \n"); - (void)HDfprintf(stdout, "\t (8, 16, 32, 64). \n\n"); - (void)HDfprintf(stdout, "\t For floating point,\n"); - (void)HDfprintf(stdout, "\t INPUT-SIZE can be 32 or 64.\n"); - (void)HDfprintf(stdout, "\t For integers (signed and unsigned)\n"); - (void)HDfprintf(stdout, "\t INPUT-SIZE can be 8, 16, 32 or 64.\n\n"); - (void)HDfprintf(stdout, "\t RANK:\n"); - (void)HDfprintf(stdout, "\t Integer denoting the number of dimensions.\n\n"); - (void)HDfprintf(stdout, "\t DIMENSION-SIZES:\n"); - (void)HDfprintf(stdout, "\t Integers separated by spaces to denote the \n"); - (void)HDfprintf(stdout, "\t dimension sizes for the no. of dimensions \n"); - (void)HDfprintf(stdout, "\t determined by rank.\n\n"); - (void)HDfprintf(stdout, "\t OUTPUT-CLASS:\n"); - (void)HDfprintf(stdout, "\t String dentoting data type of the dataset to \n"); - (void)HDfprintf(stdout, "\t be written (\"IN\",\"FP\", \"UIN\")\n\n"); - (void)HDfprintf(stdout, "\t OUTPUT-SIZE:\n"); - (void)HDfprintf(stdout, "\t Integer denoting the size of the data in the \n"); - (void)HDfprintf(stdout, "\t output dataset to be written.\n"); - (void)HDfprintf(stdout, "\t If OUTPUT-CLASS is \"FP\", OUTPUT-SIZE can be \n"); - (void)HDfprintf(stdout, "\t 32 or 64.\n"); - (void)HDfprintf(stdout, "\t If OUTPUT-CLASS is \"IN\" or \"UIN\", OUTPUT-SIZE\n"); - (void)HDfprintf(stdout, "\t can be 8, 16, 32 or 64.\n\n"); - (void)HDfprintf(stdout, "\t OUTPUT-ARCHITECTURE:\n"); - (void)HDfprintf(stdout, "\t STRING denoting the type of output \n"); - (void)HDfprintf(stdout, "\t architecture. Can accept the following values\n"); - (void)HDfprintf(stdout, "\t STD\n"); - (void)HDfprintf(stdout, "\t IEEE\n"); - (void)HDfprintf(stdout, "\t INTEL\n"); - (void)HDfprintf(stdout, "\t CRAY\n"); - (void)HDfprintf(stdout, "\t MIPS\n"); - (void)HDfprintf(stdout, "\t ALPHA\n"); - (void)HDfprintf(stdout, "\t NATIVE (default)\n"); - (void)HDfprintf(stdout, "\t UNIX\n\n"); - (void)HDfprintf(stdout, "\t OUTPUT-BYTE-ORDER:\n"); - (void)HDfprintf(stdout, "\t String denoting the output-byte-order. Ignored\n"); - (void)HDfprintf(stdout, "\t if the OUTPUT-ARCHITECTURE is not specified or\n"); - (void)HDfprintf(stdout, "\t if it is IEEE, UNIX or STD. Can accept the \n"); - (void)HDfprintf(stdout, "\t following values.\n"); - (void)HDfprintf(stdout, "\t BE (default)\n"); - (void)HDfprintf(stdout, "\t LE\n\n"); - (void)HDfprintf(stdout, "\t CHUNKED-DIMENSION-SIZES:\n"); - (void)HDfprintf(stdout, "\t Integers separated by spaces to denote the \n"); - (void)HDfprintf(stdout, "\t dimension sizes of the chunk for the no. of \n"); - (void)HDfprintf(stdout, "\t dimensions determined by rank. Required field\n"); - (void)HDfprintf(stdout, "\t to denote that the dataset will be stored with\n"); - (void)HDfprintf(stdout, "\t chunked storage. If this field is absent the\n"); - (void)HDfprintf(stdout, "\t dataset will be stored with contiguous storage.\n\n"); - (void)HDfprintf(stdout, "\t COMPRESSION-TYPE:\n"); - (void)HDfprintf(stdout, "\t String denoting the type of compression to be\n"); - (void)HDfprintf(stdout, "\t used with the chunked storage. Requires the\n"); - (void)HDfprintf(stdout, "\t CHUNKED-DIMENSION-SIZES to be specified. The only \n"); - (void)HDfprintf(stdout, "\t currently supported compression method is GZIP. \n"); - (void)HDfprintf(stdout, "\t Will accept the following value\n"); - (void)HDfprintf(stdout, "\t GZIP\n\n"); - (void)HDfprintf(stdout, "\t COMPRESSION-PARAM:\n"); - (void)HDfprintf(stdout, "\t Integer used to denote compression level and \n"); - (void)HDfprintf(stdout, "\t this option is to be always specified when \n"); - (void)HDfprintf(stdout, "\t the COMPRESSION-TYPE option is specified. The\n"); - (void)HDfprintf(stdout, "\t values are applicable only to GZIP \n"); - (void)HDfprintf(stdout, "\t compression.\n"); - (void)HDfprintf(stdout, "\t Value 1-9: The level of Compression. \n"); - (void)HDfprintf(stdout, "\t 1 will result in the fastest \n"); - (void)HDfprintf(stdout, "\t compression while 9 will result in \n"); - (void)HDfprintf(stdout, "\t the best compression ratio. The default\n"); - (void)HDfprintf(stdout, "\t level of compression is 6.\n\n"); - (void)HDfprintf(stdout, "\t EXTERNAL-STORAGE:\n"); - (void)HDfprintf(stdout, "\t String to denote the name of the non-HDF5 file \n"); - (void)HDfprintf(stdout, "\t to store data to. Cannot be used if CHUNKED-\n"); - (void)HDfprintf(stdout, "\t DIMENSIONS or COMPRESSION-TYPE or EXTENDIBLE-\n"); - (void)HDfprintf(stdout, "\t DATASET is specified.\n"); - (void)HDfprintf(stdout, "\t Value <external-filename>: the name of the \n"); - (void)HDfprintf(stdout, "\t external file as a string to be used.\n\n"); - (void)HDfprintf(stdout, "\t MAXIMUM-DIMENSIONS:\n"); - (void)HDfprintf(stdout, "\t Integers separated by spaces to denote the \n"); - (void)HDfprintf(stdout, "\t maximum dimension sizes of all the \n"); - (void)HDfprintf(stdout, "\t dimensions determined by rank. Requires the\n"); - (void)HDfprintf(stdout, "\t CHUNKED-DIMENSION-SIZES to be specified. A value of \n"); - (void)HDfprintf(stdout, "\t -1 for any dimension implies UNLIMITED \n"); - (void)HDfprintf(stdout, "\t DIMENSION size for that particular dimension.\n\n"); - (void)HDfprintf(stdout, "\t EXAMPLES:\n"); - (void)HDfprintf(stdout, "\t 1. Configuration File may look like:\n\n"); - (void)HDfprintf(stdout, "\t PATH work h5 pkamat First-set\n"); - (void)HDfprintf(stdout, "\t INPUT-CLASS TEXTFP\n"); - (void)HDfprintf(stdout, "\t RANK 3\n"); - (void)HDfprintf(stdout, "\t DIMENSION-SIZES 5 2 4\n"); - (void)HDfprintf(stdout, "\t OUTPUT-CLASS FP\n"); - (void)HDfprintf(stdout, "\t OUTPUT-SIZE 64\n"); - (void)HDfprintf(stdout, "\t OUTPUT-ARCHITECTURE IEEE\n"); - (void)HDfprintf(stdout, "\t OUTPUT-BYTE-ORDER LE\n"); - (void)HDfprintf(stdout, "\t CHUNKED-DIMENSION-SIZES 2 2 2 \n\n"); - (void)HDfprintf(stdout, "\t The above configuration will accept a floating point array \n"); - (void)HDfprintf(stdout, "\t (5 x 2 x 4) in an ASCII file with the rank and dimension sizes \n"); - (void)HDfprintf(stdout, "\t specified and will save it in a chunked data-set (of pattern \n"); - (void)HDfprintf(stdout, "\t 2 X 2 X 2) of 64-bit floating point in the little-endian order \n"); - (void)HDfprintf(stdout, "\t and IEEE architecture. The dataset will be stored at\n"); - (void)HDfprintf(stdout, "\t \"/work/h5/pkamat/First-set\"\n\n"); - (void)HDfprintf(stdout, "\t 2. Another configuration could be:\n\n"); - (void)HDfprintf(stdout, "\t PATH Second-set\n"); - (void)HDfprintf(stdout, "\t INPUT-CLASS IN \n"); - (void)HDfprintf(stdout, "\t RANK 5\n"); - (void)HDfprintf(stdout, "\t DIMENSION-SIZES 6 3 5 2 4\n"); - (void)HDfprintf(stdout, "\t OUTPUT-CLASS IN\n"); - (void)HDfprintf(stdout, "\t OUTPUT-SIZE 32\n"); - (void)HDfprintf(stdout, "\t CHUNKED-DIMENSION-SIZES 2 2 2 2 2\n"); - (void)HDfprintf(stdout, "\t EXTENDIBLE-DATASET 1 3 \n"); - (void)HDfprintf(stdout, "\t COMPRESSION-TYPE GZIP\n"); - (void)HDfprintf(stdout, "\t COMPRESSION-PARAM 7\n\n\n"); - (void)HDfprintf(stdout, "\t The above configuration will accept an integer array \n"); - (void)HDfprintf(stdout, "\t (6 X 3 X 5 x 2 x 4) in a binary file with the rank and \n"); - (void)HDfprintf(stdout, "\t dimension sizes specified and will save it in a chunked data-set\n"); - (void)HDfprintf(stdout, "\t (of pattern 2 X 2 X 2 X 2 X 2) of 32-bit floating point in \n"); - (void)HDfprintf(stdout, "\t native format (as output-architecture is not specified). The \n"); - (void)HDfprintf(stdout, "\t first and the third dimension will be defined as unlimited. The \n"); - (void)HDfprintf(stdout, "\t data-set will be compressed using GZIP and a compression level \n"); - (void)HDfprintf(stdout, "\t of 7.\n"); - (void)HDfprintf(stdout, "\t The dataset will be stored at \"/Second-set\"\n\n"); + (void)fprintf(stdout, "\t -h[elp]:\n"); + (void)fprintf(stdout, "\t Prints this summary of usage, and exits.\n\n"); + (void)fprintf(stdout, "\t <infile(s)>:\n"); + (void)fprintf(stdout, "\t Name of the Input file(s), containing a \n"); + (void)fprintf(stdout, "\t single n-dimensional floating point or integer array \n"); + (void)fprintf(stdout, "\t in either ASCII text, native floating point(32-bit \n"); + (void)fprintf(stdout, "\t or 64-bit) or native integer(8-bit or 16-bit or \n"); + (void)fprintf(stdout, "\t 32-bit or 64-bit). Data to be specified in the order\n"); + (void)fprintf(stdout, "\t of fastest changing dimensions first.\n\n"); + (void)fprintf(stdout, "\t -c[config] <configfile>:\n"); + (void)fprintf(stdout, "\t Every input file should be associated with a \n"); + (void)fprintf(stdout, "\t configuration file and this is done by the -c option.\n"); + (void)fprintf(stdout, "\t <configfile> is the name of the configuration file.\n"); + (void)fprintf(stdout, "\t (See Section \"CONFIGURATION FILE\")\n\n"); + (void)fprintf(stdout, "\t -o[utfile] <outfile>:\n"); + (void)fprintf(stdout, "\t Name of the HDF5 output file. Data from one or more \n"); + (void)fprintf(stdout, "\t input files are stored as one or more data sets in \n"); + (void)fprintf(stdout, "\t <outfile>. The output file may be an existing file or \n"); + (void)fprintf(stdout, "\t it maybe new in which case it will be created.\n\n\n"); + (void)fprintf(stdout, "\t CONFIGURATION FILE:\n"); + (void)fprintf(stdout, "\t The configuration file is an ASCII text file and must be \n"); + (void)fprintf(stdout, "\t the ddl formatted file (without data values) produced by h5dump \n"); + (void)fprintf(stdout, "\t when used with the options '-o outfilename -b' of a single dataset (-d) \n"); + (void)fprintf(stdout, "\t OR organized as \"CONFIG-KEYWORD VALUE\" pairs, one pair on each \n"); + (void)fprintf(stdout, "\t line.\n\n"); + (void)fprintf(stdout, "\t The configuration file may have the following keywords each \n"); + (void)fprintf(stdout, "\t followed by an acceptable value.\n\n"); + (void)fprintf(stdout, "\t Required KEYWORDS:\n"); + (void)fprintf(stdout, "\t PATH\n"); + (void)fprintf(stdout, "\t INPUT-CLASS\n"); + (void)fprintf(stdout, "\t INPUT-SIZE\n"); + (void)fprintf(stdout, "\t INPUT-BYTE-ORDER\n"); + (void)fprintf(stdout, "\t RANK\n"); + (void)fprintf(stdout, "\t DIMENSION-SIZES\n"); + (void)fprintf(stdout, "\t OUTPUT-CLASS\n"); + (void)fprintf(stdout, "\t OUTPUT-SIZE\n\n"); + (void)fprintf(stdout, "\t Optional KEYWORDS:\n"); + (void)fprintf(stdout, "\t OUTPUT-ARCHITECTURE\n"); + (void)fprintf(stdout, "\t OUTPUT-BYTE-ORDER\n"); + (void)fprintf(stdout, "\t CHUNKED-DIMENSION-SIZES\n"); + (void)fprintf(stdout, "\t COMPRESSION-TYPE\n"); + (void)fprintf(stdout, "\t COMPRESSION-PARAM\n"); + (void)fprintf(stdout, "\t EXTERNAL-STORAGE\n"); + (void)fprintf(stdout, "\t MAXIMUM-DIMENSIONS\n\n\n"); + (void)fprintf(stdout, "\t Values for keywords:\n"); + (void)fprintf(stdout, "\t PATH:\n"); + (void)fprintf(stdout, "\t Strings separated by spaces to represent\n"); + (void)fprintf(stdout, "\t the path of the data-set. If the groups in\n"); + (void)fprintf(stdout, "\t the path do not exist, they will be created. \n"); + (void)fprintf(stdout, "\t For example,\n"); + (void)fprintf(stdout, "\t PATH grp1/grp2/dataset1\n"); + (void)fprintf(stdout, "\t PATH: keyword\n"); + (void)fprintf(stdout, "\t grp1: group under the root. If\n"); + (void)fprintf(stdout, "\t non-existent will be created.\n"); + (void)fprintf(stdout, "\t grp2: group under grp1. If \n"); + (void)fprintf(stdout, "\t non-existent will be created \n"); + (void)fprintf(stdout, "\t under grp1.\n"); + (void)fprintf(stdout, "\t dataset1: the name of the data-set \n"); + (void)fprintf(stdout, "\t to be created.\n\n"); + (void)fprintf(stdout, "\t INPUT-CLASS:\n"); + (void)fprintf(stdout, "\t String denoting the type of input data.\n"); + (void)fprintf(stdout, "\t (\"TEXTIN\", \"TEXTFP\", \"FP\", \"IN\", \n"); + (void)fprintf(stdout, "\t \"STR\", \"TEXTUIN\", \"UIN\"). \n"); + (void)fprintf(stdout, "\t INPUT-CLASS \"TEXTIN\" denotes an ASCII text \n"); + (void)fprintf(stdout, "\t file with signed integer data in ASCII form,\n"); + (void)fprintf(stdout, "\t INPUT-CLASS \"TEXTUIN\" denotes an ASCII text \n"); + (void)fprintf(stdout, "\t file with unsigned integer data in ASCII form,\n"); + (void)fprintf(stdout, "\t \"TEXTFP\" denotes an ASCII text file containing\n"); + (void)fprintf(stdout, "\t floating point data in the fixed notation\n"); + (void)fprintf(stdout, "\t (325.34),\n"); + (void)fprintf(stdout, "\t \"FP\" denotes a floating point binary file,\n"); + (void)fprintf(stdout, "\t \"IN\" denotes a signed integer binary file,\n"); + (void)fprintf(stdout, "\t \"UIN\" denotes an unsigned integer binary file,\n"); + (void)fprintf(stdout, "\t & \"STR\" denotes an ASCII text file the \n"); + (void)fprintf(stdout, "\t contents of which should be stored as an 1-D \n"); + (void)fprintf(stdout, "\t array of strings.\n"); + (void)fprintf(stdout, "\t If INPUT-CLASS is \"STR\", then RANK, \n"); + (void)fprintf(stdout, "\t DIMENSION-SIZES, OUTPUT-CLASS, OUTPUT-SIZE, \n"); + (void)fprintf(stdout, "\t OUTPUT-ARCHITECTURE and OUTPUT-BYTE-ORDER \n"); + (void)fprintf(stdout, "\t will be ignored.\n\n\n"); + (void)fprintf(stdout, "\t INPUT-SIZE:\n"); + (void)fprintf(stdout, "\t Integer denoting the size of the input data \n"); + (void)fprintf(stdout, "\t (8, 16, 32, 64). \n\n"); + (void)fprintf(stdout, "\t For floating point,\n"); + (void)fprintf(stdout, "\t INPUT-SIZE can be 32 or 64.\n"); + (void)fprintf(stdout, "\t For integers (signed and unsigned)\n"); + (void)fprintf(stdout, "\t INPUT-SIZE can be 8, 16, 32 or 64.\n\n"); + (void)fprintf(stdout, "\t RANK:\n"); + (void)fprintf(stdout, "\t Integer denoting the number of dimensions.\n\n"); + (void)fprintf(stdout, "\t DIMENSION-SIZES:\n"); + (void)fprintf(stdout, "\t Integers separated by spaces to denote the \n"); + (void)fprintf(stdout, "\t dimension sizes for the no. of dimensions \n"); + (void)fprintf(stdout, "\t determined by rank.\n\n"); + (void)fprintf(stdout, "\t OUTPUT-CLASS:\n"); + (void)fprintf(stdout, "\t String dentoting data type of the dataset to \n"); + (void)fprintf(stdout, "\t be written (\"IN\",\"FP\", \"UIN\")\n\n"); + (void)fprintf(stdout, "\t OUTPUT-SIZE:\n"); + (void)fprintf(stdout, "\t Integer denoting the size of the data in the \n"); + (void)fprintf(stdout, "\t output dataset to be written.\n"); + (void)fprintf(stdout, "\t If OUTPUT-CLASS is \"FP\", OUTPUT-SIZE can be \n"); + (void)fprintf(stdout, "\t 32 or 64.\n"); + (void)fprintf(stdout, "\t If OUTPUT-CLASS is \"IN\" or \"UIN\", OUTPUT-SIZE\n"); + (void)fprintf(stdout, "\t can be 8, 16, 32 or 64.\n\n"); + (void)fprintf(stdout, "\t OUTPUT-ARCHITECTURE:\n"); + (void)fprintf(stdout, "\t STRING denoting the type of output \n"); + (void)fprintf(stdout, "\t architecture. Can accept the following values\n"); + (void)fprintf(stdout, "\t STD\n"); + (void)fprintf(stdout, "\t IEEE\n"); + (void)fprintf(stdout, "\t INTEL\n"); + (void)fprintf(stdout, "\t CRAY\n"); + (void)fprintf(stdout, "\t MIPS\n"); + (void)fprintf(stdout, "\t ALPHA\n"); + (void)fprintf(stdout, "\t NATIVE (default)\n"); + (void)fprintf(stdout, "\t UNIX\n\n"); + (void)fprintf(stdout, "\t OUTPUT-BYTE-ORDER:\n"); + (void)fprintf(stdout, "\t String denoting the output-byte-order. Ignored\n"); + (void)fprintf(stdout, "\t if the OUTPUT-ARCHITECTURE is not specified or\n"); + (void)fprintf(stdout, "\t if it is IEEE, UNIX or STD. Can accept the \n"); + (void)fprintf(stdout, "\t following values.\n"); + (void)fprintf(stdout, "\t BE (default)\n"); + (void)fprintf(stdout, "\t LE\n\n"); + (void)fprintf(stdout, "\t CHUNKED-DIMENSION-SIZES:\n"); + (void)fprintf(stdout, "\t Integers separated by spaces to denote the \n"); + (void)fprintf(stdout, "\t dimension sizes of the chunk for the no. of \n"); + (void)fprintf(stdout, "\t dimensions determined by rank. Required field\n"); + (void)fprintf(stdout, "\t to denote that the dataset will be stored with\n"); + (void)fprintf(stdout, "\t chunked storage. If this field is absent the\n"); + (void)fprintf(stdout, "\t dataset will be stored with contiguous storage.\n\n"); + (void)fprintf(stdout, "\t COMPRESSION-TYPE:\n"); + (void)fprintf(stdout, "\t String denoting the type of compression to be\n"); + (void)fprintf(stdout, "\t used with the chunked storage. Requires the\n"); + (void)fprintf(stdout, "\t CHUNKED-DIMENSION-SIZES to be specified. The only \n"); + (void)fprintf(stdout, "\t currently supported compression method is GZIP. \n"); + (void)fprintf(stdout, "\t Will accept the following value\n"); + (void)fprintf(stdout, "\t GZIP\n\n"); + (void)fprintf(stdout, "\t COMPRESSION-PARAM:\n"); + (void)fprintf(stdout, "\t Integer used to denote compression level and \n"); + (void)fprintf(stdout, "\t this option is to be always specified when \n"); + (void)fprintf(stdout, "\t the COMPRESSION-TYPE option is specified. The\n"); + (void)fprintf(stdout, "\t values are applicable only to GZIP \n"); + (void)fprintf(stdout, "\t compression.\n"); + (void)fprintf(stdout, "\t Value 1-9: The level of Compression. \n"); + (void)fprintf(stdout, "\t 1 will result in the fastest \n"); + (void)fprintf(stdout, "\t compression while 9 will result in \n"); + (void)fprintf(stdout, "\t the best compression ratio. The default\n"); + (void)fprintf(stdout, "\t level of compression is 6.\n\n"); + (void)fprintf(stdout, "\t EXTERNAL-STORAGE:\n"); + (void)fprintf(stdout, "\t String to denote the name of the non-HDF5 file \n"); + (void)fprintf(stdout, "\t to store data to. Cannot be used if CHUNKED-\n"); + (void)fprintf(stdout, "\t DIMENSIONS or COMPRESSION-TYPE or EXTENDIBLE-\n"); + (void)fprintf(stdout, "\t DATASET is specified.\n"); + (void)fprintf(stdout, "\t Value <external-filename>: the name of the \n"); + (void)fprintf(stdout, "\t external file as a string to be used.\n\n"); + (void)fprintf(stdout, "\t MAXIMUM-DIMENSIONS:\n"); + (void)fprintf(stdout, "\t Integers separated by spaces to denote the \n"); + (void)fprintf(stdout, "\t maximum dimension sizes of all the \n"); + (void)fprintf(stdout, "\t dimensions determined by rank. Requires the\n"); + (void)fprintf(stdout, "\t CHUNKED-DIMENSION-SIZES to be specified. A value of \n"); + (void)fprintf(stdout, "\t -1 for any dimension implies UNLIMITED \n"); + (void)fprintf(stdout, "\t DIMENSION size for that particular dimension.\n\n"); + (void)fprintf(stdout, "\t EXAMPLES:\n"); + (void)fprintf(stdout, "\t 1. Configuration File may look like:\n\n"); + (void)fprintf(stdout, "\t PATH work h5 pkamat First-set\n"); + (void)fprintf(stdout, "\t INPUT-CLASS TEXTFP\n"); + (void)fprintf(stdout, "\t RANK 3\n"); + (void)fprintf(stdout, "\t DIMENSION-SIZES 5 2 4\n"); + (void)fprintf(stdout, "\t OUTPUT-CLASS FP\n"); + (void)fprintf(stdout, "\t OUTPUT-SIZE 64\n"); + (void)fprintf(stdout, "\t OUTPUT-ARCHITECTURE IEEE\n"); + (void)fprintf(stdout, "\t OUTPUT-BYTE-ORDER LE\n"); + (void)fprintf(stdout, "\t CHUNKED-DIMENSION-SIZES 2 2 2 \n\n"); + (void)fprintf(stdout, "\t The above configuration will accept a floating point array \n"); + (void)fprintf(stdout, "\t (5 x 2 x 4) in an ASCII file with the rank and dimension sizes \n"); + (void)fprintf(stdout, "\t specified and will save it in a chunked data-set (of pattern \n"); + (void)fprintf(stdout, "\t 2 X 2 X 2) of 64-bit floating point in the little-endian order \n"); + (void)fprintf(stdout, "\t and IEEE architecture. The dataset will be stored at\n"); + (void)fprintf(stdout, "\t \"/work/h5/pkamat/First-set\"\n\n"); + (void)fprintf(stdout, "\t 2. Another configuration could be:\n\n"); + (void)fprintf(stdout, "\t PATH Second-set\n"); + (void)fprintf(stdout, "\t INPUT-CLASS IN \n"); + (void)fprintf(stdout, "\t RANK 5\n"); + (void)fprintf(stdout, "\t DIMENSION-SIZES 6 3 5 2 4\n"); + (void)fprintf(stdout, "\t OUTPUT-CLASS IN\n"); + (void)fprintf(stdout, "\t OUTPUT-SIZE 32\n"); + (void)fprintf(stdout, "\t CHUNKED-DIMENSION-SIZES 2 2 2 2 2\n"); + (void)fprintf(stdout, "\t EXTENDIBLE-DATASET 1 3 \n"); + (void)fprintf(stdout, "\t COMPRESSION-TYPE GZIP\n"); + (void)fprintf(stdout, "\t COMPRESSION-PARAM 7\n\n\n"); + (void)fprintf(stdout, "\t The above configuration will accept an integer array \n"); + (void)fprintf(stdout, "\t (6 X 3 X 5 x 2 x 4) in a binary file with the rank and \n"); + (void)fprintf(stdout, "\t dimension sizes specified and will save it in a chunked data-set\n"); + (void)fprintf(stdout, "\t (of pattern 2 X 2 X 2 X 2 X 2) of 32-bit floating point in \n"); + (void)fprintf(stdout, "\t native format (as output-architecture is not specified). The \n"); + (void)fprintf(stdout, "\t first and the third dimension will be defined as unlimited. The \n"); + (void)fprintf(stdout, "\t data-set will be compressed using GZIP and a compression level \n"); + (void)fprintf(stdout, "\t of 7.\n"); + (void)fprintf(stdout, "\t The dataset will be stored at \"/Second-set\"\n\n"); } void usage(char *name) { - (void)HDfprintf(stdout, "\nusage:\t%s -h[elp], OR\n", name); - (void)HDfprintf(stdout, "\t%s <infile> -c[onfig] <configfile> \ + (void)fprintf(stdout, "\nusage:\t%s -h[elp], OR\n", name); + (void)fprintf(stdout, "\t%s <infile> -c[onfig] <configfile> \ [<infile> -c[config] <configfile>...] -o[utfile] <outfile> \n\n", - name); + name); } diff --git a/tools/src/h5jam/h5jam.c b/tools/src/h5jam/h5jam.c index 9b3030c..2da104e 100644 --- a/tools/src/h5jam/h5jam.c +++ b/tools/src/h5jam/h5jam.c @@ -50,30 +50,30 @@ static void usage(const char *prog) { HDfflush(stdout); - HDfprintf(stdout, "usage: %s -i <in_file.h5> -u <in_user_file> [-o <out_file.h5>] [--clobber]\n", prog); - HDfprintf(stdout, "\n"); - HDfprintf(stdout, "Adds user block to front of an HDF5 file and creates a new concatenated file.\n"); - HDfprintf(stdout, "\n"); - HDfprintf(stdout, "OPTIONS\n"); - HDfprintf(stdout, " -i in_file.h5 Specifies the input HDF5 file.\n"); - HDfprintf(stdout, " -u in_user_file Specifies the file to be inserted into the user block.\n"); - HDfprintf(stdout, " Can be any file format except an HDF5 format.\n"); - HDfprintf(stdout, " -o out_file.h5 Specifies the output HDF5 file.\n"); - HDfprintf(stdout, " If not specified, the user block will be concatenated in\n"); - HDfprintf(stdout, " place to the input HDF5 file.\n"); - HDfprintf(stdout, " --clobber Wipes out any existing user block before concatenating\n"); - HDfprintf(stdout, " the given user block.\n"); - HDfprintf(stdout, " The size of the new user block will be the larger of;\n"); - HDfprintf(stdout, " - the size of existing user block in the input HDF5 file\n"); - HDfprintf(stdout, " - the size of user block required by new input user file\n"); - HDfprintf(stdout, " (size = 512 x 2N, N is positive integer.)\n"); - HDfprintf(stdout, "\n"); - HDfprintf(stdout, " -h Prints a usage message and exits.\n"); - HDfprintf(stdout, " -V Prints the HDF5 library version and exits.\n"); - HDfprintf(stdout, "\n"); - HDfprintf(stdout, "Exit Status:\n"); - HDfprintf(stdout, " 0 Succeeded.\n"); - HDfprintf(stdout, " >0 An error occurred.\n"); + fprintf(stdout, "usage: %s -i <in_file.h5> -u <in_user_file> [-o <out_file.h5>] [--clobber]\n", prog); + fprintf(stdout, "\n"); + fprintf(stdout, "Adds user block to front of an HDF5 file and creates a new concatenated file.\n"); + fprintf(stdout, "\n"); + fprintf(stdout, "OPTIONS\n"); + fprintf(stdout, " -i in_file.h5 Specifies the input HDF5 file.\n"); + fprintf(stdout, " -u in_user_file Specifies the file to be inserted into the user block.\n"); + fprintf(stdout, " Can be any file format except an HDF5 format.\n"); + fprintf(stdout, " -o out_file.h5 Specifies the output HDF5 file.\n"); + fprintf(stdout, " If not specified, the user block will be concatenated in\n"); + fprintf(stdout, " place to the input HDF5 file.\n"); + fprintf(stdout, " --clobber Wipes out any existing user block before concatenating\n"); + fprintf(stdout, " the given user block.\n"); + fprintf(stdout, " The size of the new user block will be the larger of;\n"); + fprintf(stdout, " - the size of existing user block in the input HDF5 file\n"); + fprintf(stdout, " - the size of user block required by new input user file\n"); + fprintf(stdout, " (size = 512 x 2N, N is positive integer.)\n"); + fprintf(stdout, "\n"); + fprintf(stdout, " -h Prints a usage message and exits.\n"); + fprintf(stdout, " -V Prints the HDF5 library version and exits.\n"); + fprintf(stdout, "\n"); + fprintf(stdout, "Exit Status:\n"); + fprintf(stdout, " 0 Succeeded.\n"); + fprintf(stdout, " >0 An error occurred.\n"); } /*------------------------------------------------------------------------- diff --git a/tools/src/h5jam/h5unjam.c b/tools/src/h5jam/h5unjam.c index 1c8c24a..1cda5d4 100644 --- a/tools/src/h5jam/h5unjam.c +++ b/tools/src/h5jam/h5unjam.c @@ -51,34 +51,33 @@ static void usage(const char *prog) { HDfflush(stdout); - HDfprintf(stdout, "usage: %s -i <in_file.h5> [-o <out_file.h5> ] [-u <out_user_file> | --delete]\n", - prog); - HDfprintf(stdout, "\n"); - HDfprintf(stdout, "Splits user file and HDF5 file into two files: user block data and HDF5 data.\n"); - HDfprintf(stdout, "\n"); - HDfprintf(stdout, "OPTIONS\n"); - HDfprintf(stdout, " -i in_file.h5 Specifies the HDF5 as input. If the input HDF5 file\n"); - HDfprintf(stdout, " contains no user block, exit with an error message.\n"); - HDfprintf(stdout, " -o out_file.h5 Specifies output HDF5 file without a user block.\n"); - HDfprintf(stdout, " If not specified, the user block will be removed from the\n"); - HDfprintf(stdout, " input HDF5 file.\n"); - HDfprintf(stdout, " -u out_user_file\n"); - HDfprintf(stdout, " Specifies the output file containing the data from the\n"); - HDfprintf(stdout, " user block.\n"); - HDfprintf(stdout, " Cannot be used with --delete option.\n"); - HDfprintf(stdout, " --delete Remove the user block from the input HDF5 file. The content\n"); - HDfprintf(stdout, " of the user block is discarded.\n"); - HDfprintf(stdout, " Cannot be used with the -u option.\n"); - HDfprintf(stdout, "\n"); - HDfprintf(stdout, " -h Prints a usage message and exits.\n"); - HDfprintf(stdout, " -V Prints the HDF5 library version and exits.\n"); - HDfprintf(stdout, "\n"); - HDfprintf(stdout, " If neither --delete nor -u is specified, the user block from the input file\n"); - HDfprintf(stdout, " will be displayed to stdout.\n"); - HDfprintf(stdout, "\n"); - HDfprintf(stdout, "Exit Status:\n"); - HDfprintf(stdout, " 0 Succeeded.\n"); - HDfprintf(stdout, " >0 An error occurred.\n"); + fprintf(stdout, "usage: %s -i <in_file.h5> [-o <out_file.h5> ] [-u <out_user_file> | --delete]\n", prog); + fprintf(stdout, "\n"); + fprintf(stdout, "Splits user file and HDF5 file into two files: user block data and HDF5 data.\n"); + fprintf(stdout, "\n"); + fprintf(stdout, "OPTIONS\n"); + fprintf(stdout, " -i in_file.h5 Specifies the HDF5 as input. If the input HDF5 file\n"); + fprintf(stdout, " contains no user block, exit with an error message.\n"); + fprintf(stdout, " -o out_file.h5 Specifies output HDF5 file without a user block.\n"); + fprintf(stdout, " If not specified, the user block will be removed from the\n"); + fprintf(stdout, " input HDF5 file.\n"); + fprintf(stdout, " -u out_user_file\n"); + fprintf(stdout, " Specifies the output file containing the data from the\n"); + fprintf(stdout, " user block.\n"); + fprintf(stdout, " Cannot be used with --delete option.\n"); + fprintf(stdout, " --delete Remove the user block from the input HDF5 file. The content\n"); + fprintf(stdout, " of the user block is discarded.\n"); + fprintf(stdout, " Cannot be used with the -u option.\n"); + fprintf(stdout, "\n"); + fprintf(stdout, " -h Prints a usage message and exits.\n"); + fprintf(stdout, " -V Prints the HDF5 library version and exits.\n"); + fprintf(stdout, "\n"); + fprintf(stdout, " If neither --delete nor -u is specified, the user block from the input file\n"); + fprintf(stdout, " will be displayed to stdout.\n"); + fprintf(stdout, "\n"); + fprintf(stdout, "Exit Status:\n"); + fprintf(stdout, " 0 Succeeded.\n"); + fprintf(stdout, " >0 An error occurred.\n"); } /*------------------------------------------------------------------------- diff --git a/tools/src/h5ls/h5ls.c b/tools/src/h5ls/h5ls.c index 5d9e184..b58d7d3 100644 --- a/tools/src/h5ls/h5ls.c +++ b/tools/src/h5ls/h5ls.c @@ -2596,14 +2596,14 @@ is_valid_args(void) hbool_t ret = TRUE; if (recursive_g && grp_literal_g) { - HDfprintf(rawerrorstream, "Error: 'recursive' option not compatible with 'group info' option!\n\n"); + fprintf(rawerrorstream, "Error: 'recursive' option not compatible with 'group info' option!\n\n"); ret = FALSE; goto out; } if (no_dangling_link_g && !follow_symlink_g) { - HDfprintf(rawerrorstream, - "Error: --no-dangling-links must be used along with --follow-symlinks option!\n\n"); + fprintf(rawerrorstream, + "Error: --no-dangling-links must be used along with --follow-symlinks option!\n\n"); ret = FALSE; goto out; } @@ -2839,23 +2839,23 @@ main(int argc, char *argv[]) start = strchr(argv[argno], '='); if (start == NULL) { - HDfprintf(rawerrorstream, - "Error: Unable to parse null credentials tuple\n" - " For anonymous access, omit \"--s3-cred\" and use only \"--vfd=ros3\"\n\n"); + fprintf(rawerrorstream, + "Error: Unable to parse null credentials tuple\n" + " For anonymous access, omit \"--s3-cred\" and use only \"--vfd=ros3\"\n\n"); usage(); leave(EXIT_FAILURE); } start++; if (h5tools_parse_ros3_fapl_tuple(start, ',', &ros3_fa) < 0) { - HDfprintf(rawerrorstream, "Error: failed to parse S3 VFD credential info\n\n"); + fprintf(rawerrorstream, "Error: failed to parse S3 VFD credential info\n\n"); usage(); leave(EXIT_FAILURE); } vfd_info.info = &ros3_fa; #else - HDfprintf(rawerrorstream, "Error: Read-Only S3 VFD is not enabled\n\n"); + fprintf(rawerrorstream, "Error: Read-Only S3 VFD is not enabled\n\n"); usage(); leave(EXIT_FAILURE); #endif @@ -2871,14 +2871,14 @@ main(int argc, char *argv[]) } if (h5tools_parse_hdfs_fapl_tuple(start, ',', &hdfs_fa) < 0) { - HDfprintf(rawerrorstream, "Error: failed to parse HDFS VFD configuration info\n\n"); + fprintf(rawerrorstream, "Error: failed to parse HDFS VFD configuration info\n\n"); usage(); leave(EXIT_FAILURE); } vfd_info.info = &hdfs_fa; #else - HDfprintf(rawerrorstream, "Error: The HDFS VFD is not enabled\n\n"); + fprintf(rawerrorstream, "Error: The HDFS VFD is not enabled\n\n"); usage(); leave(EXIT_FAILURE); #endif @@ -2955,7 +2955,7 @@ main(int argc, char *argv[]) } /* end for */ } else { - HDfprintf(stderr, "Unknown argument: %s\n", argv[argno]); + fprintf(stderr, "Unknown argument: %s\n", argv[argno]); usage(); leave(EXIT_FAILURE); } @@ -3043,7 +3043,7 @@ main(int argc, char *argv[]) } /* end while */ if (file_id < 0) { - HDfprintf(rawerrorstream, "%s: unable to open file\n", argv[argno - 1]); + fprintf(rawerrorstream, "%s: unable to open file\n", argv[argno - 1]); HDfree(fname); err_exit = 1; continue; @@ -3056,7 +3056,7 @@ main(int argc, char *argv[]) iter.base_len -= oname[iter.base_len - 1] == '/'; x = oname; if (NULL == (oname = HDstrdup(oname))) { - HDfprintf(rawerrorstream, "memory allocation failed\n"); + fprintf(rawerrorstream, "memory allocation failed\n"); leave(EXIT_FAILURE); } *x = '\0'; @@ -3140,7 +3140,7 @@ main(int argc, char *argv[]) if (fapl_id != H5P_DEFAULT) { if (0 < H5Pclose(fapl_id)) { - HDfprintf(rawerrorstream, "Error: Unable to set close fapl entry\n\n"); + fprintf(rawerrorstream, "Error: Unable to set close fapl entry\n\n"); leave(EXIT_FAILURE); } } diff --git a/tools/src/h5perf/pio_engine.c b/tools/src/h5perf/pio_engine.c index 2238aac..e6f0834 100644 --- a/tools/src/h5perf/pio_engine.c +++ b/tools/src/h5perf/pio_engine.c @@ -62,8 +62,8 @@ } #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__); \ + fprintf(stderr, "Proc %d: ", pio_mpi_rank_g); \ + fprintf(stderr, "*** Assertion failed (%s) at line %4d in %s\n", mesg, (int)__LINE__, __FILE__); \ } /* verify: if val is false (0), print mesg. */ @@ -184,7 +184,7 @@ do_pio(parameters param) break; default: /* unknown request */ - HDfprintf(stderr, "Unknown IO type request (%d)\n", iot); + fprintf(stderr, "Unknown IO type request (%d)\n", iot); GOTOERROR(FAIL); } @@ -203,66 +203,66 @@ do_pio(parameters param) } if (param.num_files < 0) { - HDfprintf(stderr, "number of files must be >= 0 (%ld)\n", param.num_files); + fprintf(stderr, "number of files must be >= 0 (%ld)\n", param.num_files); GOTOERROR(FAIL); } if (ndsets < 0) { - HDfprintf(stderr, "number of datasets per file must be >= 0 (%ld)\n", ndsets); + fprintf(stderr, "number of datasets per file must be >= 0 (%ld)\n", ndsets); GOTOERROR(FAIL); } if (param.num_procs <= 0) { - HDfprintf(stderr, "maximum number of process to use must be > 0 (%d)\n", param.num_procs); + fprintf(stderr, "maximum number of process to use must be > 0 (%d)\n", param.num_procs); GOTOERROR(FAIL); } /* Validate transfer buffer size & block size*/ if (blk_size <= 0) { - HDfprintf(stderr, "Transfer block size (%zu) must be > 0\n", blk_size); + fprintf(stderr, "Transfer block size (%zu) must be > 0\n", blk_size); GOTOERROR(FAIL); } if (buf_size <= 0) { - HDfprintf(stderr, "Transfer buffer size (%zu) must be > 0\n", buf_size); + fprintf(stderr, "Transfer buffer size (%zu) must be > 0\n", buf_size); GOTOERROR(FAIL); } if ((buf_size % blk_size) != 0) { - HDfprintf(stderr, - "Transfer buffer size (%zu) must be a multiple of the " - "interleaved I/O block size (%zu)\n", - buf_size, blk_size); + fprintf(stderr, + "Transfer buffer size (%zu) must be a multiple of the " + "interleaved I/O block size (%zu)\n", + buf_size, blk_size); GOTOERROR(FAIL); } if ((snbytes % pio_mpi_nprocs_g) != 0) { - HDfprintf(stderr, - "Dataset size (%lld) must be a multiple of the " - "number of processes (%d)\n", - (long long)snbytes, pio_mpi_nprocs_g); + fprintf(stderr, + "Dataset size (%lld) must be a multiple of the " + "number of processes (%d)\n", + (long long)snbytes, pio_mpi_nprocs_g); GOTOERROR(FAIL); } if (!param.dim2d) { if (((size_t)(snbytes / pio_mpi_nprocs_g) % buf_size) != 0) { - HDfprintf(stderr, - "Dataset size/process (%lld) must be a multiple of the " - "transfer buffer size (%zu)\n", - (long long)(snbytes / pio_mpi_nprocs_g), buf_size); + fprintf(stderr, + "Dataset size/process (%lld) must be a multiple of the " + "transfer buffer size (%zu)\n", + (long long)(snbytes / pio_mpi_nprocs_g), buf_size); GOTOERROR(FAIL); } } else { if (((size_t)snbytes % buf_size) != 0) { - HDfprintf(stderr, - "Dataset side size (%lld) must be a multiple of the " - "transfer buffer size (%zu)\n", - (long long)snbytes, buf_size); + fprintf(stderr, + "Dataset side size (%lld) must be a multiple of the " + "transfer buffer size (%zu)\n", + (long long)snbytes, buf_size); GOTOERROR(FAIL); } } /* Allocate transfer buffer */ if ((buffer = malloc(bsize)) == NULL) { - HDfprintf(stderr, "malloc for transfer buffer size (%zu) failed\n", bsize); + fprintf(stderr, "malloc for transfer buffer size (%zu) failed\n", bsize); GOTOERROR(FAIL); } @@ -273,7 +273,7 @@ do_pio(parameters param) /* output all of the times for all iterations */ if (myrank == 0) - HDfprintf(output, "Timer details:\n"); + fprintf(output, "Timer details:\n"); } for (nf = 1; nf <= param.num_files; nf++) { @@ -286,7 +286,7 @@ do_pio(parameters param) HDsnprintf(base_name, sizeof(base_name), "#pio_tmp_%lu", nf); pio_create_filename(iot, base_name, fname, FILENAME_MAX); if (pio_debug_level > 0) - HDfprintf(output, "rank %d: data filename=%s\n", pio_mpi_rank_g, fname); + fprintf(output, "rank %d: data filename=%s\n", pio_mpi_rank_g, fname); /* Need barrier to make sure everyone starts at the same time */ MPI_Barrier(pio_comm_g); @@ -621,17 +621,17 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets, off_t nby if (pio_debug_level >= 4) { HDprint_rank(output); if (!parms->dim2d) { - HDfprintf(output, - "Debug(do_write): " - "buf_size=%zu, bytes_begin=%lld, bytes_count=%lld\n", - buf_size, (long long)bytes_begin[0], (long long)bytes_count); + fprintf(output, + "Debug(do_write): " + "buf_size=%zu, bytes_begin=%lld, bytes_count=%lld\n", + buf_size, (long long)bytes_begin[0], (long long)bytes_count); } else { - HDfprintf(output, - "Debug(do_write): " - "linear buf_size=%zu, bytes_begin=(%lld,%lld), bytes_count=%lld\n", - buf_size * blk_size, (long long)bytes_begin[0], (long long)bytes_begin[1], - (long long)bytes_count); + fprintf(output, + "Debug(do_write): " + "linear buf_size=%zu, bytes_begin=(%lld,%lld), bytes_count=%lld\n", + buf_size * blk_size, (long long)bytes_begin[0], (long long)bytes_begin[1], + (long long)bytes_count); } } @@ -831,7 +831,7 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets, off_t nby /* Create the dataset transfer property list */ h5dxpl = H5Pcreate(H5P_DATASET_XFER); if (h5dxpl < 0) { - HDfprintf(stderr, "HDF5 Property List Create failed\n"); + fprintf(stderr, "HDF5 Property List Create failed\n"); GOTOERROR(FAIL); } @@ -839,7 +839,7 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets, off_t nby if (parms->collective) { hrc = H5Pset_dxpl_mpio(h5dxpl, H5FD_MPIO_COLLECTIVE); if (hrc < 0) { - HDfprintf(stderr, "HDF5 Property List Set failed\n"); + fprintf(stderr, "HDF5 Property List Set failed\n"); GOTOERROR(FAIL); } /* end if */ } /* end if */ @@ -864,7 +864,7 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets, off_t nby case PHDF5: h5dcpl = H5Pcreate(H5P_DATASET_CREATE); if (h5dcpl < 0) { - HDfprintf(stderr, "HDF5 Property List Create failed\n"); + fprintf(stderr, "HDF5 Property List Create failed\n"); GOTOERROR(FAIL); } /* 1D dataspace */ @@ -875,7 +875,7 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets, off_t nby h5dims[0] = blk_size; hrc = H5Pset_chunk(h5dcpl, 1, h5dims); if (hrc < 0) { - HDfprintf(stderr, "HDF5 Property List Set failed\n"); + fprintf(stderr, "HDF5 Property List Set failed\n"); GOTOERROR(FAIL); } /* end if */ } /* end if */ @@ -888,7 +888,7 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets, off_t nby h5dims[1] = blk_size; hrc = H5Pset_chunk(h5dcpl, 2, h5dims); if (hrc < 0) { - HDfprintf(stderr, "HDF5 Property List Set failed\n"); + fprintf(stderr, "HDF5 Property List Set failed\n"); GOTOERROR(FAIL); } /* end if */ } /* end if */ @@ -898,14 +898,14 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets, off_t nby h5ds_id = H5DCREATE(fd->h5fd, dname, ELMT_H5_TYPE, h5dset_space_id, h5dcpl); if (h5ds_id < 0) { - HDfprintf(stderr, "HDF5 Dataset Create failed\n"); + fprintf(stderr, "HDF5 Dataset Create failed\n"); GOTOERROR(FAIL); } hrc = H5Pclose(h5dcpl); /* verifying the close of the dcpl */ if (hrc < 0) { - HDfprintf(stderr, "HDF5 Property List Close failed\n"); + fprintf(stderr, "HDF5 Property List Close failed\n"); GOTOERROR(FAIL); } break; @@ -1407,7 +1407,7 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets, off_t nby hrc = H5Dclose(h5ds_id); if (hrc < 0) { - HDfprintf(stderr, "HDF5 Dataset Close failed\n"); + fprintf(stderr, "HDF5 Dataset Close failed\n"); GOTOERROR(FAIL); } @@ -1464,7 +1464,7 @@ done: if (h5dset_space_id != -1) { hrc = H5Sclose(h5dset_space_id); if (hrc < 0) { - HDfprintf(stderr, "HDF5 Dataset Space Close failed\n"); + fprintf(stderr, "HDF5 Dataset Space Close failed\n"); ret_code = FAIL; } else { @@ -1475,7 +1475,7 @@ done: if (h5mem_space_id != -1) { hrc = H5Sclose(h5mem_space_id); if (hrc < 0) { - HDfprintf(stderr, "HDF5 Memory Space Close failed\n"); + fprintf(stderr, "HDF5 Memory Space Close failed\n"); ret_code = FAIL; } else { @@ -1486,7 +1486,7 @@ done: if (h5dxpl != -1) { hrc = H5Pclose(h5dxpl); if (hrc < 0) { - HDfprintf(stderr, "HDF5 Dataset Transfer Property List Close failed\n"); + fprintf(stderr, "HDF5 Dataset Transfer Property List Close failed\n"); ret_code = FAIL; } else { @@ -1631,17 +1631,17 @@ do_read(results *res, file_descr *fd, parameters *parms, long ndsets, off_t nbyt if (pio_debug_level >= 4) { HDprint_rank(output); if (!parms->dim2d) { - HDfprintf(output, - "Debug(do_write): " - "buf_size=%zu, bytes_begin=%lld, bytes_count=%lld\n", - buf_size, (long long)bytes_begin[0], (long long)bytes_count); + fprintf(output, + "Debug(do_write): " + "buf_size=%zu, bytes_begin=%lld, bytes_count=%lld\n", + buf_size, (long long)bytes_begin[0], (long long)bytes_count); } else { - HDfprintf(output, - "Debug(do_write): " - "linear buf_size=%zu, bytes_begin=(%lld,%lld), bytes_count=%lld\n", - buf_size * blk_size, (long long)bytes_begin[0], (long long)bytes_begin[1], - (long long)bytes_count); + fprintf(output, + "Debug(do_write): " + "linear buf_size=%zu, bytes_begin=(%lld,%lld), bytes_count=%lld\n", + buf_size * blk_size, (long long)bytes_begin[0], (long long)bytes_begin[1], + (long long)bytes_count); } } @@ -1839,7 +1839,7 @@ do_read(results *res, file_descr *fd, parameters *parms, long ndsets, off_t nbyt /* Create the dataset transfer property list */ h5dxpl = H5Pcreate(H5P_DATASET_XFER); if (h5dxpl < 0) { - HDfprintf(stderr, "HDF5 Property List Create failed\n"); + fprintf(stderr, "HDF5 Property List Create failed\n"); GOTOERROR(FAIL); } @@ -1847,7 +1847,7 @@ do_read(results *res, file_descr *fd, parameters *parms, long ndsets, off_t nbyt if (parms->collective) { hrc = H5Pset_dxpl_mpio(h5dxpl, H5FD_MPIO_COLLECTIVE); if (hrc < 0) { - HDfprintf(stderr, "HDF5 Property List Set failed\n"); + fprintf(stderr, "HDF5 Property List Set failed\n"); GOTOERROR(FAIL); } /* end if */ } /* end if */ @@ -1873,7 +1873,7 @@ do_read(results *res, file_descr *fd, parameters *parms, long ndsets, off_t nbyt HDsnprintf(dname, sizeof(dname), "Dataset_%ld", ndset); h5ds_id = H5DOPEN(fd->h5fd, dname); if (h5ds_id < 0) { - HDfprintf(stderr, "HDF5 Dataset open failed\n"); + fprintf(stderr, "HDF5 Dataset open failed\n"); GOTOERROR(FAIL); } break; @@ -2369,17 +2369,17 @@ do_read(results *res, file_descr *fd, parameters *parms, long ndsets, off_t nbyt if (++nerror < 20) { /* report at most 20 errors */ HDprint_rank(output); - HDfprintf(output, - "read data error, expected (%d), " - "got (%d)\n", - pio_mpi_rank_g + 1, (int)*(ucharptr - 1)); + fprintf(output, + "read data error, expected (%d), " + "got (%d)\n", + pio_mpi_rank_g + 1, (int)*(ucharptr - 1)); } /* end if */ } /* end if */ } /* end for */ if (nerror >= 20) { HDprint_rank(output); - HDfprintf(output, "..."); - HDfprintf(output, "total read data errors=%d\n", nerror); + fprintf(output, "..."); + fprintf(output, "total read data errors=%d\n", nerror); } /* end if */ } /* if (parms->verify) */ @@ -2395,7 +2395,7 @@ do_read(results *res, file_descr *fd, parameters *parms, long ndsets, off_t nbyt hrc = H5Dclose(h5ds_id); if (hrc < 0) { - HDfprintf(stderr, "HDF5 Dataset Close failed\n"); + fprintf(stderr, "HDF5 Dataset Close failed\n"); GOTOERROR(FAIL); } @@ -2452,7 +2452,7 @@ done: if (h5dset_space_id != -1) { hrc = H5Sclose(h5dset_space_id); if (hrc < 0) { - HDfprintf(stderr, "HDF5 Dataset Space Close failed\n"); + fprintf(stderr, "HDF5 Dataset Space Close failed\n"); ret_code = FAIL; } else { @@ -2463,7 +2463,7 @@ done: if (h5mem_space_id != -1) { hrc = H5Sclose(h5mem_space_id); if (hrc < 0) { - HDfprintf(stderr, "HDF5 Memory Space Close failed\n"); + fprintf(stderr, "HDF5 Memory Space Close failed\n"); ret_code = FAIL; } else { @@ -2474,7 +2474,7 @@ done: if (h5dxpl != -1) { hrc = H5Pclose(h5dxpl); if (hrc < 0) { - HDfprintf(stderr, "HDF5 Dataset Transfer Property List Close failed\n"); + fprintf(stderr, "HDF5 Dataset Transfer Property List Close failed\n"); ret_code = FAIL; } else { @@ -2505,7 +2505,7 @@ do_fopen(parameters *param, char *fname, file_descr *fd /*out*/, int flags) fd->posixfd = POSIXOPEN(fname, O_RDONLY); if (fd->posixfd < 0) { - HDfprintf(stderr, "POSIX File Open failed(%s)\n", fname); + fprintf(stderr, "POSIX File Open failed(%s)\n", fname); GOTOERROR(FAIL); } @@ -2528,7 +2528,7 @@ do_fopen(parameters *param, char *fname, file_descr *fd /*out*/, int flags) &fd->mpifd); if (mrc != MPI_SUCCESS) { - HDfprintf(stderr, "MPI File Open failed(%s)\n", fname); + fprintf(stderr, "MPI File Open failed(%s)\n", fname); GOTOERROR(FAIL); } @@ -2536,14 +2536,14 @@ do_fopen(parameters *param, char *fname, file_descr *fd /*out*/, int flags) /*filesize , set size to 0 explicitedly. */ mrc = MPI_File_set_size(fd->mpifd, (MPI_Offset)0); if (mrc != MPI_SUCCESS) { - HDfprintf(stderr, "MPI_File_set_size failed\n"); + fprintf(stderr, "MPI_File_set_size failed\n"); GOTOERROR(FAIL); } } else { mrc = MPI_File_open(pio_comm_g, fname, MPI_MODE_RDONLY, h5_io_info_g, &fd->mpifd); if (mrc != MPI_SUCCESS) { - HDfprintf(stderr, "MPI File Open failed(%s)\n", fname); + fprintf(stderr, "MPI File Open failed(%s)\n", fname); GOTOERROR(FAIL); } } @@ -2552,19 +2552,19 @@ do_fopen(parameters *param, char *fname, file_descr *fd /*out*/, int flags) case PHDF5: if ((acc_tpl = H5Pcreate(H5P_FILE_ACCESS)) < 0) { - HDfprintf(stderr, "HDF5 Property List Create failed\n"); + fprintf(stderr, "HDF5 Property List Create failed\n"); GOTOERROR(FAIL); } /* Set the file driver to the MPI-IO driver */ if (H5Pset_fapl_mpio(acc_tpl, pio_comm_g, h5_io_info_g) < 0) { - HDfprintf(stderr, "HDF5 Property List Set failed\n"); + fprintf(stderr, "HDF5 Property List Set failed\n"); GOTOERROR(FAIL); } /* Set the alignment of objects in HDF5 file */ if (H5Pset_alignment(acc_tpl, param->h5_thresh, param->h5_align) < 0) { - HDfprintf(stderr, "HDF5 Property List Set failed\n"); + fprintf(stderr, "HDF5 Property List Set failed\n"); GOTOERROR(FAIL); } @@ -2574,13 +2574,13 @@ do_fopen(parameters *param, char *fname, file_descr *fd /*out*/, int flags) else fd->h5fd = H5Fopen(fname, H5F_ACC_RDONLY, acc_tpl); if (fd->h5fd < 0) { - HDfprintf(stderr, "HDF5 File Create failed(%s)\n", fname); + fprintf(stderr, "HDF5 File Create failed(%s)\n", fname); GOTOERROR(FAIL); } /* verifying the close of the acc_tpl */ if (H5Pclose(acc_tpl) < 0) { - HDfprintf(stderr, "HDF5 Property List Close failed\n"); + fprintf(stderr, "HDF5 Property List Close failed\n"); GOTOERROR(FAIL); } @@ -2611,7 +2611,7 @@ do_fclose(iotype iot, file_descr *fd /*out*/) rc = POSIXCLOSE(fd->posixfd); if (rc != 0) { - HDfprintf(stderr, "POSIX File Close failed\n"); + fprintf(stderr, "POSIX File Close failed\n"); GOTOERROR(FAIL); } @@ -2622,7 +2622,7 @@ do_fclose(iotype iot, file_descr *fd /*out*/) mrc = MPI_File_close(&fd->mpifd); if (mrc != MPI_SUCCESS) { - HDfprintf(stderr, "MPI File close failed\n"); + fprintf(stderr, "MPI File close failed\n"); GOTOERROR(FAIL); } @@ -2633,7 +2633,7 @@ do_fclose(iotype iot, file_descr *fd /*out*/) hrc = H5Fclose(fd->h5fd); if (hrc < 0) { - HDfprintf(stderr, "HDF5 File Close failed\n"); + fprintf(stderr, "HDF5 File Close failed\n"); GOTOERROR(FAIL); } diff --git a/tools/src/h5perf/pio_perf.c b/tools/src/h5perf/pio_perf.c index d2f5a80..393a250 100644 --- a/tools/src/h5perf/pio_perf.c +++ b/tools/src/h5perf/pio_perf.c @@ -224,12 +224,12 @@ main(int argc, char *argv[]) ret = MPI_Comm_size(MPI_COMM_WORLD, &comm_world_nprocs_g); if (ret != MPI_SUCCESS) { - HDfprintf(stderr, "%s: MPI_Comm_size call failed\n", progname); + fprintf(stderr, "%s: MPI_Comm_size call failed\n", progname); if (ret == MPI_ERR_COMM) - HDfprintf(stderr, "invalid MPI communicator\n"); + fprintf(stderr, "invalid MPI communicator\n"); else - HDfprintf(stderr, "invalid argument\n"); + fprintf(stderr, "invalid argument\n"); exit_value = EXIT_FAILURE; goto finish; @@ -238,12 +238,12 @@ main(int argc, char *argv[]) ret = MPI_Comm_rank(MPI_COMM_WORLD, &comm_world_rank_g); if (ret != MPI_SUCCESS) { - HDfprintf(stderr, "%s: MPI_Comm_rank call failed\n", progname); + fprintf(stderr, "%s: MPI_Comm_rank call failed\n", progname); if (ret == MPI_ERR_COMM) - HDfprintf(stderr, "invalid MPI communicator\n"); + fprintf(stderr, "invalid MPI communicator\n"); else - HDfprintf(stderr, "invalid argument\n"); + fprintf(stderr, "invalid argument\n"); exit_value = EXIT_FAILURE; goto finish; @@ -261,7 +261,7 @@ main(int argc, char *argv[]) if (opts->output_file) { if ((output = HDfopen(opts->output_file, "w")) == NULL) { - HDfprintf(stderr, "%s: cannot open output file\n", progname); + fprintf(stderr, "%s: cannot open output file\n", progname); perror(opts->output_file); goto finish; } @@ -805,7 +805,7 @@ h5_set_info_object(void) /* actually set the darned thing */ if (MPI_SUCCESS != MPI_Info_set(h5_io_info_g, namep, valp)) { - HDprintf("MPI_Info_set failed\n"); + printf("MPI_Info_set failed\n"); ret_value = -1; } } @@ -834,17 +834,17 @@ h5_dump_info_object(MPI_Info info) int flag; int i, nkeys; - HDprintf("Dumping MPI Info Object (up to %d bytes per item):\n", MPI_MAX_INFO_VAL); + printf("Dumping MPI Info Object (up to %d bytes per item):\n", MPI_MAX_INFO_VAL); if (info == MPI_INFO_NULL) { - HDprintf("object is MPI_INFO_NULL\n"); + printf("object is MPI_INFO_NULL\n"); } else { MPI_Info_get_nkeys(info, &nkeys); - HDprintf("object has %d items\n", nkeys); + printf("object has %d items\n", nkeys); for (i = 0; i < nkeys; i++) { MPI_Info_get_nthkey(info, i, key); MPI_Info_get(info, key, MPI_MAX_INFO_VAL, value, &flag); - HDprintf("%s=%s\n", key, value); + printf("%s=%s\n", key, value); } } } @@ -926,8 +926,8 @@ create_comm_world(int num_procs, int *doing_pio) MPI_Comm_size(MPI_COMM_WORLD, &nprocs); if (num_procs > nprocs) { - HDfprintf(stderr, "number of process(%d) must be <= number of processes in MPI_COMM_WORLD(%d)\n", - num_procs, nprocs); + fprintf(stderr, "number of process(%d) must be <= number of processes in MPI_COMM_WORLD(%d)\n", + num_procs, nprocs); goto error_done; } @@ -936,7 +936,7 @@ create_comm_world(int num_procs, int *doing_pio) mrc = MPI_Comm_split(MPI_COMM_WORLD, color, myrank, &pio_comm_g); if (mrc != MPI_SUCCESS) { - HDfprintf(stderr, "MPI_Comm_split failed\n"); + fprintf(stderr, "MPI_Comm_split failed\n"); goto error_done; } @@ -1095,28 +1095,28 @@ recover_size_and_print(long long val, const char *end) if (val >= ONE_KB && (val % ONE_KB) == 0) { if (val >= ONE_MB && (val % ONE_MB) == 0) { if (val >= ONE_GB && (val % ONE_GB) == 0) - HDfprintf(output, - "%lld" - "GB%s", - val / ONE_GB, end); + fprintf(output, + "%lld" + "GB%s", + val / ONE_GB, end); else - HDfprintf(output, - "%lld" - "MB%s", - val / ONE_MB, end); + fprintf(output, + "%lld" + "MB%s", + val / ONE_MB, end); } else { - HDfprintf(output, - "%lld" - "KB%s", - val / ONE_KB, end); + fprintf(output, + "%lld" + "KB%s", + val / ONE_KB, end); } } else { - HDfprintf(output, - "%lld" - "%s", - val, end); + fprintf(output, + "%lld" + "%s", + val, end); } } @@ -1124,12 +1124,12 @@ static void print_io_api(long io_types) { if (io_types & PIO_POSIX) - HDfprintf(output, "posix "); + fprintf(output, "posix "); if (io_types & PIO_MPI) - HDfprintf(output, "mpiio "); + fprintf(output, "mpiio "); if (io_types & PIO_HDF5) - HDfprintf(output, "phdf5 "); - HDfprintf(output, "\n"); + fprintf(output, "phdf5 "); + fprintf(output, "\n"); } static void @@ -1138,34 +1138,34 @@ report_parameters(struct options *opts) int rank = comm_world_rank_g; print_version("HDF5 Library"); /* print library version */ - HDfprintf(output, "rank %d: ==== Parameters ====\n", rank); + fprintf(output, "rank %d: ==== Parameters ====\n", rank); - HDfprintf(output, "rank %d: IO API=", rank); + fprintf(output, "rank %d: IO API=", rank); print_io_api(opts->io_types); - HDfprintf(output, "rank %d: Number of files=%ld\n", rank, opts->num_files); - HDfprintf(output, "rank %d: Number of datasets=%ld\n", rank, opts->num_dsets); - HDfprintf(output, "rank %d: Number of iterations=%d\n", rank, opts->num_iters); - HDfprintf(output, "rank %d: Number of processes=%d:%d\n", rank, opts->min_num_procs, opts->max_num_procs); + fprintf(output, "rank %d: Number of files=%ld\n", rank, opts->num_files); + fprintf(output, "rank %d: Number of datasets=%ld\n", rank, opts->num_dsets); + fprintf(output, "rank %d: Number of iterations=%d\n", rank, opts->num_iters); + fprintf(output, "rank %d: Number of processes=%d:%d\n", rank, opts->min_num_procs, opts->max_num_procs); if (opts->dim2d) { - HDfprintf(output, "rank %d: Number of bytes per process per dataset=", rank); + fprintf(output, "rank %d: Number of bytes per process per dataset=", rank); recover_size_and_print((long long)(opts->num_bpp * opts->num_bpp * opts->min_num_procs), ":"); recover_size_and_print((long long)(opts->num_bpp * opts->num_bpp * opts->max_num_procs), "\n"); - HDfprintf(output, "rank %d: Size of dataset(s)=", rank); + fprintf(output, "rank %d: Size of dataset(s)=", rank); recover_size_and_print((long long)(opts->num_bpp * opts->min_num_procs), "x"); recover_size_and_print((long long)(opts->num_bpp * opts->min_num_procs), ":"); recover_size_and_print((long long)(opts->num_bpp * opts->max_num_procs), "x"); recover_size_and_print((long long)(opts->num_bpp * opts->max_num_procs), "\n"); - HDfprintf(output, "rank %d: File size=", rank); + fprintf(output, "rank %d: File size=", rank); recover_size_and_print((long long)(squareo(opts->num_bpp * opts->min_num_procs) * opts->num_dsets), ":"); recover_size_and_print((long long)(squareo(opts->num_bpp * opts->max_num_procs) * opts->num_dsets), "\n"); - HDfprintf(output, "rank %d: Transfer buffer size=", rank); + fprintf(output, "rank %d: Transfer buffer size=", rank); if (opts->interleaved) { recover_size_and_print((long long)opts->min_xfer_size, "x"); recover_size_and_print((long long)opts->blk_size, ":"); @@ -1178,66 +1178,66 @@ report_parameters(struct options *opts) recover_size_and_print((long long)opts->blk_size, "x"); recover_size_and_print((long long)opts->max_xfer_size, "\n"); } - HDfprintf(output, "rank %d: Block size=", rank); + fprintf(output, "rank %d: Block size=", rank); recover_size_and_print((long long)opts->blk_size, "x"); recover_size_and_print((long long)opts->blk_size, "\n"); } else { - HDfprintf(output, "rank %d: Number of bytes per process per dataset=", rank); + fprintf(output, "rank %d: Number of bytes per process per dataset=", rank); recover_size_and_print((long long)opts->num_bpp, "\n"); - HDfprintf(output, "rank %d: Size of dataset(s)=", rank); + fprintf(output, "rank %d: Size of dataset(s)=", rank); recover_size_and_print((long long)(opts->num_bpp * opts->min_num_procs), ":"); recover_size_and_print((long long)(opts->num_bpp * opts->max_num_procs), "\n"); - HDfprintf(output, "rank %d: File size=", rank); + fprintf(output, "rank %d: File size=", rank); recover_size_and_print((long long)(opts->num_bpp * opts->min_num_procs * opts->num_dsets), ":"); recover_size_and_print((long long)(opts->num_bpp * opts->max_num_procs * opts->num_dsets), "\n"); - HDfprintf(output, "rank %d: Transfer buffer size=", rank); + fprintf(output, "rank %d: Transfer buffer size=", rank); recover_size_and_print((long long)opts->min_xfer_size, ":"); recover_size_and_print((long long)opts->max_xfer_size, "\n"); - HDfprintf(output, "rank %d: Block size=", rank); + fprintf(output, "rank %d: Block size=", rank); recover_size_and_print((long long)opts->blk_size, "\n"); } - HDfprintf(output, "rank %d: Block Pattern in Dataset=", rank); + fprintf(output, "rank %d: Block Pattern in Dataset=", rank); if (opts->interleaved) - HDfprintf(output, "Interleaved\n"); + fprintf(output, "Interleaved\n"); else - HDfprintf(output, "Contiguous\n"); + fprintf(output, "Contiguous\n"); - HDfprintf(output, "rank %d: I/O Method for MPI and HDF5=", rank); + fprintf(output, "rank %d: I/O Method for MPI and HDF5=", rank); if (opts->collective) - HDfprintf(output, "Collective\n"); + fprintf(output, "Collective\n"); else - HDfprintf(output, "Independent\n"); + fprintf(output, "Independent\n"); - HDfprintf(output, "rank %d: Geometry=", rank); + fprintf(output, "rank %d: Geometry=", rank); if (opts->dim2d) - HDfprintf(output, "2D\n"); + fprintf(output, "2D\n"); else - HDfprintf(output, "1D\n"); + fprintf(output, "1D\n"); - HDfprintf(output, "rank %d: VFL used for HDF5 I/O=%s\n", rank, "MPI-IO driver"); + fprintf(output, "rank %d: VFL used for HDF5 I/O=%s\n", rank, "MPI-IO driver"); - HDfprintf(output, "rank %d: Data storage method in HDF5=", rank); + fprintf(output, "rank %d: Data storage method in HDF5=", rank); if (opts->h5_use_chunks) - HDfprintf(output, "Chunked\n"); + fprintf(output, "Chunked\n"); else - HDfprintf(output, "Contiguous\n"); + fprintf(output, "Contiguous\n"); { char *prefix = HDgetenv("HDF5_PARAPREFIX"); - HDfprintf(output, "rank %d: Env HDF5_PARAPREFIX=%s\n", rank, (prefix ? prefix : "not set")); + fprintf(output, "rank %d: Env HDF5_PARAPREFIX=%s\n", rank, (prefix ? prefix : "not set")); } - HDfprintf(output, "rank %d: ", rank); + fprintf(output, "rank %d: ", rank); h5_dump_info_object(h5_io_info_g); - HDfprintf(output, "rank %d: ==== End of Parameters ====\n", rank); - HDfprintf(output, "\n"); + fprintf(output, "rank %d: ==== End of Parameters ====\n", rank); + fprintf(output, "\n"); } /* @@ -1305,7 +1305,7 @@ parse_command_line(int argc, const char *const *argv) cl_opts->io_types |= PIO_POSIX; } else { - HDfprintf(stderr, "pio_perf: invalid --api option %s\n", buf); + fprintf(stderr, "pio_perf: invalid --api option %s\n", buf); HDexit(EXIT_FAILURE); } @@ -1353,7 +1353,7 @@ parse_command_line(int argc, const char *const *argv) for (j = 0; j < 10 && buf[j] != '\0'; ++j) if (!isdigit(buf[j])) { - HDfprintf(stderr, "pio_perf: invalid --debug option %s\n", buf); + fprintf(stderr, "pio_perf: invalid --debug option %s\n", buf); HDexit(EXIT_FAILURE); } @@ -1379,7 +1379,7 @@ parse_command_line(int argc, const char *const *argv) cl_opts->verify = TRUE; break; default: - HDfprintf(stderr, "pio_perf: invalid --debug option %s\n", buf); + fprintf(stderr, "pio_perf: invalid --debug option %s\n", buf); HDexit(EXIT_FAILURE); } } @@ -1523,7 +1523,7 @@ parse_size_directive(const char *size) s *= ONE_GB; break; default: - HDfprintf(stderr, "Illegal size specifier '%c'\n", *endptr); + fprintf(stderr, "Illegal size specifier '%c'\n", *endptr); HDexit(EXIT_FAILURE); } } @@ -1546,124 +1546,124 @@ usage(const char *prog) if (myrank == 0) { print_version(prog); - HDprintf("usage: %s [OPTIONS]\n", prog); - HDprintf(" OPTIONS\n"); - HDprintf(" -h, --help Print a usage message and exit\n"); - HDprintf(" -a S, --align=S Alignment of objects in HDF5 file [default: 1]\n"); - HDprintf(" -A AL, --api=AL Which APIs to test [default: all of them]\n"); + printf("usage: %s [OPTIONS]\n", prog); + printf(" OPTIONS\n"); + printf(" -h, --help Print a usage message and exit\n"); + printf(" -a S, --align=S Alignment of objects in HDF5 file [default: 1]\n"); + printf(" -A AL, --api=AL Which APIs to test [default: all of them]\n"); #if 0 - HDprintf(" -b, --binary The elusive binary option\n"); + printf(" -b, --binary The elusive binary option\n"); #endif /* 0 */ - HDprintf(" -B S, --block-size=S Block size within transfer buffer\n"); - HDprintf(" (see below for description)\n"); - HDprintf(" [default: half the number of bytes per process\n"); - HDprintf(" per dataset]\n"); - HDprintf(" -c, --chunk Create HDF5 datasets using chunked storage\n"); - HDprintf(" [default: contiguous storage]\n"); - HDprintf(" -C, --collective Use collective I/O for MPI and HDF5 APIs\n"); - HDprintf(" [default: independent I/O)\n"); - HDprintf(" -d N, --num-dsets=N Number of datasets per file [default: 1]\n"); - HDprintf(" -D DL, --debug=DL Indicate the debugging level\n"); - HDprintf(" [default: no debugging]\n"); - HDprintf(" -e S, --num-bytes=S Number of bytes per process per dataset\n"); - HDprintf(" (see below for description)\n"); - HDprintf(" [default: 256K for 1D, 8K for 2D]\n"); - HDprintf(" -F N, --num-files=N Number of files [default: 1]\n"); - HDprintf(" -g, --geometry Use 2D geometry [default: 1D geometry]\n"); - HDprintf(" -i N, --num-iterations=N Number of iterations to perform [default: 1]\n"); - HDprintf(" -I, --interleaved Interleaved access pattern\n"); - HDprintf(" (see below for example)\n"); - HDprintf(" [default: Contiguous access pattern]\n"); - HDprintf(" -o F, --output=F Output raw data into file F [default: none]\n"); - HDprintf(" -p N, --min-num-processes=N Minimum number of processes to use [default: 1]\n"); - HDprintf(" -P N, --max-num-processes=N Maximum number of processes to use\n"); - HDprintf(" [default: all MPI_COMM_WORLD processes ]\n"); - HDprintf(" -T S, --threshold=S Threshold for alignment of objects in HDF5 file\n"); - HDprintf(" [default: 1]\n"); - HDprintf(" -w, --write-only Perform write tests not the read tests\n"); - HDprintf(" -x S, --min-xfer-size=S Minimum transfer buffer size\n"); - HDprintf(" (see below for description)\n"); - HDprintf(" [default: half the number of bytes per process\n"); - HDprintf(" per dataset]\n"); - HDprintf(" -X S, --max-xfer-size=S Maximum transfer buffer size\n"); - HDprintf(" [default: the number of bytes per process per\n"); - HDprintf(" dataset]\n"); - HDprintf("\n"); - HDprintf(" F - is a filename.\n"); - HDprintf(" N - is an integer >=0.\n"); - HDprintf(" S - is a size specifier, an integer >=0 followed by a size indicator:\n"); - HDprintf(" K - Kilobyte (%d)\n", ONE_KB); - HDprintf(" M - Megabyte (%d)\n", ONE_MB); - HDprintf(" G - Gigabyte (%d)\n", ONE_GB); - HDprintf("\n"); - HDprintf(" Example: '37M' is 37 megabytes or %d bytes\n", 37 * ONE_MB); - HDprintf("\n"); - HDprintf(" AL - is an API list. Valid values are:\n"); - HDprintf(" phdf5 - Parallel HDF5\n"); - HDprintf(" mpiio - MPI-I/O\n"); - HDprintf(" posix - POSIX\n"); - HDprintf("\n"); - HDprintf(" Example: --api=mpiio,phdf5\n"); - HDprintf("\n"); - HDprintf(" Dataset size:\n"); - HDprintf(" Depending on the selected geometry, each test dataset is either a linear\n"); - HDprintf(" array of size bytes-per-process * num-processes, or a square array of size\n"); - HDprintf(" (bytes-per-process * num-processes) x (bytes-per-process * num-processes).\n"); - HDprintf("\n"); - HDprintf(" Block size vs. Transfer buffer size:\n"); - HDprintf(" buffer-size controls the size of the memory buffer, which is broken into\n"); - HDprintf(" blocks and written to the file. Depending on the selected geometry, each\n"); - HDprintf(" block can be a linear array of size block-size or a square array of size\n"); - HDprintf(" block-size x block-size. The arrangement in which blocks are written is\n"); - HDprintf(" determined by the access pattern.\n"); - HDprintf("\n"); - HDprintf(" In 1D geometry, the transfer buffer is a linear array of size buffer-size.\n"); - HDprintf(" In 2D geometry, it is a rectangular array of size block-size x buffer-size\n"); - HDprintf(" or buffer-size x block-size if interleaved pattern is selected.\n"); - HDprintf("\n"); - HDprintf(" Interleaved and Contiguous patterns in 1D geometry:\n"); - HDprintf(" When contiguous access pattern is chosen, the dataset is evenly divided\n"); - HDprintf(" into num-processes regions and each process writes data to its own region.\n"); - HDprintf(" When interleaved blocks are written to a dataset, space for the first\n"); - HDprintf(" block of the first process is allocated in the dataset, then space is\n"); - HDprintf(" allocated for the first block of the second process, etc. until space is\n"); - HDprintf(" allocated for the first block of each process, then space is allocated for\n"); - HDprintf(" the second block of the first process, the second block of the second\n"); - HDprintf(" process, etc.\n"); - HDprintf("\n"); - HDprintf(" For example, with a 3 process run, 512KB bytes-per-process, 256KB transfer\n"); - HDprintf(" buffer size, and 64KB block size, each process must issue 2 transfer\n"); - HDprintf(" requests to complete access to the dataset.\n"); - HDprintf(" Contiguous blocks of the first transfer request are written like so:\n"); - HDprintf(" 1111----2222----3333----\n"); - HDprintf(" Interleaved blocks of the first transfer request are written like so:\n"); - HDprintf(" 123123123123------------\n"); - HDprintf(" The actual number of I/O operations involved in a transfer request\n"); - HDprintf(" depends on the access pattern and communication mode.\n"); - HDprintf(" When using independent I/O with interleaved pattern, each process\n"); - HDprintf(" performs 4 small non-contiguous I/O operations per transfer request.\n"); - HDprintf(" If collective I/O is turned on, the combined content of the buffers of\n"); - HDprintf(" the 3 processes will be written using one collective I/O operation\n"); - HDprintf(" per transfer request.\n"); - HDprintf("\n"); - HDprintf(" For information about access patterns in 2D geometry, please refer to the\n"); - HDprintf(" HDF5 Reference Manual.\n"); - HDprintf("\n"); - HDprintf(" DL - is a list of debugging flags. Valid values are:\n"); - HDprintf(" 1 - Minimal\n"); - HDprintf(" 2 - Not quite everything\n"); - HDprintf(" 3 - Everything\n"); - HDprintf(" 4 - The kitchen sink\n"); - HDprintf(" r - Raw data I/O throughput information\n"); - HDprintf(" t - Times as well as throughputs\n"); - HDprintf(" v - Verify data correctness\n"); - HDprintf("\n"); - HDprintf(" Example: --debug=2,r,t\n"); - HDprintf("\n"); - HDprintf(" Environment variables:\n"); - HDprintf(" HDF5_NOCLEANUP Do not remove data files if set [default remove]\n"); - HDprintf(" HDF5_MPI_INFO MPI INFO object key=value separated by ;\n"); - HDprintf(" HDF5_PARAPREFIX Parallel data files prefix\n"); + printf(" -B S, --block-size=S Block size within transfer buffer\n"); + printf(" (see below for description)\n"); + printf(" [default: half the number of bytes per process\n"); + printf(" per dataset]\n"); + printf(" -c, --chunk Create HDF5 datasets using chunked storage\n"); + printf(" [default: contiguous storage]\n"); + printf(" -C, --collective Use collective I/O for MPI and HDF5 APIs\n"); + printf(" [default: independent I/O)\n"); + printf(" -d N, --num-dsets=N Number of datasets per file [default: 1]\n"); + printf(" -D DL, --debug=DL Indicate the debugging level\n"); + printf(" [default: no debugging]\n"); + printf(" -e S, --num-bytes=S Number of bytes per process per dataset\n"); + printf(" (see below for description)\n"); + printf(" [default: 256K for 1D, 8K for 2D]\n"); + printf(" -F N, --num-files=N Number of files [default: 1]\n"); + printf(" -g, --geometry Use 2D geometry [default: 1D geometry]\n"); + printf(" -i N, --num-iterations=N Number of iterations to perform [default: 1]\n"); + printf(" -I, --interleaved Interleaved access pattern\n"); + printf(" (see below for example)\n"); + printf(" [default: Contiguous access pattern]\n"); + printf(" -o F, --output=F Output raw data into file F [default: none]\n"); + printf(" -p N, --min-num-processes=N Minimum number of processes to use [default: 1]\n"); + printf(" -P N, --max-num-processes=N Maximum number of processes to use\n"); + printf(" [default: all MPI_COMM_WORLD processes ]\n"); + printf(" -T S, --threshold=S Threshold for alignment of objects in HDF5 file\n"); + printf(" [default: 1]\n"); + printf(" -w, --write-only Perform write tests not the read tests\n"); + printf(" -x S, --min-xfer-size=S Minimum transfer buffer size\n"); + printf(" (see below for description)\n"); + printf(" [default: half the number of bytes per process\n"); + printf(" per dataset]\n"); + printf(" -X S, --max-xfer-size=S Maximum transfer buffer size\n"); + printf(" [default: the number of bytes per process per\n"); + printf(" dataset]\n"); + printf("\n"); + printf(" F - is a filename.\n"); + printf(" N - is an integer >=0.\n"); + printf(" S - is a size specifier, an integer >=0 followed by a size indicator:\n"); + printf(" K - Kilobyte (%d)\n", ONE_KB); + printf(" M - Megabyte (%d)\n", ONE_MB); + printf(" G - Gigabyte (%d)\n", ONE_GB); + printf("\n"); + printf(" Example: '37M' is 37 megabytes or %d bytes\n", 37 * ONE_MB); + printf("\n"); + printf(" AL - is an API list. Valid values are:\n"); + printf(" phdf5 - Parallel HDF5\n"); + printf(" mpiio - MPI-I/O\n"); + printf(" posix - POSIX\n"); + printf("\n"); + printf(" Example: --api=mpiio,phdf5\n"); + printf("\n"); + printf(" Dataset size:\n"); + printf(" Depending on the selected geometry, each test dataset is either a linear\n"); + printf(" array of size bytes-per-process * num-processes, or a square array of size\n"); + printf(" (bytes-per-process * num-processes) x (bytes-per-process * num-processes).\n"); + printf("\n"); + printf(" Block size vs. Transfer buffer size:\n"); + printf(" buffer-size controls the size of the memory buffer, which is broken into\n"); + printf(" blocks and written to the file. Depending on the selected geometry, each\n"); + printf(" block can be a linear array of size block-size or a square array of size\n"); + printf(" block-size x block-size. The arrangement in which blocks are written is\n"); + printf(" determined by the access pattern.\n"); + printf("\n"); + printf(" In 1D geometry, the transfer buffer is a linear array of size buffer-size.\n"); + printf(" In 2D geometry, it is a rectangular array of size block-size x buffer-size\n"); + printf(" or buffer-size x block-size if interleaved pattern is selected.\n"); + printf("\n"); + printf(" Interleaved and Contiguous patterns in 1D geometry:\n"); + printf(" When contiguous access pattern is chosen, the dataset is evenly divided\n"); + printf(" into num-processes regions and each process writes data to its own region.\n"); + printf(" When interleaved blocks are written to a dataset, space for the first\n"); + printf(" block of the first process is allocated in the dataset, then space is\n"); + printf(" allocated for the first block of the second process, etc. until space is\n"); + printf(" allocated for the first block of each process, then space is allocated for\n"); + printf(" the second block of the first process, the second block of the second\n"); + printf(" process, etc.\n"); + printf("\n"); + printf(" For example, with a 3 process run, 512KB bytes-per-process, 256KB transfer\n"); + printf(" buffer size, and 64KB block size, each process must issue 2 transfer\n"); + printf(" requests to complete access to the dataset.\n"); + printf(" Contiguous blocks of the first transfer request are written like so:\n"); + printf(" 1111----2222----3333----\n"); + printf(" Interleaved blocks of the first transfer request are written like so:\n"); + printf(" 123123123123------------\n"); + printf(" The actual number of I/O operations involved in a transfer request\n"); + printf(" depends on the access pattern and communication mode.\n"); + printf(" When using independent I/O with interleaved pattern, each process\n"); + printf(" performs 4 small non-contiguous I/O operations per transfer request.\n"); + printf(" If collective I/O is turned on, the combined content of the buffers of\n"); + printf(" the 3 processes will be written using one collective I/O operation\n"); + printf(" per transfer request.\n"); + printf("\n"); + printf(" For information about access patterns in 2D geometry, please refer to the\n"); + printf(" HDF5 Reference Manual.\n"); + printf("\n"); + printf(" DL - is a list of debugging flags. Valid values are:\n"); + printf(" 1 - Minimal\n"); + printf(" 2 - Not quite everything\n"); + printf(" 3 - Everything\n"); + printf(" 4 - The kitchen sink\n"); + printf(" r - Raw data I/O throughput information\n"); + printf(" t - Times as well as throughputs\n"); + printf(" v - Verify data correctness\n"); + printf("\n"); + printf(" Example: --debug=2,r,t\n"); + printf("\n"); + printf(" Environment variables:\n"); + printf(" HDF5_NOCLEANUP Do not remove data files if set [default remove]\n"); + printf(" HDF5_MPI_INFO MPI INFO object key=value separated by ;\n"); + printf(" HDF5_PARAPREFIX Parallel data files prefix\n"); fflush(stdout); } /* end if */ } /* end usage() */ @@ -1680,7 +1680,7 @@ usage(const char *prog) int main(void) { - HDprintf("No parallel IO performance because parallel is not configured\n"); + printf("No parallel IO performance because parallel is not configured\n"); return EXIT_SUCCESS; } /* end main */ diff --git a/tools/src/h5perf/pio_perf.h b/tools/src/h5perf/pio_perf.h index 05f8d5b..54fbb52 100644 --- a/tools/src/h5perf/pio_perf.h +++ b/tools/src/h5perf/pio_perf.h @@ -86,10 +86,10 @@ extern int pio_debug_level; /* The debug level: * 4 - Even More Debugging (timer stuff) */ -#define HDprint_rank(f) /* print rank in MPI_COMM_WORLD */ HDfprintf(f, "%d: ", comm_world_rank_g); -#define HDprint_size(f) /* print size of MPI_COMM_WORLD */ HDfprintf(f, "%d", comm_world_nprocs_g); +#define HDprint_rank(f) /* print rank in MPI_COMM_WORLD */ fprintf(f, "%d: ", comm_world_rank_g); +#define HDprint_size(f) /* print size of MPI_COMM_WORLD */ fprintf(f, "%d", comm_world_nprocs_g); #define HDprint_rank_size(f) /* print rank/size of MPI_COMM_WORLD */ \ - HDfprintf(f, "%d/%d: ", comm_world_rank_g, comm_world_nprocs_g); + fprintf(f, "%d/%d: ", comm_world_rank_g, comm_world_nprocs_g); #ifdef __cplusplus extern "C" { diff --git a/tools/src/h5perf/sio_engine.c b/tools/src/h5perf/sio_engine.c index ca7d4ae..24c3f06 100644 --- a/tools/src/h5perf/sio_engine.c +++ b/tools/src/h5perf/sio_engine.c @@ -44,7 +44,7 @@ } #define ERRMSG(mesg) \ { \ - HDfprintf(stderr, "*** Assertion failed (%s) at line %4d in %s\n", mesg, (int)__LINE__, __FILE__); \ + fprintf(stderr, "*** Assertion failed (%s) at line %4d in %s\n", mesg, (int)__LINE__, __FILE__); \ } /* verify: if val is false (0), print mesg. */ @@ -158,7 +158,7 @@ do_sio(parameters param, results *res) break; default: /* unknown request */ - HDfprintf(stderr, "Unknown IO type request (%d)\n", (int)iot); + fprintf(stderr, "Unknown IO type request (%d)\n", (int)iot); GOTOERROR(FAIL); } @@ -173,29 +173,29 @@ do_sio(parameters param, results *res) /* Validate transfer buffer size */ if (param.buf_size[i] <= 0) { - HDfprintf(stderr, "Transfer buffer size[%d] (%zu) must be > 0\n", i, buf_size[i]); + fprintf(stderr, "Transfer buffer size[%d] (%zu) must be > 0\n", i, buf_size[i]); GOTOERROR(FAIL); } if ((param.dset_size[i] % param.buf_size[i]) != 0) { - HDfprintf(stderr, - "Dataset size[%d] (%lld) must be a multiple of the " - "transfer buffer size[%d] (%zu)\n", - param.rank, (long long)param.dset_size[i], param.rank, param.buf_size[i]); + fprintf(stderr, + "Dataset size[%d] (%lld) must be a multiple of the " + "transfer buffer size[%d] (%zu)\n", + param.rank, (long long)param.dset_size[i], param.rank, param.buf_size[i]); GOTOERROR(FAIL); } } /* Allocate transfer buffer */ if ((buffer = (char *)malloc(linear_buf_size)) == NULL) { - HDfprintf(stderr, "malloc for transfer buffer size (%zu) failed\n", linear_buf_size); + fprintf(stderr, "malloc for transfer buffer size (%zu) failed\n", linear_buf_size); GOTOERROR(FAIL); } if (sio_debug_level >= 4) /* output all of the times for all iterations */ - HDfprintf(output, "Timer details:\n"); + fprintf(output, "Timer details:\n"); /* * Write performance measurement @@ -206,7 +206,7 @@ do_sio(parameters param, results *res) sio_create_filename(iot, base_name, fname, FILENAME_MAX, ¶m); if (sio_debug_level > 0) - HDfprintf(output, "data filename=%s\n", fname); + fprintf(output, "data filename=%s\n", fname); io_time_set(res->timers, HDF5_GROSS_WRITE_FIXED_DIMS, TSTART); hrc = do_fopen(¶m, fname, &fd, SIO_CREATE | SIO_WRITE); @@ -310,7 +310,7 @@ sio_create_filename(iotype iot, const char *base_name, char *fullname, size_t si break; default: /* unknown request */ - HDfprintf(stderr, "Unknown IO type request (%d)\n", (int)iot); + fprintf(stderr, "Unknown IO type request (%d)\n", (int)iot); assert(0 && "Unknown IO type"); break; } @@ -486,14 +486,14 @@ do_write(results *res, file_descr *fd, parameters *parms, void *buffer) /* Create the dataset transfer property list */ h5dxpl = H5Pcreate(H5P_DATASET_XFER); if (h5dxpl < 0) { - HDfprintf(stderr, "HDF5 Property List Create failed\n"); + fprintf(stderr, "HDF5 Property List Create failed\n"); GOTOERROR(FAIL); } break; default: - HDfprintf(stderr, "Unknown IO type request (%d)\n", (int)parms->io_type); + fprintf(stderr, "Unknown IO type request (%d)\n", (int)parms->io_type); GOTOERROR(FAIL); break; } /* end switch */ @@ -507,7 +507,7 @@ do_write(results *res, file_descr *fd, parameters *parms, void *buffer) h5dcpl = H5Pcreate(H5P_DATASET_CREATE); if (h5dcpl < 0) { - HDfprintf(stderr, "HDF5 Property List Create failed\n"); + fprintf(stderr, "HDF5 Property List Create failed\n"); GOTOERROR(FAIL); } @@ -515,7 +515,7 @@ do_write(results *res, file_descr *fd, parameters *parms, void *buffer) /* Set the chunk size to be the same as the buffer size */ hrc = H5Pset_chunk(h5dcpl, rank, h5chunk); if (hrc < 0) { - HDfprintf(stderr, "HDF5 Property List Set failed\n"); + fprintf(stderr, "HDF5 Property List Set failed\n"); GOTOERROR(FAIL); } /* end if */ } /* end if */ @@ -525,21 +525,21 @@ do_write(results *res, file_descr *fd, parameters *parms, void *buffer) H5Dcreate2(fd->h5fd, dname, ELMT_H5_TYPE, h5dset_space_id, H5P_DEFAULT, h5dcpl, H5P_DEFAULT); if (h5ds_id < 0) { - HDfprintf(stderr, "HDF5 Dataset Create failed\n"); + fprintf(stderr, "HDF5 Dataset Create failed\n"); GOTOERROR(FAIL); } hrc = H5Pclose(h5dcpl); /* verifying the close of the dcpl */ if (hrc < 0) { - HDfprintf(stderr, "HDF5 Property List Close failed\n"); + fprintf(stderr, "HDF5 Property List Close failed\n"); GOTOERROR(FAIL); } break; default: /* unknown request */ - HDfprintf(stderr, "Unknown IO type request (%d)\n", (int)parms->io_type); + fprintf(stderr, "Unknown IO type request (%d)\n", (int)parms->io_type); GOTOERROR(FAIL); break; } @@ -551,7 +551,7 @@ do_write(results *res, file_descr *fd, parameters *parms, void *buffer) hrc = dset_write(rank - 1, fd, parms, buffer); if (hrc < 0) { - HDfprintf(stderr, "Error in dataset write\n"); + fprintf(stderr, "Error in dataset write\n"); GOTOERROR(FAIL); } @@ -565,7 +565,7 @@ do_write(results *res, file_descr *fd, parameters *parms, void *buffer) hrc = H5Dclose(h5ds_id); if (hrc < 0) { - HDfprintf(stderr, "HDF5 Dataset Close failed\n"); + fprintf(stderr, "HDF5 Dataset Close failed\n"); GOTOERROR(FAIL); } @@ -578,7 +578,7 @@ done: if (h5dset_space_id != -1) { hrc = H5Sclose(h5dset_space_id); if (hrc < 0) { - HDfprintf(stderr, "HDF5 Dataset Space Close failed\n"); + fprintf(stderr, "HDF5 Dataset Space Close failed\n"); ret_code = FAIL; } else { @@ -589,7 +589,7 @@ done: if (h5mem_space_id != -1) { hrc = H5Sclose(h5mem_space_id); if (hrc < 0) { - HDfprintf(stderr, "HDF5 Memory Space Close failed\n"); + fprintf(stderr, "HDF5 Memory Space Close failed\n"); ret_code = FAIL; } else { @@ -600,7 +600,7 @@ done: if (h5dxpl != -1) { hrc = H5Pclose(h5dxpl); if (hrc < 0) { - HDfprintf(stderr, "HDF5 Dataset Transfer Property List Close failed\n"); + fprintf(stderr, "HDF5 Dataset Transfer Property List Close failed\n"); ret_code = FAIL; } else { @@ -683,7 +683,7 @@ dset_write(int local_dim, file_descr *fd, parameters *parms, void *buffer) default: /* unknown request */ - HDfprintf(stderr, "Unknown IO type request (%d)\n", (int)parms->io_type); + fprintf(stderr, "Unknown IO type request (%d)\n", (int)parms->io_type); assert(0 && "Unknown IO type"); break; } /* switch (parms->io_type) */ @@ -777,7 +777,7 @@ do_read(results *res, file_descr *fd, parameters *parms, void *buffer) /* Allocate data verification buffer */ if (NULL == (buffer2 = (char *)malloc(linear_buf_size))) { - HDfprintf(stderr, "malloc for data verification buffer size (%zu) failed\n", linear_buf_size); + fprintf(stderr, "malloc for data verification buffer size (%zu) failed\n", linear_buf_size); GOTOERROR(FAIL); } /* end if */ @@ -828,14 +828,14 @@ do_read(results *res, file_descr *fd, parameters *parms, void *buffer) /* Create the dataset transfer property list */ h5dxpl = H5Pcreate(H5P_DATASET_XFER); if (h5dxpl < 0) { - HDfprintf(stderr, "HDF5 Property List Create failed\n"); + fprintf(stderr, "HDF5 Property List Create failed\n"); GOTOERROR(FAIL); } break; default: /* unknown request */ - HDfprintf(stderr, "Unknown IO type request (%d)\n", (int)parms->io_type); + fprintf(stderr, "Unknown IO type request (%d)\n", (int)parms->io_type); GOTOERROR(FAIL); break; } /* end switch */ @@ -849,14 +849,14 @@ do_read(results *res, file_descr *fd, parameters *parms, void *buffer) HDsnprintf(dname, sizeof(dname), "Dataset_%ld", (long)parms->num_bytes); h5ds_id = H5Dopen2(fd->h5fd, dname, H5P_DEFAULT); if (h5ds_id < 0) { - HDfprintf(stderr, "HDF5 Dataset open failed\n"); + fprintf(stderr, "HDF5 Dataset open failed\n"); GOTOERROR(FAIL); } break; default: /* unknown request */ - HDfprintf(stderr, "Unknown IO type request (%d)\n", (int)parms->io_type); + fprintf(stderr, "Unknown IO type request (%d)\n", (int)parms->io_type); GOTOERROR(FAIL); break; } /* end switch */ @@ -866,7 +866,7 @@ do_read(results *res, file_descr *fd, parameters *parms, void *buffer) hrc = dset_read(rank - 1, fd, parms, buffer, buffer2); if (hrc < 0) { - HDfprintf(stderr, "Error in dataset read\n"); + fprintf(stderr, "Error in dataset read\n"); GOTOERROR(FAIL); } @@ -880,7 +880,7 @@ do_read(results *res, file_descr *fd, parameters *parms, void *buffer) hrc = H5Dclose(h5ds_id); if (hrc < 0) { - HDfprintf(stderr, "HDF5 Dataset Close failed\n"); + fprintf(stderr, "HDF5 Dataset Close failed\n"); GOTOERROR(FAIL); } @@ -893,7 +893,7 @@ done: if (h5dset_space_id != -1) { hrc = H5Sclose(h5dset_space_id); if (hrc < 0) { - HDfprintf(stderr, "HDF5 Dataset Space Close failed\n"); + fprintf(stderr, "HDF5 Dataset Space Close failed\n"); ret_code = FAIL; } else { @@ -904,7 +904,7 @@ done: if (h5mem_space_id != -1) { hrc = H5Sclose(h5mem_space_id); if (hrc < 0) { - HDfprintf(stderr, "HDF5 Memory Space Close failed\n"); + fprintf(stderr, "HDF5 Memory Space Close failed\n"); ret_code = FAIL; } else { @@ -915,7 +915,7 @@ done: if (h5dxpl != -1) { hrc = H5Pclose(h5dxpl); if (hrc < 0) { - HDfprintf(stderr, "HDF5 Dataset Transfer Property List Close failed\n"); + fprintf(stderr, "HDF5 Dataset Transfer Property List Close failed\n"); ret_code = FAIL; } else { @@ -981,7 +981,7 @@ dset_read(int local_dim, file_descr *fd, parameters *parms, void *buffer, const default: /* unknown request */ - HDfprintf(stderr, "Unknown IO type request (%d)\n", (int)parms->io_type); + fprintf(stderr, "Unknown IO type request (%d)\n", (int)parms->io_type); assert(0 && "Unknown IO type"); break; } /* switch (parms->io_type) */ @@ -1065,7 +1065,7 @@ do_fopen(parameters *param, char *fname, file_descr *fd /*out*/, int flags) fd->posixfd = POSIXOPEN(fname, O_RDONLY); if (fd->posixfd < 0) { - HDfprintf(stderr, "POSIX File Open failed(%s)\n", fname); + fprintf(stderr, "POSIX File Open failed(%s)\n", fname); GOTOERROR(FAIL); } @@ -1076,7 +1076,7 @@ do_fopen(parameters *param, char *fname, file_descr *fd /*out*/, int flags) fapl = set_vfd(param); if (fapl < 0) { - HDfprintf(stderr, "HDF5 Property List Create failed\n"); + fprintf(stderr, "HDF5 Property List Create failed\n"); GOTOERROR(FAIL); } @@ -1097,14 +1097,14 @@ do_fopen(parameters *param, char *fname, file_descr *fd /*out*/, int flags) } if (fd->h5fd < 0) { - HDfprintf(stderr, "HDF5 File Create failed(%s)\n", fname); + fprintf(stderr, "HDF5 File Create failed(%s)\n", fname); GOTOERROR(FAIL); } break; default: /* unknown request */ - HDfprintf(stderr, "Unknown IO type request (%d)\n", (int)param->io_type); + fprintf(stderr, "Unknown IO type request (%d)\n", (int)param->io_type); GOTOERROR(FAIL); break; } @@ -1227,7 +1227,7 @@ do_fclose(iotype iot, file_descr *fd /*out*/) rc = POSIXCLOSE(fd->posixfd); if (rc != 0) { - HDfprintf(stderr, "POSIX File Close failed\n"); + fprintf(stderr, "POSIX File Close failed\n"); GOTOERROR(FAIL); } @@ -1238,7 +1238,7 @@ do_fclose(iotype iot, file_descr *fd /*out*/) hrc = H5Fclose(fd->h5fd); if (hrc < 0) { - HDfprintf(stderr, "HDF5 File Close failed\n"); + fprintf(stderr, "HDF5 File Close failed\n"); GOTOERROR(FAIL); } @@ -1247,7 +1247,7 @@ do_fclose(iotype iot, file_descr *fd /*out*/) default: /* unknown request */ - HDfprintf(stderr, "Unknown IO type request (%d)\n", (int)iot); + fprintf(stderr, "Unknown IO type request (%d)\n", (int)iot); GOTOERROR(FAIL); break; } @@ -1325,7 +1325,7 @@ do_cleanupfile(iotype iot, char *filename) default: /* unknown request */ - HDfprintf(stderr, "Unknown IO type request (%d)\n", (int)iot); + fprintf(stderr, "Unknown IO type request (%d)\n", (int)iot); assert(0 && "Unknown IO type"); break; } diff --git a/tools/src/h5perf/sio_perf.c b/tools/src/h5perf/sio_perf.c index 870318e..5d88cd2 100644 --- a/tools/src/h5perf/sio_perf.c +++ b/tools/src/h5perf/sio_perf.c @@ -203,7 +203,7 @@ main(int argc, char *argv[]) if (opts->output_file) { if ((output = HDfopen(opts->output_file, "w")) == NULL) { - HDfprintf(stderr, "%s: cannot open output file\n", progname); + fprintf(stderr, "%s: cannot open output file\n", progname); HDperror(opts->output_file); goto finish; } @@ -327,7 +327,7 @@ run_test(iotype iot, parameters parms, struct options *opts) break; default: /* unknown request */ - HDfprintf(stderr, "Unknown IO type request (%d)\n", (int)iot); + fprintf(stderr, "Unknown IO type request (%d)\n", (int)iot); assert(0 && "Unknown IO tpe"); break; } @@ -662,28 +662,28 @@ recover_size_and_print(long long val, const char *end) if (val >= ONE_KB && (val % ONE_KB) == 0) { if (val >= ONE_MB && (val % ONE_MB) == 0) { if (val >= ONE_GB && (val % ONE_GB) == 0) - HDfprintf(output, - "%lld" - "GB%s", - val / ONE_GB, end); + fprintf(output, + "%lld" + "GB%s", + val / ONE_GB, end); else - HDfprintf(output, - "%lld" - "MB%s", - val / ONE_MB, end); + fprintf(output, + "%lld" + "MB%s", + val / ONE_MB, end); } else { - HDfprintf(output, - "%lld" - "KB%s", - val / ONE_KB, end); + fprintf(output, + "%lld" + "KB%s", + val / ONE_KB, end); } } else { - HDfprintf(output, - "%lld" - "%s", - val, end); + fprintf(output, + "%lld" + "%s", + val, end); } } @@ -691,10 +691,10 @@ static void print_io_api(long io_types) { if (io_types & SIO_POSIX) - HDfprintf(output, "posix "); + fprintf(output, "posix "); if (io_types & SIO_HDF5) - HDfprintf(output, "hdf5 "); - HDfprintf(output, "\n"); + fprintf(output, "hdf5 "); + fprintf(output, "\n"); } static void @@ -704,95 +704,95 @@ report_parameters(struct options *opts) rank = opts->dset_rank; print_version("HDF5 Library"); /* print library version */ - HDfprintf(output, "==== Parameters ====\n"); + fprintf(output, "==== Parameters ====\n"); - HDfprintf(output, "IO API="); + fprintf(output, "IO API="); print_io_api(opts->io_types); - HDfprintf(output, "Number of iterations=%d\n", opts->num_iters); + fprintf(output, "Number of iterations=%d\n", opts->num_iters); - HDfprintf(output, "Dataset size="); + fprintf(output, "Dataset size="); for (i = 0; i < rank; i++) recover_size_and_print((long long)opts->dset_size[i], " "); - HDfprintf(output, "\n"); + fprintf(output, "\n"); - HDfprintf(output, "Transfer buffer size="); + fprintf(output, "Transfer buffer size="); for (i = 0; i < rank; i++) recover_size_and_print((long long)opts->buf_size[i], " "); - HDfprintf(output, "\n"); + fprintf(output, "\n"); if (opts->page_size) { - HDfprintf(output, "Page Aggregation Enabled. Page size = %zu\n", opts->page_size); + fprintf(output, "Page Aggregation Enabled. Page size = %zu\n", opts->page_size); if (opts->page_buffer_size) - HDfprintf(output, "Page Buffering Enabled. Page Buffer size = %zu\n", opts->page_buffer_size); + fprintf(output, "Page Buffering Enabled. Page Buffer size = %zu\n", opts->page_buffer_size); else - HDfprintf(output, "Page Buffering Disabled\n"); + fprintf(output, "Page Buffering Disabled\n"); } else - HDfprintf(output, "Page Aggregation Disabled\n"); + fprintf(output, "Page Aggregation Disabled\n"); - HDfprintf(output, "Dimension access order="); + fprintf(output, "Dimension access order="); for (i = 0; i < rank; i++) recover_size_and_print((long long)opts->order[i], " "); - HDfprintf(output, "\n"); + fprintf(output, "\n"); if (opts->io_types & SIO_HDF5) { - HDfprintf(output, "HDF5 data storage method="); + fprintf(output, "HDF5 data storage method="); if (opts->h5_use_chunks) { - HDfprintf(output, "Chunked\n"); - HDfprintf(output, "HDF5 chunk size="); + fprintf(output, "Chunked\n"); + fprintf(output, "HDF5 chunk size="); for (i = 0; i < rank; i++) recover_size_and_print((long long)opts->chk_size[i], " "); - HDfprintf(output, "\n"); + fprintf(output, "\n"); - HDfprintf(output, "HDF5 dataset dimensions="); + fprintf(output, "HDF5 dataset dimensions="); if (opts->h5_extendable) { - HDfprintf(output, "Extendable\n"); + fprintf(output, "Extendable\n"); } else { - HDfprintf(output, "Fixed\n"); + fprintf(output, "Fixed\n"); } } else { - HDfprintf(output, "Contiguous\n"); + fprintf(output, "Contiguous\n"); } - HDfprintf(output, "HDF5 file driver="); + fprintf(output, "HDF5 file driver="); if (opts->vfd == sec2) { - HDfprintf(output, "sec2\n"); + fprintf(output, "sec2\n"); } else if (opts->vfd == stdio) { - HDfprintf(output, "stdio\n"); + fprintf(output, "stdio\n"); } else if (opts->vfd == core) { - HDfprintf(output, "core\n"); + fprintf(output, "core\n"); } else if (opts->vfd == split) { - HDfprintf(output, "split\n"); + fprintf(output, "split\n"); } else if (opts->vfd == multi) { - HDfprintf(output, "multi\n"); + fprintf(output, "multi\n"); } else if (opts->vfd == family) { - HDfprintf(output, "family\n"); + fprintf(output, "family\n"); } else if (opts->vfd == direct) { - HDfprintf(output, "direct\n"); + fprintf(output, "direct\n"); } } { char *prefix = HDgetenv("HDF5_PREFIX"); - HDfprintf(output, "Env HDF5_PREFIX=%s\n", (prefix ? prefix : "not set")); + fprintf(output, "Env HDF5_PREFIX=%s\n", (prefix ? prefix : "not set")); } - HDfprintf(output, "==== End of Parameters ====\n"); - HDfprintf(output, "\n"); + fprintf(output, "==== End of Parameters ====\n"); + fprintf(output, "\n"); } /* @@ -872,7 +872,7 @@ parse_command_line(int argc, const char *const *argv) cl_opts->io_types |= SIO_POSIX; } else { - HDfprintf(stderr, "sio_perf: invalid --api option %s\n", buf); + fprintf(stderr, "sio_perf: invalid --api option %s\n", buf); HDexit(EXIT_FAILURE); } @@ -936,7 +936,7 @@ parse_command_line(int argc, const char *const *argv) for (j = 0; j < 10 && buf[j] != '\0'; ++j) if (!HDisdigit(buf[j])) { - HDfprintf(stderr, "sio_perf: invalid --debug option %s\n", buf); + fprintf(stderr, "sio_perf: invalid --debug option %s\n", buf); HDexit(EXIT_FAILURE); } @@ -962,7 +962,7 @@ parse_command_line(int argc, const char *const *argv) cl_opts->verify = TRUE; break; default: - HDfprintf(stderr, "sio_perf: invalid --debug option %s\n", buf); + fprintf(stderr, "sio_perf: invalid --debug option %s\n", buf); HDexit(EXIT_FAILURE); } } @@ -1034,7 +1034,7 @@ parse_command_line(int argc, const char *const *argv) cl_opts->vfd = direct; } else { - HDfprintf(stderr, "sio_perf: invalid --api option %s\n", H5_optarg); + fprintf(stderr, "sio_perf: invalid --api option %s\n", H5_optarg); HDexit(EXIT_FAILURE); } break; @@ -1198,7 +1198,7 @@ parse_size_directive(const char *size) break; default: - HDfprintf(stderr, "Illegal size specifier '%c'\n", *endptr); + fprintf(stderr, "Illegal size specifier '%c'\n", *endptr); HDexit(EXIT_FAILURE); } } @@ -1216,70 +1216,70 @@ static void usage(const char *prog) { print_version(prog); - HDprintf("usage: %s [OPTIONS]\n", prog); - HDprintf(" OPTIONS\n"); - HDprintf(" -h Print an usage message and exit\n"); - HDprintf(" -A AL Which APIs to test\n"); - HDprintf(" [default: all of them]\n"); - HDprintf(" -c SL Selects chunked storage and defines chunks dimensions\n"); - HDprintf(" and sizes\n"); - HDprintf(" [default: Off]\n"); - HDprintf(" -e SL Dimensions and sizes of dataset\n"); - HDprintf(" [default: 100,200]\n"); - HDprintf(" -i N Number of iterations to perform\n"); - HDprintf(" [default: 1]\n"); - HDprintf(" -r NL Dimension access order (see below for description)\n"); - HDprintf(" [default: 1,2]\n"); - HDprintf(" -t Selects extendable dimensions for HDF5 dataset\n"); - HDprintf(" [default: Off]\n"); - HDprintf(" -v VFD Selects file driver for HDF5 access\n"); - HDprintf(" [default: sec2]\n"); - HDprintf(" -w Perform write tests, not the read tests\n"); - HDprintf(" [default: Off]\n"); - HDprintf(" -x SL Dimensions and sizes of the transfer buffer\n"); - HDprintf(" [default: 10,20]\n"); - HDprintf("\n"); - HDprintf(" N - is an integer > 0.\n"); - HDprintf("\n"); - HDprintf(" S - is a size specifier, an integer > 0 followed by a size indicator:\n"); - HDprintf(" K - Kilobyte (%d)\n", ONE_KB); - HDprintf(" M - Megabyte (%d)\n", ONE_MB); - HDprintf(" G - Gigabyte (%d)\n", ONE_GB); - HDprintf("\n"); - HDprintf(" Example: '37M' is 37 megabytes or %d bytes\n", 37 * ONE_MB); - HDprintf("\n"); - HDprintf(" AL - is an API list. Valid values are:\n"); - HDprintf(" hdf5 - HDF5\n"); - HDprintf(" posix - POSIX\n"); - HDprintf("\n"); - HDprintf(" Example: -A posix,hdf5\n"); - HDprintf("\n"); - HDprintf(" NL - is list of integers (N) separated by commas.\n"); - HDprintf("\n"); - HDprintf(" Example: 1,2,3\n"); - HDprintf("\n"); - HDprintf(" SL - is list of size specifiers (S) separated by commas.\n"); - HDprintf("\n"); - HDprintf(" Example: 2K,2K,3K\n"); - HDprintf("\n"); - HDprintf(" The example defines an object (dataset, transfer buffer) with three\n"); - HDprintf(" dimensions. Be aware that as the number of dimensions increases, the\n"); - HDprintf(" the total size of the object increases exponentially.\n"); - HDprintf("\n"); - HDprintf(" VFD - is an HDF5 file driver specifier. Valid values are:\n"); - HDprintf(" sec2, stdio, core, split, multi, family, direct\n"); - HDprintf("\n"); - HDprintf(" Dimension access order:\n"); - HDprintf(" Data access starts at the cardinal origin of the dataset using the\n"); - HDprintf(" transfer buffer. The next access occurs on a dataset region next to\n"); - HDprintf(" the previous one. For a multidimensional dataset, there are several\n"); - HDprintf(" directions as to where to proceed. This can be specified in the dimension\n"); - HDprintf(" access order. For example, -r 1,2 states that the tool should traverse\n"); - HDprintf(" dimension 1 first, and then dimension 2.\n"); - HDprintf("\n"); - HDprintf(" Environment variables:\n"); - HDprintf(" HDF5_NOCLEANUP Do not remove data files if set [default remove]\n"); - HDprintf(" HDF5_PREFIX Data file prefix\n"); - HDprintf("\n"); + printf("usage: %s [OPTIONS]\n", prog); + printf(" OPTIONS\n"); + printf(" -h Print an usage message and exit\n"); + printf(" -A AL Which APIs to test\n"); + printf(" [default: all of them]\n"); + printf(" -c SL Selects chunked storage and defines chunks dimensions\n"); + printf(" and sizes\n"); + printf(" [default: Off]\n"); + printf(" -e SL Dimensions and sizes of dataset\n"); + printf(" [default: 100,200]\n"); + printf(" -i N Number of iterations to perform\n"); + printf(" [default: 1]\n"); + printf(" -r NL Dimension access order (see below for description)\n"); + printf(" [default: 1,2]\n"); + printf(" -t Selects extendable dimensions for HDF5 dataset\n"); + printf(" [default: Off]\n"); + printf(" -v VFD Selects file driver for HDF5 access\n"); + printf(" [default: sec2]\n"); + printf(" -w Perform write tests, not the read tests\n"); + printf(" [default: Off]\n"); + printf(" -x SL Dimensions and sizes of the transfer buffer\n"); + printf(" [default: 10,20]\n"); + printf("\n"); + printf(" N - is an integer > 0.\n"); + printf("\n"); + printf(" S - is a size specifier, an integer > 0 followed by a size indicator:\n"); + printf(" K - Kilobyte (%d)\n", ONE_KB); + printf(" M - Megabyte (%d)\n", ONE_MB); + printf(" G - Gigabyte (%d)\n", ONE_GB); + printf("\n"); + printf(" Example: '37M' is 37 megabytes or %d bytes\n", 37 * ONE_MB); + printf("\n"); + printf(" AL - is an API list. Valid values are:\n"); + printf(" hdf5 - HDF5\n"); + printf(" posix - POSIX\n"); + printf("\n"); + printf(" Example: -A posix,hdf5\n"); + printf("\n"); + printf(" NL - is list of integers (N) separated by commas.\n"); + printf("\n"); + printf(" Example: 1,2,3\n"); + printf("\n"); + printf(" SL - is list of size specifiers (S) separated by commas.\n"); + printf("\n"); + printf(" Example: 2K,2K,3K\n"); + printf("\n"); + printf(" The example defines an object (dataset, transfer buffer) with three\n"); + printf(" dimensions. Be aware that as the number of dimensions increases, the\n"); + printf(" the total size of the object increases exponentially.\n"); + printf("\n"); + printf(" VFD - is an HDF5 file driver specifier. Valid values are:\n"); + printf(" sec2, stdio, core, split, multi, family, direct\n"); + printf("\n"); + printf(" Dimension access order:\n"); + printf(" Data access starts at the cardinal origin of the dataset using the\n"); + printf(" transfer buffer. The next access occurs on a dataset region next to\n"); + printf(" the previous one. For a multidimensional dataset, there are several\n"); + printf(" directions as to where to proceed. This can be specified in the dimension\n"); + printf(" access order. For example, -r 1,2 states that the tool should traverse\n"); + printf(" dimension 1 first, and then dimension 2.\n"); + printf("\n"); + printf(" Environment variables:\n"); + printf(" HDF5_NOCLEANUP Do not remove data files if set [default remove]\n"); + printf(" HDF5_PREFIX Data file prefix\n"); + printf("\n"); HDfflush(stdout); } /* end usage() */ diff --git a/tools/src/h5repack/h5repack.c b/tools/src/h5repack/h5repack.c index 0bb0082..5c95b06 100644 --- a/tools/src/h5repack/h5repack.c +++ b/tools/src/h5repack/h5repack.c @@ -532,9 +532,9 @@ copy_attr(hid_t loc_in, hid_t loc_out, named_dt_t **named_dt_head_p, trav_table_ if (options->verbose > 0) { if (options->verbose == 2) - HDprintf(FORMAT_OBJ_ATTR_TIME, "attr", read_time, write_time, name); + printf(FORMAT_OBJ_ATTR_TIME, "attr", read_time, write_time, name); else - HDprintf(FORMAT_OBJ_ATTR, "attr", name); + printf(FORMAT_OBJ_ATTR, "attr", name); } /*--------------------------------------------------------------------- @@ -602,7 +602,7 @@ check_options(pack_opt_t *options) */ if (options->verbose > 0 && have_request(options)) { if (options->all_layout == 1) { - HDprintf("All objects to modify layout are...\n"); + printf("All objects to modify layout are...\n"); switch (options->layout_g) { case H5D_COMPACT: strcpy(slayout, "compact"); @@ -624,17 +624,17 @@ check_options(pack_opt_t *options) strcpy(slayout, "invalid layout\n"); H5TOOLS_GOTO_DONE((-1)); } - HDprintf(" Apply %s layout to all", slayout); + printf(" Apply %s layout to all", slayout); if (H5D_CHUNKED == options->layout_g) { - HDprintf("with dimension [ "); + printf("with dimension [ "); for (j = 0; j < options->chunk_g.rank; j++) - HDprintf("%d ", (int)options->chunk_g.chunk_lengths[j]); - HDprintf("]"); + printf("%d ", (int)options->chunk_g.chunk_lengths[j]); + printf("]"); } - HDprintf("\n"); + printf("\n"); } else - HDprintf("No all objects to modify layout\n"); + printf("No all objects to modify layout\n"); } /* end if verbose */ for (i = 0; i < options->op_tbl->nelems; i++) { @@ -642,16 +642,16 @@ check_options(pack_opt_t *options) if (options->op_tbl->objs[i].chunk.rank > 0) { if (options->verbose > 0) { - HDprintf(" <%s> with chunk size ", name); + printf(" <%s> with chunk size ", name); for (k = 0; k < options->op_tbl->objs[i].chunk.rank; k++) - HDprintf("%d ", (int)options->op_tbl->objs[i].chunk.chunk_lengths[k]); - HDprintf("\n"); + printf("%d ", (int)options->op_tbl->objs[i].chunk.chunk_lengths[k]); + printf("\n"); } has_ck = 1; } else if (options->op_tbl->objs[i].chunk.rank == -2) { /* TODO: replace 'magic number' */ if (options->verbose > 0) - HDprintf(" <%s> %s\n", name, "NONE (contiguous)"); + printf(" <%s> %s\n", name, "NONE (contiguous)"); has_ck = 1; } } /* end for each object in options */ @@ -666,34 +666,34 @@ check_options(pack_opt_t *options) if (options->verbose > 0 && have_request(options)) { if (options->all_filter == 1) { - HDprintf("All objects to apply filter are...\n"); + printf("All objects to apply filter are...\n"); for (k = 0; k < options->n_filter_g; k++) { H5Z_filter_t filtn = options->filter_g[k].filtn; if (filtn < 0) { - HDprintf(" Unknown\n"); + printf(" Unknown\n"); continue; } switch (filtn) { case H5Z_FILTER_NONE: - HDprintf(" Uncompress all\n"); + printf(" Uncompress all\n"); break; case H5Z_FILTER_SHUFFLE: case H5Z_FILTER_FLETCHER32: - HDprintf(" All with %s\n", get_sfilter(filtn)); + printf(" All with %s\n", get_sfilter(filtn)); break; case H5Z_FILTER_SZIP: case H5Z_FILTER_DEFLATE: - HDprintf(" All with %s, parameter %d\n", get_sfilter(filtn), - options->filter_g[k].cd_values[0]); + printf(" All with %s, parameter %d\n", get_sfilter(filtn), + options->filter_g[k].cd_values[0]); break; default: - HDprintf(" User Defined %d\n", filtn); + printf(" User Defined %d\n", filtn); break; } /* end switch */ } /* end for each filter */ } /* end if options->all_filter == 1 (TODO: meaning) */ else - HDprintf("No all objects to apply filter\n"); + printf("No all objects to apply filter\n"); } /* end if verbose */ for (i = 0; i < options->op_tbl->nelems; i++) { @@ -704,11 +704,11 @@ check_options(pack_opt_t *options) if (options->verbose > 0) { if (pack.filter[j].filtn >= 0) { if (pack.filter[j].filtn > H5Z_FILTER_SCALEOFFSET) { - HDprintf(" <%s> with %s filter %d\n", name, get_sfilter(pack.filter[j].filtn), - pack.filter[j].filtn); + printf(" <%s> with %s filter %d\n", name, get_sfilter(pack.filter[j].filtn), + pack.filter[j].filtn); } else { - HDprintf(" <%s> with %s filter\n", name, get_sfilter(pack.filter[j].filtn)); + printf(" <%s> with %s filter\n", name, get_sfilter(pack.filter[j].filtn)); } } } @@ -740,8 +740,8 @@ check_options(pack_opt_t *options) */ if (options->ublock_filename != NULL && options->ublock_size == 0) { if (options->verbose > 0) { - HDprintf("Warning: user block size missing for file %s. Assigning a default size of 1024...\n", - options->ublock_filename); + printf("Warning: user block size missing for file %s. Assigning a default size of 1024...\n", + options->ublock_filename); options->ublock_size = 1024; } } @@ -813,21 +813,21 @@ check_objects(const char *fname, pack_opt_t *options) */ if (options->verbose > 0) - HDprintf("Opening file. Searching %zu objects to modify ...\n", travt->nobjs); + printf("Opening file. Searching %zu objects to modify ...\n", travt->nobjs); for (i = 0; i < options->op_tbl->nelems; i++) { pack_info_t obj = options->op_tbl->objs[i]; char *name = obj.path; if (options->verbose > 0) - HDprintf(" <%s>", name); + printf(" <%s>", name); /* the input object names are present in the file and are valid */ if (h5trav_getindext(name, travt) < 0) H5TOOLS_GOTO_ERROR((-1), "%s Could not find <%s> in file <%s>. Exiting...\n", (options->verbose > 0 ? "\n" : ""), name, fname); if (options->verbose > 0) - HDprintf("...Found\n"); + printf("...Found\n"); for (ifil = 0; ifil < obj.nfilters; ifil++) { if (obj.filter[ifil].filtn < 0) @@ -866,7 +866,7 @@ check_objects(const char *fname, pack_opt_t *options) } if (csize < ppb) { - HDprintf(" <warning: SZIP settings, chunk size is smaller than pixels per block>\n"); + printf(" <warning: SZIP settings, chunk size is smaller than pixels per block>\n"); H5TOOLS_GOTO_DONE(0); } } /* end case SZIP */ diff --git a/tools/src/h5repack/h5repack_copy.c b/tools/src/h5repack/h5repack_copy.c index 59dc59e..8b11974 100644 --- a/tools/src/h5repack/h5repack_copy.c +++ b/tools/src/h5repack/h5repack_copy.c @@ -299,7 +299,7 @@ copy_objects(const char *fnamein, const char *fnameout, pack_opt_t *options) *------------------------------------------------------------------------- */ if (options->verbose > 0) - HDprintf("Making new file ...\n"); + printf("Making new file ...\n"); if ((fidout = H5Fcreate(fnameout, H5F_ACC_TRUNC, fcpl, options->fout_fapl)) < 0) H5TOOLS_GOTO_ERROR((-1), "H5Fcreate could not create file <%s>:", fnameout); @@ -667,14 +667,14 @@ do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti if (options->verbose > 0) { if (options->verbose == 2) { - HDprintf("-----------------------------------------------------------------\n"); - HDprintf(" Type Filter (Compression) Timing read/write Name\n"); - HDprintf("-----------------------------------------------------------------\n"); + printf("-----------------------------------------------------------------\n"); + printf(" Type Filter (Compression) Timing read/write Name\n"); + printf("-----------------------------------------------------------------\n"); } else { - HDprintf("-----------------------------------------\n"); - HDprintf(" Type Filter (Compression) Name\n"); - HDprintf("-----------------------------------------\n"); + printf("-----------------------------------------\n"); + printf(" Type Filter (Compression) Name\n"); + printf("-----------------------------------------\n"); } } @@ -695,9 +695,9 @@ do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti case H5TRAV_TYPE_GROUP: if (options->verbose > 0) { if (options->verbose == 2) - HDprintf(FORMAT_OBJ_NOTIME, "group", travt->objs[i].name); + printf(FORMAT_OBJ_NOTIME, "group", travt->objs[i].name); else - HDprintf(FORMAT_OBJ, "group", travt->objs[i].name); + printf(FORMAT_OBJ, "group", travt->objs[i].name); } /* open input group */ @@ -991,9 +991,9 @@ do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti if (dset_out == H5I_INVALID_HID) { H5TOOLS_INFO("H5Dcreate2 failed"); if (options->verbose > 0) - HDprintf(" warning: could not create dataset <%s>. Applying original " - "settings\n", - travt->objs[i].name); + printf(" warning: could not create dataset <%s>. Applying original " + "settings\n", + travt->objs[i].name); if ((dset_out = H5Dcreate2(fidout, travt->objs[i].name, wtype_id, f_space_id, @@ -1221,13 +1221,13 @@ do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti * (in case there was a filter) */ if (has_filter && apply_s == 0) - HDprintf(" <warning: filter not applied to %s. dataset smaller than " - "%d bytes>\n", - travt->objs[i].name, (int)options->min_comp); + printf(" <warning: filter not applied to %s. dataset smaller than " + "%d bytes>\n", + travt->objs[i].name, (int)options->min_comp); if (has_filter && apply_f == 0) - HDprintf(" <warning: could not apply the filter to %s>\n", - travt->objs[i].name); + printf(" <warning: could not apply the filter to %s>\n", + travt->objs[i].name); } /* end if verbose (print compression) */ /*------------------------------------------------------------------------- @@ -1310,9 +1310,9 @@ do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti if (options->verbose > 0) { if (options->verbose == 2) - HDprintf(FORMAT_OBJ_TIME, "dset", 0.0, write_time, travt->objs[i].name); + printf(FORMAT_OBJ_TIME, "dset", 0.0, write_time, travt->objs[i].name); else - HDprintf(FORMAT_OBJ, "dset", travt->objs[i].name); + printf(FORMAT_OBJ, "dset", travt->objs[i].name); } } /* end whether we have request for filter/chunking */ @@ -1327,9 +1327,9 @@ do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti case H5TRAV_TYPE_NAMED_DATATYPE: if (options->verbose > 0) { if (options->verbose == 2) - HDprintf(FORMAT_OBJ_NOTIME, "type", travt->objs[i].name); + printf(FORMAT_OBJ_NOTIME, "type", travt->objs[i].name); else - HDprintf(FORMAT_OBJ, "type", travt->objs[i].name); + printf(FORMAT_OBJ, "type", travt->objs[i].name); } if ((type_in = H5Topen2(fidin, travt->objs[i].name, H5P_DEFAULT)) < 0) @@ -1371,9 +1371,9 @@ do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti case H5TRAV_TYPE_UDLINK: if (options->verbose > 0) { if (options->verbose == 2) - HDprintf(FORMAT_OBJ_NOTIME, "link", travt->objs[i].name); + printf(FORMAT_OBJ_NOTIME, "link", travt->objs[i].name); else - HDprintf(FORMAT_OBJ, "link", travt->objs[i].name); + printf(FORMAT_OBJ, "link", travt->objs[i].name); } /* Check -X option. */ @@ -1381,7 +1381,7 @@ do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti if (H5tools_get_symlink_info(fidin, travt->objs[i].name, &linkinfo, 1) == 0) { /* dangling link */ if (options->prune) { - HDprintf("Pruned %s.\n", travt->objs[i].name); + printf("Pruned %s.\n", travt->objs[i].name); } else { if (H5Lcopy(fidin, travt->objs[i].name, fidout, travt->objs[i].name, @@ -1426,7 +1426,7 @@ do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti } /* options->merge */ else { if (options->prune) { - HDprintf("Pruned %s.\n", travt->objs[i].name); + printf("Pruned %s.\n", travt->objs[i].name); } else { if (H5Lcopy(fidin, travt->objs[i].name, fidout, travt->objs[i].name, H5P_DEFAULT, @@ -1589,9 +1589,9 @@ print_dataset_info(hid_t dcpl_id, char *objname, double ratio, int pr, pack_opt_ if (!pr) if (options->verbose == 2) - HDprintf(FORMAT_OBJ_TIME, "dset", read_time, write_time, objname); + printf(FORMAT_OBJ_TIME, "dset", read_time, write_time, objname); else - HDprintf(FORMAT_OBJ, "dset", objname); + printf(FORMAT_OBJ, "dset", objname); else { char str[512], temp[512]; @@ -1600,9 +1600,9 @@ print_dataset_info(hid_t dcpl_id, char *objname, double ratio, int pr, pack_opt_ HDsnprintf(temp, sizeof(temp), " (%.3f:1)", ratio); HDstrcat(str, temp); if (options->verbose == 2) - HDprintf(FORMAT_OBJ_TIME, str, read_time, write_time, objname); + printf(FORMAT_OBJ_TIME, str, read_time, write_time, objname); else - HDprintf(FORMAT_OBJ, str, objname); + printf(FORMAT_OBJ, str, objname); } } /* end print_dataset_info() */ @@ -1728,9 +1728,9 @@ print_user_block(const char *filename, hid_t fid) for (i = 0; i < nread; i++) { - HDprintf("%c ", rbuf[i]); + printf("%c ", rbuf[i]); } - HDprintf("\n"); + printf("\n"); if (nread < 0) { H5TOOLS_GOTO_ERROR((-1), "nread < 0"); diff --git a/tools/src/h5repack/h5repack_main.c b/tools/src/h5repack/h5repack_main.c index ca122e4..a164d6a 100644 --- a/tools/src/h5repack/h5repack_main.c +++ b/tools/src/h5repack/h5repack_main.c @@ -892,7 +892,7 @@ parse_command_line(int argc, const char *const *argv, pack_opt_t *options) errno = 0; onion_fa_in_g.revision_num = HDstrtoull(in_vfd_info.info, NULL, 10); if (errno == ERANGE) { - HDprintf("Invalid onion revision specified for the input file\n"); + printf("Invalid onion revision specified for the input file\n"); usage(h5tools_getprogname()); exit(EXIT_FAILURE); } @@ -976,14 +976,14 @@ main(int argc, char **argv) /* update hyperslab buffer size from H5TOOLS_BUFSIZE env if exist */ if (h5tools_getenv_update_hyperslab_bufsize() < 0) { - HDprintf("Error occurred while retrieving H5TOOLS_BUFSIZE value\n"); + printf("Error occurred while retrieving H5TOOLS_BUFSIZE value\n"); h5tools_setstatus(EXIT_FAILURE); goto done; } /* initialize options */ if (h5repack_init(&options, 0, FALSE) < 0) { - HDprintf("Error occurred while initializing repack options\n"); + printf("Error occurred while initializing repack options\n"); h5tools_setstatus(EXIT_FAILURE); goto done; } @@ -993,7 +993,7 @@ main(int argc, char **argv) parse_ret = parse_command_line(argc, (const char *const *)argv, &options); if (parse_ret < 0) { - HDprintf("Error occurred while parsing command-line options\n"); + printf("Error occurred while parsing command-line options\n"); h5tools_setstatus(EXIT_FAILURE); goto done; } @@ -1008,7 +1008,7 @@ main(int argc, char **argv) /* pack it */ if (h5repack(infile, outfile, &options) < 0) { - HDprintf("Error occurred while repacking\n"); + printf("Error occurred while repacking\n"); h5tools_setstatus(EXIT_FAILURE); goto done; } diff --git a/tools/src/h5repack/h5repack_refs.c b/tools/src/h5repack/h5repack_refs.c index 6bc4a31..a9a5fd3 100644 --- a/tools/src/h5repack/h5repack_refs.c +++ b/tools/src/h5repack/h5repack_refs.c @@ -154,7 +154,7 @@ do_copy_refobjs(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti if (nelmts) { buf = (hobj_ref_t *)HDmalloc((unsigned)(nelmts * msize)); if (buf == NULL) { - HDprintf("cannot read into memory\n"); + printf("cannot read into memory\n"); H5TOOLS_GOTO_ERROR((-1), "HDmalloc failed"); } /* end if */ if (H5Dread(dset_in, mtype_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) @@ -162,7 +162,7 @@ do_copy_refobjs(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti refbuf = (hobj_ref_t *)HDcalloc((unsigned)nelmts, msize); if (refbuf == NULL) { - HDprintf("cannot allocate memory\n"); + printf("cannot allocate memory\n"); H5TOOLS_GOTO_ERROR((-1), "HDcalloc failed"); } /* end if */ for (u = 0; u < nelmts; u++) { @@ -183,11 +183,11 @@ do_copy_refobjs(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti H5TOOLS_GOTO_ERROR((-1), "H5Rcreate failed"); if (options->verbose > 0) { if (options->verbose == 2) - HDprintf(FORMAT_OBJ_NOTIME, "dset", travt->objs[i].name); + printf(FORMAT_OBJ_NOTIME, "dset", travt->objs[i].name); else - HDprintf(FORMAT_OBJ, "dset", travt->objs[i].name); - HDprintf("object <%s> object reference created to <%s>\n", - travt->objs[i].name, refname); + printf(FORMAT_OBJ, "dset", travt->objs[i].name); + printf("object <%s> object reference created to <%s>\n", + travt->objs[i].name, refname); } } /*refname*/ if (H5Oclose(refobj_id) < 0) @@ -236,7 +236,7 @@ do_copy_refobjs(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti if (nelmts) { buf = (hdset_reg_ref_t *)HDmalloc((unsigned)(nelmts * msize)); if (buf == NULL) { - HDprintf("cannot read into memory\n"); + printf("cannot read into memory\n"); H5TOOLS_GOTO_ERROR((-1), "HDmalloc failed"); } /* end if */ if (H5Dread(dset_in, mtype_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) @@ -249,7 +249,7 @@ do_copy_refobjs(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti refbuf = (hdset_reg_ref_t *)HDcalloc(sizeof(hdset_reg_ref_t), (size_t)nelmts); /*init to zero */ if (refbuf == NULL) { - HDprintf("cannot allocate memory\n"); + printf("cannot allocate memory\n"); H5TOOLS_GOTO_ERROR((-1), "HDcalloc failed"); } /* end if */ @@ -279,9 +279,9 @@ do_copy_refobjs(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti if (H5Sclose(region_id) < 0) H5TOOLS_GOTO_ERROR((-1), "H5Sclose failed"); if (options->verbose > 0) { - HDprintf(FORMAT_OBJ, "dset", travt->objs[i].name); - HDprintf("object <%s> region reference created to <%s>\n", - travt->objs[i].name, refname); + printf(FORMAT_OBJ, "dset", travt->objs[i].name); + printf("object <%s> region reference created to <%s>\n", + travt->objs[i].name, refname); } } /*refname*/ if (H5Oclose(refobj_id) < 0) @@ -600,7 +600,7 @@ copy_refs_attr(hid_t loc_in, hid_t loc_out, trav_table_t *travt, hid_t fidout) / if ((is_ref || is_ref_array) && (H5R_OBJ_REF_BUF_SIZE == msize)) { buf = (hobj_ref_t *)HDmalloc((unsigned)(nelmts * msize)); if (buf == NULL) { - HDprintf("cannot read into memory\n"); + printf("cannot read into memory\n"); H5TOOLS_GOTO_ERROR((-1), "HDmalloc failed"); } /* end if */ if (H5Aread(attr_id, mtype_id, buf) < 0) @@ -608,7 +608,7 @@ copy_refs_attr(hid_t loc_in, hid_t loc_out, trav_table_t *travt, hid_t fidout) / refbuf = (hobj_ref_t *)HDcalloc((unsigned)nelmts, msize); if (refbuf == NULL) { - HDprintf("cannot allocate memory\n"); + printf("cannot allocate memory\n"); H5TOOLS_GOTO_ERROR((-1), "HDcalloc failed"); } /* end if */ @@ -622,7 +622,7 @@ copy_refs_attr(hid_t loc_in, hid_t loc_out, trav_table_t *travt, hid_t fidout) / buf = (hdset_reg_ref_t *)HDmalloc((unsigned)(nelmts * msize)); if (buf == NULL) { - HDprintf("cannot read into memory\n"); + printf("cannot read into memory\n"); H5TOOLS_GOTO_ERROR((-1), "HDmalloc failed"); } /* end if */ if (H5Aread(attr_id, mtype_id, buf) < 0) @@ -635,7 +635,7 @@ copy_refs_attr(hid_t loc_in, hid_t loc_out, trav_table_t *travt, hid_t fidout) / refbuf = (hdset_reg_ref_t *)HDcalloc(sizeof(hdset_reg_ref_t), (size_t)nelmts); /*init to zero */ if (refbuf == NULL) { - HDprintf("cannot allocate memory\n"); + printf("cannot allocate memory\n"); H5TOOLS_GOTO_ERROR((-1), "HDcalloc failed"); } /* end if */ @@ -651,7 +651,7 @@ copy_refs_attr(hid_t loc_in, hid_t loc_out, trav_table_t *travt, hid_t fidout) / refbuf = buf; /* reuse the read buffer for write */ if (buf == NULL) { - HDprintf("cannot read into memory\n"); + printf("cannot read into memory\n"); H5TOOLS_GOTO_ERROR((-1), "HDmalloc failed"); } /* end if */ @@ -693,7 +693,7 @@ copy_refs_attr(hid_t loc_in, hid_t loc_out, trav_table_t *travt, hid_t fidout) / refbuf = buf; /* reuse the read buffer for write */ if (buf == NULL) { - HDprintf("cannot read into memory\n"); + printf("cannot read into memory\n"); H5TOOLS_GOTO_ERROR((-1), "HDmalloc failed"); } /* end if */ diff --git a/tools/src/h5stat/h5stat.c b/tools/src/h5stat/h5stat.c index 021529e..9da6ba2 100644 --- a/tools/src/h5stat/h5stat.c +++ b/tools/src/h5stat/h5stat.c @@ -208,45 +208,44 @@ static void usage(const char *prog) { HDfflush(stdout); - HDfprintf(stdout, "usage: %s [OPTIONS] file\n", prog); - HDfprintf(stdout, "\n"); - HDfprintf(stdout, " ERROR\n"); - HDfprintf(stdout, " --enable-error-stack Prints messages from the HDF5 error stack as they occur\n"); - HDfprintf(stdout, " Optional value 2 also prints file open errors\n"); - HDfprintf(stdout, " OPTIONS\n"); - HDfprintf(stdout, " -h, --help Print a usage message and exit\n"); - HDfprintf(stdout, " -V, --version Print version number and exit\n"); - HDfprintf(stdout, " -f, --file Print file information\n"); - HDfprintf(stdout, " -F, --filemetadata Print file space information for file's metadata\n"); - HDfprintf(stdout, " -g, --group Print group information\n"); - HDfprintf(stdout, " -l N, --links=N Set the threshold for the # of links when printing\n"); - HDfprintf(stdout, " information for small groups. N is an integer greater\n"); - HDfprintf(stdout, " than 0. The default threshold is 10.\n"); - HDfprintf(stdout, " -G, --groupmetadata Print file space information for groups' metadata\n"); - HDfprintf(stdout, " -d, --dset Print dataset information\n"); - HDfprintf(stdout, " -m N, --dims=N Set the threshold for the dimension sizes when printing\n"); - HDfprintf(stdout, - " information for small datasets. N is an integer greater\n"); - HDfprintf(stdout, " than 0. The default threshold is 10.\n"); - HDfprintf(stdout, " -D, --dsetmetadata Print file space information for datasets' metadata\n"); - HDfprintf(stdout, " -T, --dtypemetadata Print datasets' datatype information\n"); - HDfprintf(stdout, " -A, --attribute Print attribute information\n"); - HDfprintf(stdout, " -a N, --numattrs=N Set the threshold for the # of attributes when printing\n"); - HDfprintf(stdout, - " information for small # of attributes. N is an integer greater\n"); - HDfprintf(stdout, " than 0. The default threshold is 10.\n"); - HDfprintf(stdout, " -s, --freespace Print free space information\n"); - HDfprintf(stdout, " -S, --summary Print summary of file space information\n"); - HDfprintf(stdout, " --s3-cred=<cred> Access file on S3, using provided credential\n"); - HDfprintf(stdout, " <cred> :: (region,id,key)\n"); - HDfprintf(stdout, " If <cred> == \"(,,)\", no authentication is used.\n"); - HDfprintf(stdout, " --hdfs-attrs=<attrs> Access a file on HDFS with given configuration\n"); - HDfprintf(stdout, " attributes.\n"); - HDfprintf(stdout, " <attrs> :: (<namenode name>,<namenode port>,\n"); - HDfprintf(stdout, " <kerberos cache path>,<username>,\n"); - HDfprintf(stdout, " <buffer size>)\n"); - HDfprintf(stdout, " If an attribute is empty, a default value will be\n"); - HDfprintf(stdout, " used.\n"); + fprintf(stdout, "usage: %s [OPTIONS] file\n", prog); + fprintf(stdout, "\n"); + fprintf(stdout, " ERROR\n"); + fprintf(stdout, " --enable-error-stack Prints messages from the HDF5 error stack as they occur\n"); + fprintf(stdout, " Optional value 2 also prints file open errors\n"); + fprintf(stdout, " OPTIONS\n"); + fprintf(stdout, " -h, --help Print a usage message and exit\n"); + fprintf(stdout, " -V, --version Print version number and exit\n"); + fprintf(stdout, " -f, --file Print file information\n"); + fprintf(stdout, " -F, --filemetadata Print file space information for file's metadata\n"); + fprintf(stdout, " -g, --group Print group information\n"); + fprintf(stdout, " -l N, --links=N Set the threshold for the # of links when printing\n"); + fprintf(stdout, " information for small groups. N is an integer greater\n"); + fprintf(stdout, " than 0. The default threshold is 10.\n"); + fprintf(stdout, " -G, --groupmetadata Print file space information for groups' metadata\n"); + fprintf(stdout, " -d, --dset Print dataset information\n"); + fprintf(stdout, " -m N, --dims=N Set the threshold for the dimension sizes when printing\n"); + fprintf(stdout, " information for small datasets. N is an integer greater\n"); + fprintf(stdout, " than 0. The default threshold is 10.\n"); + fprintf(stdout, " -D, --dsetmetadata Print file space information for datasets' metadata\n"); + fprintf(stdout, " -T, --dtypemetadata Print datasets' datatype information\n"); + fprintf(stdout, " -A, --attribute Print attribute information\n"); + fprintf(stdout, " -a N, --numattrs=N Set the threshold for the # of attributes when printing\n"); + fprintf(stdout, + " information for small # of attributes. N is an integer greater\n"); + fprintf(stdout, " than 0. The default threshold is 10.\n"); + fprintf(stdout, " -s, --freespace Print free space information\n"); + fprintf(stdout, " -S, --summary Print summary of file space information\n"); + fprintf(stdout, " --s3-cred=<cred> Access file on S3, using provided credential\n"); + fprintf(stdout, " <cred> :: (region,id,key)\n"); + fprintf(stdout, " If <cred> == \"(,,)\", no authentication is used.\n"); + fprintf(stdout, " --hdfs-attrs=<attrs> Access a file on HDFS with given configuration\n"); + fprintf(stdout, " attributes.\n"); + fprintf(stdout, " <attrs> :: (<namenode name>,<namenode port>,\n"); + fprintf(stdout, " <kerberos cache path>,<username>,\n"); + fprintf(stdout, " <buffer size>)\n"); + fprintf(stdout, " If an attribute is empty, a default value will be\n"); + fprintf(stdout, " used.\n"); } /*------------------------------------------------------------------------- @@ -1096,14 +1095,14 @@ iter_free(iter_t *iter) static herr_t print_file_info(const iter_t *iter) { - HDprintf("File information\n"); - HDprintf("\t# of unique groups: %lu\n", iter->uniq_groups); - HDprintf("\t# of unique datasets: %lu\n", iter->uniq_dsets); - HDprintf("\t# of unique named datatypes: %lu\n", iter->uniq_dtypes); - HDprintf("\t# of unique links: %lu\n", iter->uniq_links); - HDprintf("\t# of unique other: %lu\n", iter->uniq_others); - HDprintf("\tMax. # of links to object: %lu\n", iter->max_links); - HDfprintf(stdout, "\tMax. # of objects in group: %" PRIuHSIZE "\n", iter->max_fanout); + printf("File information\n"); + printf("\t# of unique groups: %lu\n", iter->uniq_groups); + printf("\t# of unique datasets: %lu\n", iter->uniq_dsets); + printf("\t# of unique named datatypes: %lu\n", iter->uniq_dtypes); + printf("\t# of unique links: %lu\n", iter->uniq_links); + printf("\t# of unique other: %lu\n", iter->uniq_others); + printf("\tMax. # of links to object: %lu\n", iter->max_links); + fprintf(stdout, "\tMax. # of objects in group: %" PRIuHSIZE "\n", iter->max_fanout); return 0; } /* print_file_info() */ @@ -1125,41 +1124,41 @@ print_file_info(const iter_t *iter) static herr_t print_file_metadata(const iter_t *iter) { - HDfprintf(stdout, "File space information for file metadata (in bytes):\n"); - HDfprintf(stdout, "\tSuperblock: %" PRIuHSIZE "\n", iter->super_size); - HDfprintf(stdout, "\tSuperblock extension: %" PRIuHSIZE "\n", iter->super_ext_size); - HDfprintf(stdout, "\tUser block: %" PRIuHSIZE "\n", iter->ublk_size); - - HDfprintf(stdout, "\tObject headers: (total/unused)\n"); - HDfprintf(stdout, "\t\tGroups: %" PRIuHSIZE "/%" PRIuHSIZE "\n", iter->group_ohdr_info.total_size, - iter->group_ohdr_info.free_size); - HDfprintf(stdout, "\t\tDatasets(exclude compact data): %" PRIuHSIZE "/%" PRIuHSIZE "\n", - iter->dset_ohdr_info.total_size, iter->dset_ohdr_info.free_size); - HDfprintf(stdout, "\t\tDatatypes: %" PRIuHSIZE "/%" PRIuHSIZE "\n", iter->dtype_ohdr_info.total_size, - iter->dtype_ohdr_info.free_size); - - HDfprintf(stdout, "\tGroups:\n"); - HDfprintf(stdout, "\t\tB-tree/List: %" PRIuHSIZE "\n", iter->groups_btree_storage_size); - HDfprintf(stdout, "\t\tHeap: %" PRIuHSIZE "\n", iter->groups_heap_storage_size); - - HDfprintf(stdout, "\tAttributes:\n"); - HDfprintf(stdout, "\t\tB-tree/List: %" PRIuHSIZE "\n", iter->attrs_btree_storage_size); - HDfprintf(stdout, "\t\tHeap: %" PRIuHSIZE "\n", iter->attrs_heap_storage_size); - - HDfprintf(stdout, "\tChunked datasets:\n"); - HDfprintf(stdout, "\t\tIndex: %" PRIuHSIZE "\n", iter->datasets_index_storage_size); - - HDfprintf(stdout, "\tDatasets:\n"); - HDfprintf(stdout, "\t\tHeap: %" PRIuHSIZE "\n", iter->datasets_heap_storage_size); - - HDfprintf(stdout, "\tShared Messages:\n"); - HDfprintf(stdout, "\t\tHeader: %" PRIuHSIZE "\n", iter->SM_hdr_storage_size); - HDfprintf(stdout, "\t\tB-tree/List: %" PRIuHSIZE "\n", iter->SM_index_storage_size); - HDfprintf(stdout, "\t\tHeap: %" PRIuHSIZE "\n", iter->SM_heap_storage_size); - - HDfprintf(stdout, "\tFree-space managers:\n"); - HDfprintf(stdout, "\t\tHeader: %" PRIuHSIZE "\n", iter->free_hdr); - HDfprintf(stdout, "\t\tAmount of free space: %" PRIuHSIZE "\n", iter->free_space); + fprintf(stdout, "File space information for file metadata (in bytes):\n"); + fprintf(stdout, "\tSuperblock: %" PRIuHSIZE "\n", iter->super_size); + fprintf(stdout, "\tSuperblock extension: %" PRIuHSIZE "\n", iter->super_ext_size); + fprintf(stdout, "\tUser block: %" PRIuHSIZE "\n", iter->ublk_size); + + fprintf(stdout, "\tObject headers: (total/unused)\n"); + fprintf(stdout, "\t\tGroups: %" PRIuHSIZE "/%" PRIuHSIZE "\n", iter->group_ohdr_info.total_size, + iter->group_ohdr_info.free_size); + fprintf(stdout, "\t\tDatasets(exclude compact data): %" PRIuHSIZE "/%" PRIuHSIZE "\n", + iter->dset_ohdr_info.total_size, iter->dset_ohdr_info.free_size); + fprintf(stdout, "\t\tDatatypes: %" PRIuHSIZE "/%" PRIuHSIZE "\n", iter->dtype_ohdr_info.total_size, + iter->dtype_ohdr_info.free_size); + + fprintf(stdout, "\tGroups:\n"); + fprintf(stdout, "\t\tB-tree/List: %" PRIuHSIZE "\n", iter->groups_btree_storage_size); + fprintf(stdout, "\t\tHeap: %" PRIuHSIZE "\n", iter->groups_heap_storage_size); + + fprintf(stdout, "\tAttributes:\n"); + fprintf(stdout, "\t\tB-tree/List: %" PRIuHSIZE "\n", iter->attrs_btree_storage_size); + fprintf(stdout, "\t\tHeap: %" PRIuHSIZE "\n", iter->attrs_heap_storage_size); + + fprintf(stdout, "\tChunked datasets:\n"); + fprintf(stdout, "\t\tIndex: %" PRIuHSIZE "\n", iter->datasets_index_storage_size); + + fprintf(stdout, "\tDatasets:\n"); + fprintf(stdout, "\t\tHeap: %" PRIuHSIZE "\n", iter->datasets_heap_storage_size); + + fprintf(stdout, "\tShared Messages:\n"); + fprintf(stdout, "\t\tHeader: %" PRIuHSIZE "\n", iter->SM_hdr_storage_size); + fprintf(stdout, "\t\tB-tree/List: %" PRIuHSIZE "\n", iter->SM_index_storage_size); + fprintf(stdout, "\t\tHeap: %" PRIuHSIZE "\n", iter->SM_heap_storage_size); + + fprintf(stdout, "\tFree-space managers:\n"); + fprintf(stdout, "\t\tHeader: %" PRIuHSIZE "\n", iter->free_hdr); + fprintf(stdout, "\t\tAmount of free space: %" PRIuHSIZE "\n", iter->free_space); return 0; } /* print_file_metadata() */ @@ -1185,32 +1184,31 @@ print_group_info(const iter_t *iter) unsigned long total; /* Total count for various statistics */ unsigned u; /* Local index variable */ - HDprintf("Small groups (with 0 to %u links):\n", sgroups_threshold - 1); + printf("Small groups (with 0 to %u links):\n", sgroups_threshold - 1); total = 0; for (u = 0; u < (unsigned)sgroups_threshold; u++) { if (iter->num_small_groups[u] > 0) { - HDprintf("\t# of groups with %u link(s): %lu\n", u, iter->num_small_groups[u]); + printf("\t# of groups with %u link(s): %lu\n", u, iter->num_small_groups[u]); total += iter->num_small_groups[u]; } /* end if */ } /* end for */ - HDprintf("\tTotal # of small groups: %lu\n", total); + printf("\tTotal # of small groups: %lu\n", total); - HDprintf("Group bins:\n"); + printf("Group bins:\n"); total = 0; if ((iter->group_nbins > 0) && (iter->group_bins[0] > 0)) { - HDprintf("\t# of groups with 0 link: %lu\n", iter->group_bins[0]); + printf("\t# of groups with 0 link: %lu\n", iter->group_bins[0]); total = iter->group_bins[0]; } /* end if */ power = 1; for (u = 1; u < iter->group_nbins; u++) { if (iter->group_bins[u] > 0) { - HDprintf("\t# of groups with %lu - %lu links: %lu\n", power, (power * 10) - 1, - iter->group_bins[u]); + printf("\t# of groups with %lu - %lu links: %lu\n", power, (power * 10) - 1, iter->group_bins[u]); total += iter->group_bins[u]; } /* end if */ power *= 10; } /* end for */ - HDprintf("\tTotal # of groups: %lu\n", total); + printf("\tTotal # of groups: %lu\n", total); return 0; } /* print_group_info() */ @@ -1230,13 +1228,13 @@ print_group_info(const iter_t *iter) static herr_t print_group_metadata(const iter_t *iter) { - HDprintf("File space information for groups' metadata (in bytes):\n"); + printf("File space information for groups' metadata (in bytes):\n"); - HDfprintf(stdout, "\tObject headers (total/unused): %" PRIuHSIZE "/%" PRIuHSIZE "\n", - iter->group_ohdr_info.total_size, iter->group_ohdr_info.free_size); + fprintf(stdout, "\tObject headers (total/unused): %" PRIuHSIZE "/%" PRIuHSIZE "\n", + iter->group_ohdr_info.total_size, iter->group_ohdr_info.free_size); - HDfprintf(stdout, "\tB-tree/List: %" PRIuHSIZE "\n", iter->groups_btree_storage_size); - HDfprintf(stdout, "\tHeap: %" PRIuHSIZE "\n", iter->groups_heap_storage_size); + fprintf(stdout, "\tB-tree/List: %" PRIuHSIZE "\n", iter->groups_btree_storage_size); + fprintf(stdout, "\tHeap: %" PRIuHSIZE "\n", iter->groups_heap_storage_size); return 0; } /* print_group_metadata() */ @@ -1262,69 +1260,68 @@ print_dataset_info(const iter_t *iter) unsigned u; /* Local index variable */ if (iter->uniq_dsets > 0) { - HDprintf("Dataset dimension information:\n"); - HDprintf("\tMax. rank of datasets: %u\n", iter->max_dset_rank); - HDprintf("\tDataset ranks:\n"); + printf("Dataset dimension information:\n"); + printf("\tMax. rank of datasets: %u\n", iter->max_dset_rank); + printf("\tDataset ranks:\n"); for (u = 0; u < H5S_MAX_RANK; u++) if (iter->dset_rank_count[u] > 0) - HDprintf("\t\t# of dataset with rank %u: %lu\n", u, iter->dset_rank_count[u]); + printf("\t\t# of dataset with rank %u: %lu\n", u, iter->dset_rank_count[u]); - HDprintf("1-D Dataset information:\n"); - HDfprintf(stdout, "\tMax. dimension size of 1-D datasets: %" PRIuHSIZE "\n", iter->max_dset_dims); - HDprintf("\tSmall 1-D datasets (with dimension sizes 0 to %u):\n", sdsets_threshold - 1); + printf("1-D Dataset information:\n"); + fprintf(stdout, "\tMax. dimension size of 1-D datasets: %" PRIuHSIZE "\n", iter->max_dset_dims); + printf("\tSmall 1-D datasets (with dimension sizes 0 to %u):\n", sdsets_threshold - 1); total = 0; for (u = 0; u < (unsigned)sdsets_threshold; u++) { if (iter->small_dset_dims[u] > 0) { - HDprintf("\t\t# of datasets with dimension sizes %u: %lu\n", u, iter->small_dset_dims[u]); + printf("\t\t# of datasets with dimension sizes %u: %lu\n", u, iter->small_dset_dims[u]); total += iter->small_dset_dims[u]; } /* end if */ } /* end for */ - HDprintf("\t\tTotal # of small datasets: %lu\n", total); + printf("\t\tTotal # of small datasets: %lu\n", total); /* Protect against no datasets in file */ if (iter->dset_dim_nbins > 0) { - HDprintf("\t1-D Dataset dimension bins:\n"); + printf("\t1-D Dataset dimension bins:\n"); total = 0; if (iter->dset_dim_bins[0] > 0) { - HDprintf("\t\t# of datasets with dimension size 0: %lu\n", iter->dset_dim_bins[0]); + printf("\t\t# of datasets with dimension size 0: %lu\n", iter->dset_dim_bins[0]); total = iter->dset_dim_bins[0]; } /* end if */ power = 1; for (u = 1; u < iter->dset_dim_nbins; u++) { if (iter->dset_dim_bins[u] > 0) { - HDprintf("\t\t# of datasets with dimension size %lu - %lu: %lu\n", power, - (power * 10) - 1, iter->dset_dim_bins[u]); + printf("\t\t# of datasets with dimension size %lu - %lu: %lu\n", power, (power * 10) - 1, + iter->dset_dim_bins[u]); total += iter->dset_dim_bins[u]; } /* end if */ power *= 10; } /* end for */ - HDprintf("\t\tTotal # of datasets: %lu\n", total); + printf("\t\tTotal # of datasets: %lu\n", total); } /* end if */ - HDprintf("Dataset storage information:\n"); - HDfprintf(stdout, "\tTotal raw data size: %" PRIuHSIZE "\n", iter->dset_storage_size); - HDfprintf(stdout, "\tTotal external raw data size: %" PRIuHSIZE "\n", - iter->dset_external_storage_size); + printf("Dataset storage information:\n"); + fprintf(stdout, "\tTotal raw data size: %" PRIuHSIZE "\n", iter->dset_storage_size); + fprintf(stdout, "\tTotal external raw data size: %" PRIuHSIZE "\n", iter->dset_external_storage_size); - HDprintf("Dataset layout information:\n"); + printf("Dataset layout information:\n"); for (u = 0; u < H5D_NLAYOUTS; u++) - HDprintf("\tDataset layout counts[%s]: %lu\n", - (u == H5D_COMPACT - ? "COMPACT" - : (u == H5D_CONTIGUOUS ? "CONTIG" : (u == H5D_CHUNKED ? "CHUNKED" : "VIRTUAL"))), - iter->dset_layouts[u]); - HDprintf("\tNumber of external files : %lu\n", iter->nexternal); - - HDprintf("Dataset filters information:\n"); - HDprintf("\tNumber of datasets with:\n"); - HDprintf("\t\tNO filter: %lu\n", iter->dset_comptype[H5Z_FILTER_ERROR + 1]); - HDprintf("\t\tGZIP filter: %lu\n", iter->dset_comptype[H5Z_FILTER_DEFLATE]); - HDprintf("\t\tSHUFFLE filter: %lu\n", iter->dset_comptype[H5Z_FILTER_SHUFFLE]); - HDprintf("\t\tFLETCHER32 filter: %lu\n", iter->dset_comptype[H5Z_FILTER_FLETCHER32]); - HDprintf("\t\tSZIP filter: %lu\n", iter->dset_comptype[H5Z_FILTER_SZIP]); - HDprintf("\t\tNBIT filter: %lu\n", iter->dset_comptype[H5Z_FILTER_NBIT]); - HDprintf("\t\tSCALEOFFSET filter: %lu\n", iter->dset_comptype[H5Z_FILTER_SCALEOFFSET]); - HDprintf("\t\tUSER-DEFINED filter: %lu\n", iter->dset_comptype[H5_NFILTERS_IMPL - 1]); + printf("\tDataset layout counts[%s]: %lu\n", + (u == H5D_COMPACT + ? "COMPACT" + : (u == H5D_CONTIGUOUS ? "CONTIG" : (u == H5D_CHUNKED ? "CHUNKED" : "VIRTUAL"))), + iter->dset_layouts[u]); + printf("\tNumber of external files : %lu\n", iter->nexternal); + + printf("Dataset filters information:\n"); + printf("\tNumber of datasets with:\n"); + printf("\t\tNO filter: %lu\n", iter->dset_comptype[H5Z_FILTER_ERROR + 1]); + printf("\t\tGZIP filter: %lu\n", iter->dset_comptype[H5Z_FILTER_DEFLATE]); + printf("\t\tSHUFFLE filter: %lu\n", iter->dset_comptype[H5Z_FILTER_SHUFFLE]); + printf("\t\tFLETCHER32 filter: %lu\n", iter->dset_comptype[H5Z_FILTER_FLETCHER32]); + printf("\t\tSZIP filter: %lu\n", iter->dset_comptype[H5Z_FILTER_SZIP]); + printf("\t\tNBIT filter: %lu\n", iter->dset_comptype[H5Z_FILTER_NBIT]); + printf("\t\tSCALEOFFSET filter: %lu\n", iter->dset_comptype[H5Z_FILTER_SCALEOFFSET]); + printf("\t\tUSER-DEFINED filter: %lu\n", iter->dset_comptype[H5_NFILTERS_IMPL - 1]); } /* end if */ return 0; @@ -1346,13 +1343,13 @@ print_dataset_info(const iter_t *iter) static herr_t print_dset_metadata(const iter_t *iter) { - HDprintf("File space information for datasets' metadata (in bytes):\n"); + printf("File space information for datasets' metadata (in bytes):\n"); - HDfprintf(stdout, "\tObject headers (total/unused): %" PRIuHSIZE "/%" PRIuHSIZE "\n", - iter->dset_ohdr_info.total_size, iter->dset_ohdr_info.free_size); + fprintf(stdout, "\tObject headers (total/unused): %" PRIuHSIZE "/%" PRIuHSIZE "\n", + iter->dset_ohdr_info.total_size, iter->dset_ohdr_info.free_size); - HDfprintf(stdout, "\tIndex for Chunked datasets: %" PRIuHSIZE "\n", iter->datasets_index_storage_size); - HDfprintf(stdout, "\tHeap: %" PRIuHSIZE "\n", iter->datasets_heap_storage_size); + fprintf(stdout, "\tIndex for Chunked datasets: %" PRIuHSIZE "\n", iter->datasets_index_storage_size); + fprintf(stdout, "\tHeap: %" PRIuHSIZE "\n", iter->datasets_heap_storage_size); return 0; } /* print_dset_metadata() */ @@ -1378,20 +1375,20 @@ print_dset_dtype_meta(const iter_t *iter) unsigned u; /* Local index variable */ if (iter->dset_ntypes) { - HDprintf("Dataset datatype information:\n"); - HDprintf("\t# of unique datatypes used by datasets: %lu\n", iter->dset_ntypes); + printf("Dataset datatype information:\n"); + printf("\t# of unique datatypes used by datasets: %lu\n", iter->dset_ntypes); total = 0; for (u = 0; u < iter->dset_ntypes; u++) { H5Tencode(iter->dset_type_info[u].tid, NULL, &dtype_size); - HDprintf("\tDataset datatype #%u:\n", u); - HDprintf("\t\tCount (total/named) = (%lu/%lu)\n", iter->dset_type_info[u].count, - iter->dset_type_info[u].named); - HDprintf("\t\tSize (desc./elmt) = (%lu/%lu)\n", (unsigned long)dtype_size, - (unsigned long)H5Tget_size(iter->dset_type_info[u].tid)); + printf("\tDataset datatype #%u:\n", u); + printf("\t\tCount (total/named) = (%lu/%lu)\n", iter->dset_type_info[u].count, + iter->dset_type_info[u].named); + printf("\t\tSize (desc./elmt) = (%lu/%lu)\n", (unsigned long)dtype_size, + (unsigned long)H5Tget_size(iter->dset_type_info[u].tid)); H5Tclose(iter->dset_type_info[u].tid); total += iter->dset_type_info[u].count; } /* end for */ - HDprintf("\tTotal dataset datatype count: %lu\n", total); + printf("\tTotal dataset datatype count: %lu\n", total); } /* end if */ return 0; @@ -1418,29 +1415,29 @@ print_attr_info(const iter_t *iter) unsigned long total; /* Total count for various statistics */ unsigned u; /* Local index variable */ - HDprintf("Small # of attributes (objects with 1 to %u attributes):\n", sattrs_threshold); + printf("Small # of attributes (objects with 1 to %u attributes):\n", sattrs_threshold); total = 0; for (u = 1; u <= (unsigned)sattrs_threshold; u++) { if (iter->num_small_attrs[u] > 0) { - HDprintf("\t# of objects with %u attributes: %lu\n", u, iter->num_small_attrs[u]); + printf("\t# of objects with %u attributes: %lu\n", u, iter->num_small_attrs[u]); total += iter->num_small_attrs[u]; } /* end if */ } /* end for */ - HDprintf("\tTotal # of objects with small # of attributes: %lu\n", total); + printf("\tTotal # of objects with small # of attributes: %lu\n", total); - HDprintf("Attribute bins:\n"); + printf("Attribute bins:\n"); total = 0; power = 1; for (u = 1; u < iter->attr_nbins; u++) { if (iter->attr_bins[u] > 0) { - HDprintf("\t# of objects with %lu - %lu attributes: %lu\n", power, (power * 10) - 1, - iter->attr_bins[u]); + printf("\t# of objects with %lu - %lu attributes: %lu\n", power, (power * 10) - 1, + iter->attr_bins[u]); total += iter->attr_bins[u]; } /* end if */ power *= 10; } /* end for */ - HDprintf("\tTotal # of objects with attributes: %lu\n", total); - HDprintf("\tMax. # of attributes to objects: %lu\n", (unsigned long)iter->max_attrs); + printf("\tTotal # of objects with attributes: %lu\n", total); + printf("\tMax. # of attributes to objects: %lu\n", (unsigned long)iter->max_attrs); return 0; } /* print_attr_info() */ @@ -1465,30 +1462,30 @@ print_freespace_info(const iter_t *iter) unsigned long total; /* Total count for various statistics */ unsigned u; /* Local index variable */ - HDfprintf(stdout, "Free-space persist: %s\n", iter->fs_persist ? "TRUE" : "FALSE"); - HDfprintf(stdout, "Free-space section threshold: %" PRIuHSIZE " bytes\n", iter->fs_threshold); - HDprintf("Small size free-space sections (< %u bytes):\n", (unsigned)SIZE_SMALL_SECTS); + fprintf(stdout, "Free-space persist: %s\n", iter->fs_persist ? "TRUE" : "FALSE"); + fprintf(stdout, "Free-space section threshold: %" PRIuHSIZE " bytes\n", iter->fs_threshold); + printf("Small size free-space sections (< %u bytes):\n", (unsigned)SIZE_SMALL_SECTS); total = 0; for (u = 0; u < SIZE_SMALL_SECTS; u++) { if (iter->num_small_sects[u] > 0) { - HDprintf("\t# of sections of size %u: %lu\n", u, iter->num_small_sects[u]); + printf("\t# of sections of size %u: %lu\n", u, iter->num_small_sects[u]); total += iter->num_small_sects[u]; } /* end if */ } /* end for */ - HDprintf("\tTotal # of small size sections: %lu\n", total); + printf("\tTotal # of small size sections: %lu\n", total); - HDprintf("Free-space section bins:\n"); + printf("Free-space section bins:\n"); total = 0; power = 1; for (u = 1; u < iter->sect_nbins; u++) { if (iter->sect_bins[u] > 0) { - HDprintf("\t# of sections of size %lu - %lu: %lu\n", power, (power * 10) - 1, iter->sect_bins[u]); + printf("\t# of sections of size %lu - %lu: %lu\n", power, (power * 10) - 1, iter->sect_bins[u]); total += iter->sect_bins[u]; } /* end if */ power *= 10; } /* end for */ - HDprintf("\tTotal # of sections: %lu\n", total); + printf("\tTotal # of sections: %lu\n", total); return 0; } /* print_freespace_info() */ @@ -1513,9 +1510,9 @@ print_storage_summary(const iter_t *iter) hsize_t unaccount = 0; double percent = 0.0; - HDfprintf(stdout, "File space management strategy: %s\n", FS_STRATEGY_NAME[iter->fs_strategy]); - HDfprintf(stdout, "File space page size: %" PRIuHSIZE " bytes\n", iter->fsp_size); - HDprintf("Summary of file space information:\n"); + fprintf(stdout, "File space management strategy: %s\n", FS_STRATEGY_NAME[iter->fs_strategy]); + fprintf(stdout, "File space page size: %" PRIuHSIZE " bytes\n", iter->fsp_size); + printf("Summary of file space information:\n"); total_meta = iter->super_size + iter->super_ext_size + iter->ublk_size + iter->group_ohdr_info.total_size + iter->dset_ohdr_info.total_size + iter->dtype_ohdr_info.total_size + iter->groups_btree_storage_size + @@ -1523,28 +1520,28 @@ print_storage_summary(const iter_t *iter) iter->datasets_index_storage_size + iter->datasets_heap_storage_size + iter->SM_hdr_storage_size + iter->SM_index_storage_size + iter->SM_heap_storage_size + iter->free_hdr; - HDfprintf(stdout, " File metadata: %" PRIuHSIZE " bytes\n", total_meta); - HDfprintf(stdout, " Raw data: %" PRIuHSIZE " bytes\n", iter->dset_storage_size); + fprintf(stdout, " File metadata: %" PRIuHSIZE " bytes\n", total_meta); + fprintf(stdout, " Raw data: %" PRIuHSIZE " bytes\n", iter->dset_storage_size); percent = ((double)iter->free_space / (double)iter->filesize) * 100.0; - HDfprintf(stdout, " Amount/Percent of tracked free space: %" PRIuHSIZE " bytes/%3.1f%%\n", - iter->free_space, percent); + fprintf(stdout, " Amount/Percent of tracked free space: %" PRIuHSIZE " bytes/%3.1f%%\n", + iter->free_space, percent); if (iter->filesize < (total_meta + iter->dset_storage_size + iter->free_space)) { unaccount = (total_meta + iter->dset_storage_size + iter->free_space) - iter->filesize; - HDfprintf(stdout, " ??? File has %" PRIuHSIZE " more bytes accounted for than its size! ???\n", - unaccount); + fprintf(stdout, " ??? File has %" PRIuHSIZE " more bytes accounted for than its size! ???\n", + unaccount); } else { unaccount = iter->filesize - (total_meta + iter->dset_storage_size + iter->free_space); - HDfprintf(stdout, " Unaccounted space: %" PRIuHSIZE " bytes\n", unaccount); + fprintf(stdout, " Unaccounted space: %" PRIuHSIZE " bytes\n", unaccount); } - HDfprintf(stdout, "Total space: %" PRIuHSIZE " bytes\n", - total_meta + iter->dset_storage_size + iter->free_space + unaccount); + fprintf(stdout, "Total space: %" PRIuHSIZE " bytes\n", + total_meta + iter->dset_storage_size + iter->free_space + unaccount); if (iter->nexternal) - HDfprintf(stdout, "External raw data: %" PRIuHSIZE " bytes\n", iter->dset_external_storage_size); + fprintf(stdout, "External raw data: %" PRIuHSIZE " bytes\n", iter->dset_external_storage_size); return 0; } /* print_storage_summary() */ @@ -1622,7 +1619,7 @@ print_file_statistics(const iter_t *iter) static void print_object_statistics(const char *name) { - HDprintf("Object name %s\n", name); + printf("Object name %s\n", name); } /* print_object_statistics() */ /*------------------------------------------------------------------------- @@ -1705,7 +1702,7 @@ main(int argc, char *argv[]) hid_t fcpl; H5F_info2_t finfo; - HDprintf("Filename: %s\n", fname); + printf("Filename: %s\n", fname); fid = h5tools_fopen(fname, H5F_ACC_RDONLY, fapl_id, (fapl_id != H5P_DEFAULT), NULL, 0); diff --git a/tools/src/misc/h5clear.c b/tools/src/misc/h5clear.c index faf7d94..5f26ef4 100644 --- a/tools/src/misc/h5clear.c +++ b/tools/src/misc/h5clear.c @@ -61,39 +61,36 @@ static struct h5_long_options l_opts[] = { static void usage(const char *prog) { - HDfprintf(stdout, "usage: %s [OPTIONS] file_name\n", prog); - HDfprintf(stdout, " OPTIONS\n"); - HDfprintf(stdout, " -h, --help Print a usage message and exit\n"); - HDfprintf(stdout, " -V, --version Print version number and exit\n"); - HDfprintf(stdout, " -s, --status Clear the status_flags field in the file's superblock\n"); - HDfprintf(stdout, " -m, --image Remove the metadata cache image from the file\n"); - HDfprintf(stdout, " --filesize Print the file's EOA and EOF\n"); - HDfprintf(stdout, - " --increment=C Set the file's EOA to the maximum of (EOA, EOF) + C for\n"); - HDfprintf(stdout, " the file <file_name>.\n"); - HDfprintf(stdout, - " C is >= 0; C is optional and will default to 1M when not set.\n"); - HDfprintf( - stdout, - " This option helps to repair a crashed file where the stored EOA\n"); - HDfprintf(stdout, " in the superblock is different from the actual EOF.\n"); - HDfprintf(stdout, - " The file’s EOA and EOF will be the same after applying\n"); - HDfprintf(stdout, " this option to the file.\n"); - HDfprintf(stdout, "\n"); - HDfprintf(stdout, "Examples of use:\n"); - HDfprintf(stdout, "\n"); - HDfprintf(stdout, "h5clear -s file_name\n"); - HDfprintf(stdout, " Clear the status_flags field in the superblock of the HDF5 file <file_name>.\n"); - HDfprintf(stdout, "\n"); - HDfprintf(stdout, "h5clear -m file_name\n"); - HDfprintf(stdout, " Remove the metadata cache image from the HDF5 file <file_name>.\n"); - HDfprintf(stdout, "\n"); - HDfprintf(stdout, "h5clear --increment file_name\n"); - HDfprintf(stdout, " Set the EOA to the maximum of (EOA, EOF) + 1M for the file <file_name>.\n"); - HDfprintf(stdout, "\n"); - HDfprintf(stdout, "h5clear --increment=512 file_name\n"); - HDfprintf(stdout, " Set the EOA to the maximum of (EOA, EOF) + 512 for the file <file_name>.\n"); + fprintf(stdout, "usage: %s [OPTIONS] file_name\n", prog); + fprintf(stdout, " OPTIONS\n"); + fprintf(stdout, " -h, --help Print a usage message and exit\n"); + fprintf(stdout, " -V, --version Print version number and exit\n"); + fprintf(stdout, " -s, --status Clear the status_flags field in the file's superblock\n"); + fprintf(stdout, " -m, --image Remove the metadata cache image from the file\n"); + fprintf(stdout, " --filesize Print the file's EOA and EOF\n"); + fprintf(stdout, " --increment=C Set the file's EOA to the maximum of (EOA, EOF) + C for\n"); + fprintf(stdout, " the file <file_name>.\n"); + fprintf(stdout, + " C is >= 0; C is optional and will default to 1M when not set.\n"); + fprintf(stdout, + " This option helps to repair a crashed file where the stored EOA\n"); + fprintf(stdout, " in the superblock is different from the actual EOF.\n"); + fprintf(stdout, " The file’s EOA and EOF will be the same after applying\n"); + fprintf(stdout, " this option to the file.\n"); + fprintf(stdout, "\n"); + fprintf(stdout, "Examples of use:\n"); + fprintf(stdout, "\n"); + fprintf(stdout, "h5clear -s file_name\n"); + fprintf(stdout, " Clear the status_flags field in the superblock of the HDF5 file <file_name>.\n"); + fprintf(stdout, "\n"); + fprintf(stdout, "h5clear -m file_name\n"); + fprintf(stdout, " Remove the metadata cache image from the HDF5 file <file_name>.\n"); + fprintf(stdout, "\n"); + fprintf(stdout, "h5clear --increment file_name\n"); + fprintf(stdout, " Set the EOA to the maximum of (EOA, EOF) + 1M for the file <file_name>.\n"); + fprintf(stdout, "\n"); + fprintf(stdout, "h5clear --increment=512 file_name\n"); + fprintf(stdout, " Set the EOA to the maximum of (EOA, EOF) + 512 for the file <file_name>.\n"); } /* usage() */ /*------------------------------------------------------------------------- @@ -328,7 +325,7 @@ main(int argc, char *argv[]) h5tools_setstatus(EXIT_FAILURE); goto done; } - HDfprintf(stdout, "EOA is %" PRIuHADDR "; EOF is %" PRIuHADDR " \n", eoa, (haddr_t)st.st_size); + fprintf(stdout, "EOA is %" PRIuHADDR "; EOF is %" PRIuHADDR " \n", eoa, (haddr_t)st.st_size); } /* --increment option */ diff --git a/tools/src/misc/h5debug.c b/tools/src/misc/h5debug.c index 0d268c6..0f841a9 100644 --- a/tools/src/misc/h5debug.c +++ b/tools/src/misc/h5debug.c @@ -131,7 +131,7 @@ get_H5B2_class(const uint8_t *sig) case H5B2_NUM_BTREE_ID: default: - HDfprintf(stderr, "Unknown v2 B-tree subtype %u\n", (unsigned)(subtype)); + fprintf(stderr, "Unknown v2 B-tree subtype %u\n", (unsigned)(subtype)); } /* end switch */ return (cls); @@ -172,7 +172,7 @@ get_H5EA_class(const uint8_t *sig) case H5EA_NUM_CLS_ID: default: - HDfprintf(stderr, "Unknown extensible array class %u\n", (unsigned)(clsid)); + fprintf(stderr, "Unknown extensible array class %u\n", (unsigned)(clsid)); } /* end switch */ return (cls); @@ -213,7 +213,7 @@ get_H5FA_class(const uint8_t *sig) case H5FA_NUM_CLS_ID: default: - HDfprintf(stderr, "Unknown fixed array class %u\n", (unsigned)(clsid)); + fprintf(stderr, "Unknown fixed array class %u\n", (unsigned)(clsid)); } /* end switch */ return (cls); @@ -252,14 +252,14 @@ main(int argc, char *argv[]) int exit_value = 0; if (argc == 1) { - HDfprintf(stderr, "Usage: %s filename [signature-addr [extra]*]\n", argv[0]); + fprintf(stderr, "Usage: %s filename [signature-addr [extra]*]\n", argv[0]); exit_value = 1; goto done; } /* end if */ /* Initialize the library */ if (H5open() < 0) { - HDfprintf(stderr, "cannot initialize the library\n"); + fprintf(stderr, "cannot initialize the library\n"); exit_value = 1; goto done; } /* end if */ @@ -272,45 +272,45 @@ main(int argc, char *argv[]) * Open the file and get the file descriptor. */ if ((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0) { - HDfprintf(stderr, "cannot create file access property list\n"); + fprintf(stderr, "cannot create file access property list\n"); exit_value = 1; goto done; } /* end if */ if (HDstrchr(argv[1], '%')) if (H5Pset_fapl_family(fapl, (hsize_t)0, H5P_DEFAULT) < 0) { - HDfprintf(stderr, "cannot set file access property list\n"); + fprintf(stderr, "cannot set file access property list\n"); exit_value = 1; goto done; } if ((fid = H5Fopen(argv[1], H5F_ACC_RDONLY, fapl)) < 0) { - HDfprintf(stderr, "cannot open file\n"); + fprintf(stderr, "cannot open file\n"); exit_value = 1; goto done; } /* end if */ /* Push API context */ if (H5CX_push() < 0) { - HDfprintf(stderr, "cannot set API context\n"); + fprintf(stderr, "cannot set API context\n"); exit_value = 1; goto done; } api_ctx_pushed = TRUE; if (NULL == (vol_obj = (H5VL_object_t *)H5VL_vol_object(fid))) { - HDfprintf(stderr, "cannot obtain vol_obj pointer\n"); + fprintf(stderr, "cannot obtain vol_obj pointer\n"); exit_value = 2; goto done; } /* end if */ if (NULL == (f = (H5F_t *)H5VL_object_data(vol_obj))) { - HDfprintf(stderr, "cannot obtain H5F_t pointer\n"); + fprintf(stderr, "cannot obtain H5F_t pointer\n"); exit_value = 2; goto done; } /* end if */ /* Ignore metadata tags while using h5debug */ if (H5AC_ignore_tags(f) < 0) { - HDfprintf(stderr, "cannot ignore metadata tags\n"); + fprintf(stderr, "cannot ignore metadata tags\n"); exit_value = 1; goto done; } @@ -331,8 +331,8 @@ main(int argc, char *argv[]) /* Range check against 'extra' array size */ if (extra_count > (int)(sizeof(extra) / sizeof(haddr_t))) { - HDfprintf(stderr, "\nWARNING: Only using first %d extra parameters\n\n", - (int)(sizeof(extra) / sizeof(haddr_t))); + fprintf(stderr, "\nWARNING: Only using first %d extra parameters\n\n", + (int)(sizeof(extra) / sizeof(haddr_t))); extra_count = (int)(sizeof(extra) / sizeof(haddr_t)); } /* end if */ @@ -343,9 +343,9 @@ main(int argc, char *argv[]) /* * Read the signature at the specified file position. */ - HDfprintf(stdout, "Reading signature at address %" PRIuHADDR " (rel)\n", addr); + fprintf(stdout, "Reading signature at address %" PRIuHADDR " (rel)\n", addr); if (H5F_block_read(f, H5FD_MEM_SUPER, addr, sizeof(sig), sig) < 0) { - HDfprintf(stderr, "cannot read signature\n"); + fprintf(stderr, "cannot read signature\n"); exit_value = 3; goto done; } @@ -374,10 +374,10 @@ main(int argc, char *argv[]) /* Check for extra parameters */ if (extra_count == 0 || extra[0] == 0) { - HDfprintf(stderr, - "\nWarning: Providing the group's local heap address will give more information\n"); - HDfprintf(stderr, "Symbol table node usage:\n"); - HDfprintf(stderr, "\th5debug <filename> <Symbol table node address> <address of local heap>\n\n"); + fprintf(stderr, + "\nWarning: Providing the group's local heap address will give more information\n"); + fprintf(stderr, "Symbol table node usage:\n"); + fprintf(stderr, "\th5debug <filename> <Symbol table node address> <address of local heap>\n\n"); } /* end if */ status = H5G_node_debug(f, addr, stdout, 0, VCOL, extra[0]); @@ -396,12 +396,11 @@ main(int argc, char *argv[]) case H5B_SNODE_ID: /* Check for extra parameters */ if (extra_count == 0 || extra[0] == 0) { - HDfprintf( + fprintf( stderr, "\nWarning: Providing the group's local heap address will give more information\n"); - HDfprintf(stderr, "B-tree symbol table node usage:\n"); - HDfprintf(stderr, - "\th5debug <filename> <B-tree node address> <address of local heap>\n\n"); + fprintf(stderr, "B-tree symbol table node usage:\n"); + fprintf(stderr, "\th5debug <filename> <B-tree node address> <address of local heap>\n\n"); exit_value = 4; goto done; } /* end if */ @@ -412,12 +411,11 @@ main(int argc, char *argv[]) case H5B_CHUNK_ID: /* Check for extra parameters */ if (extra_count == 0 || extra[0] == 0) { - HDfprintf( - stderr, - "ERROR: Need number of dimensions of chunk in order to dump chunk B-tree node\n"); - HDfprintf(stderr, "B-tree chunked storage node usage:\n"); - HDfprintf(stderr, "\th5debug <filename> <B-tree node address> <# of dimensions> <slowest " - "chunk dim>...<fastest chunk dim>\n"); + fprintf(stderr, + "ERROR: Need number of dimensions of chunk in order to dump chunk B-tree node\n"); + fprintf(stderr, "B-tree chunked storage node usage:\n"); + fprintf(stderr, "\th5debug <filename> <B-tree node address> <# of dimensions> <slowest " + "chunk dim>...<fastest chunk dim>\n"); exit_value = 4; goto done; } /* end if */ @@ -427,10 +425,10 @@ main(int argc, char *argv[]) /* Check for dimension error */ if (ndims > 9) { - HDfprintf(stderr, "ERROR: Only 9 dimensions support currently (fix h5debug)\n"); - HDfprintf(stderr, "B-tree chunked storage node usage:\n"); - HDfprintf(stderr, "\th5debug <filename> <B-tree node address> <# of dimensions> <slowest " - "chunk dim>...<fastest chunk dim>\n"); + fprintf(stderr, "ERROR: Only 9 dimensions support currently (fix h5debug)\n"); + fprintf(stderr, "B-tree chunked storage node usage:\n"); + fprintf(stderr, "\th5debug <filename> <B-tree node address> <# of dimensions> <slowest " + "chunk dim>...<fastest chunk dim>\n"); exit_value = 4; goto done; } /* end for */ @@ -442,10 +440,10 @@ main(int argc, char *argv[]) /* Check for dimension error */ for (u = 0; u < ndims; u++) if (0 == dim[u]) { - HDfprintf(stderr, "ERROR: Chunk dimensions should be >0\n"); - HDfprintf(stderr, "B-tree chunked storage node usage:\n"); - HDfprintf(stderr, "\th5debug <filename> <B-tree node address> <# of dimensions> " - "<slowest chunk dim>...<fastest chunk dim>\n"); + fprintf(stderr, "ERROR: Chunk dimensions should be >0\n"); + fprintf(stderr, "B-tree chunked storage node usage:\n"); + fprintf(stderr, "\th5debug <filename> <B-tree node address> <# of dimensions> " + "<slowest chunk dim>...<fastest chunk dim>\n"); exit_value = 4; goto done; } /* end if */ @@ -458,7 +456,7 @@ main(int argc, char *argv[]) case H5B_NUM_BTREE_ID: default: - HDfprintf(stderr, "Unknown v1 B-tree subtype %u\n", (unsigned)(subtype)); + fprintf(stderr, "Unknown v1 B-tree subtype %u\n", (unsigned)(subtype)); exit_value = 4; goto done; } @@ -471,10 +469,10 @@ main(int argc, char *argv[]) assert(cls); if ((cls == H5D_BT2 || cls == H5D_BT2_FILT) && (extra_count == 0 || extra[0] == 0)) { - HDfprintf(stderr, "ERROR: Need v2 B-tree header address and object header address containing the " - "layout message in order to dump header\n"); - HDfprintf(stderr, "v2 B-tree hdr usage:\n"); - HDfprintf(stderr, "\th5debug <filename> <v2 B-tree header address> <object header address>\n"); + fprintf(stderr, "ERROR: Need v2 B-tree header address and object header address containing the " + "layout message in order to dump header\n"); + fprintf(stderr, "v2 B-tree hdr usage:\n"); + fprintf(stderr, "\th5debug <filename> <v2 B-tree header address> <object header address>\n"); exit_value = 4; goto done; } /* end if */ @@ -491,25 +489,25 @@ main(int argc, char *argv[]) /* Check for enough valid parameters */ if ((cls == H5D_BT2 || cls == H5D_BT2_FILT) && (extra_count == 0 || extra[0] == 0 || extra[1] == 0 || extra[2] == 0 || extra[3] == 0)) { - HDfprintf(stderr, - "ERROR: Need v2 B-tree header address, the node's number of records, depth, and object " - "header address containing the layout message in order to dump internal node\n"); - HDfprintf(stderr, - "NOTE: Leaf nodes are depth 0, the internal nodes above them are depth 1, etc.\n"); - HDfprintf(stderr, "v2 B-tree internal node usage:\n"); - HDfprintf(stderr, "\th5debug <filename> <internal node address> <v2 B-tree header address> " - "<number of records> <depth> <object header address>\n"); + fprintf(stderr, + "ERROR: Need v2 B-tree header address, the node's number of records, depth, and object " + "header address containing the layout message in order to dump internal node\n"); + fprintf(stderr, + "NOTE: Leaf nodes are depth 0, the internal nodes above them are depth 1, etc.\n"); + fprintf(stderr, "v2 B-tree internal node usage:\n"); + fprintf(stderr, "\th5debug <filename> <internal node address> <v2 B-tree header address> " + "<number of records> <depth> <object header address>\n"); exit_value = 4; goto done; } else if (extra_count == 0 || extra[0] == 0 || extra[1] == 0 || extra[2] == 0) { - HDfprintf(stderr, "ERROR: Need v2 B-tree header address and the node's number of records and " - "depth in order to dump internal node\n"); - HDfprintf(stderr, - "NOTE: Leaf nodes are depth 0, the internal nodes above them are depth 1, etc.\n"); - HDfprintf(stderr, "v2 B-tree internal node usage:\n"); - HDfprintf(stderr, "\th5debug <filename> <internal node address> <v2 B-tree header address> " - "<number of records> <depth>\n"); + fprintf(stderr, "ERROR: Need v2 B-tree header address and the node's number of records and " + "depth in order to dump internal node\n"); + fprintf(stderr, + "NOTE: Leaf nodes are depth 0, the internal nodes above them are depth 1, etc.\n"); + fprintf(stderr, "v2 B-tree internal node usage:\n"); + fprintf(stderr, "\th5debug <filename> <internal node address> <v2 B-tree header address> " + "<number of records> <depth>\n"); exit_value = 4; goto done; } /* end if */ @@ -528,20 +526,20 @@ main(int argc, char *argv[]) if ((cls == H5D_BT2 || cls == H5D_BT2_FILT) && (extra_count == 0 || extra[0] == 0 || extra[1] == 0 || extra[2] == 0)) { - HDfprintf(stderr, "ERROR: Need v2 B-tree header address, number of records, and object header " - "address containing the layout message in order to dump leaf node\n"); - HDfprintf(stderr, "v2 B-tree leaf node usage:\n"); - HDfprintf(stderr, "\th5debug <filename> <leaf node address> <v2 B-tree header address> <number " - "of records> <object header address>\n"); + fprintf(stderr, "ERROR: Need v2 B-tree header address, number of records, and object header " + "address containing the layout message in order to dump leaf node\n"); + fprintf(stderr, "v2 B-tree leaf node usage:\n"); + fprintf(stderr, "\th5debug <filename> <leaf node address> <v2 B-tree header address> <number " + "of records> <object header address>\n"); exit_value = 4; goto done; } else if (extra_count == 0 || extra[0] == 0 || extra[1] == 0) { - HDfprintf( + fprintf( stderr, "ERROR: Need v2 B-tree header address and number of records in order to dump leaf node\n"); - HDfprintf(stderr, "v2 B-tree leaf node usage:\n"); - HDfprintf( + fprintf(stderr, "v2 B-tree leaf node usage:\n"); + fprintf( stderr, "\th5debug <filename> <leaf node address> <v2 B-tree header address> <number of records>\n"); exit_value = 4; @@ -564,10 +562,10 @@ main(int argc, char *argv[]) /* Check for enough valid parameters */ if (extra_count == 0 || extra[0] == 0 || extra[1] == 0) { - HDfprintf(stderr, "ERROR: Need fractal heap header address and size of direct block in order to " - "dump direct block\n"); - HDfprintf(stderr, "Fractal heap direct block usage:\n"); - HDfprintf( + fprintf(stderr, "ERROR: Need fractal heap header address and size of direct block in order to " + "dump direct block\n"); + fprintf(stderr, "Fractal heap direct block usage:\n"); + fprintf( stderr, "\th5debug <filename> <direct block address> <heap header address> <size of direct block>\n"); exit_value = 4; @@ -583,12 +581,11 @@ main(int argc, char *argv[]) /* Check for enough valid parameters */ if (extra_count == 0 || extra[0] == 0 || extra[1] == 0) { - HDfprintf(stderr, "ERROR: Need fractal heap header address and number of rows in order to dump " - "indirect block\n"); - HDfprintf(stderr, "Fractal heap indirect block usage:\n"); - HDfprintf( - stderr, - "\th5debug <filename> <indirect block address> <heap header address> <number of rows>\n"); + fprintf(stderr, "ERROR: Need fractal heap header address and number of rows in order to dump " + "indirect block\n"); + fprintf(stderr, "Fractal heap indirect block usage:\n"); + fprintf(stderr, + "\th5debug <filename> <indirect block address> <heap header address> <number of rows>\n"); exit_value = 4; goto done; } /* end if */ @@ -609,11 +606,11 @@ main(int argc, char *argv[]) /* Check for enough valid parameters */ if (extra_count == 0 || extra[0] == 0 || extra[1] == 0) { - HDfprintf(stderr, "ERROR: Need free space header address and client address in order to dump " - "serialized sections\n"); - HDfprintf(stderr, "Free space serialized sections usage:\n"); - HDfprintf(stderr, "\th5debug <filename> <serialized sections address> <free space header " - "address> <client address>\n"); + fprintf(stderr, "ERROR: Need free space header address and client address in order to dump " + "serialized sections\n"); + fprintf(stderr, "Free space serialized sections usage:\n"); + fprintf(stderr, "\th5debug <filename> <serialized sections address> <free space header " + "address> <client address>\n"); exit_value = 4; goto done; } /* end if */ @@ -634,10 +631,10 @@ main(int argc, char *argv[]) /* Check for enough valid parameters */ if (extra_count == 0 || extra[0] == 0) { - HDfprintf(stderr, "ERROR: Need shared message header address in order to shared message list\n"); - HDfprintf(stderr, "Shared message list usage:\n"); - HDfprintf(stderr, - "\th5debug <filename> <shared message list address> <shared message header address>\n"); + fprintf(stderr, "ERROR: Need shared message header address in order to shared message list\n"); + fprintf(stderr, "Shared message list usage:\n"); + fprintf(stderr, + "\th5debug <filename> <shared message list address> <shared message header address>\n"); exit_value = 4; goto done; } /* end if */ @@ -653,12 +650,12 @@ main(int argc, char *argv[]) /* Check for enough valid parameters */ if (extra_count == 0 || extra[0] == 0) { - HDfprintf( + fprintf( stderr, "ERROR: Need object header address containing the layout message in order to dump header\n"); - HDfprintf(stderr, "Extensible array header block usage:\n"); - HDfprintf(stderr, - "\th5debug <filename> <Extensible Array header address> <object header address>\n"); + fprintf(stderr, "Extensible array header block usage:\n"); + fprintf(stderr, + "\th5debug <filename> <Extensible Array header address> <object header address>\n"); exit_value = 4; goto done; } /* end if */ @@ -674,10 +671,10 @@ main(int argc, char *argv[]) /* Check for enough valid parameters */ if (extra_count == 0 || extra[0] == 0 || extra[1] == 0) { - HDfprintf(stderr, "ERROR: Need extensible array header address and object header address " - "containing the layout message in order to dump index block\n"); - HDfprintf(stderr, "Extensible array index block usage:\n"); - HDfprintf( + fprintf(stderr, "ERROR: Need extensible array header address and object header address " + "containing the layout message in order to dump index block\n"); + fprintf(stderr, "Extensible array index block usage:\n"); + fprintf( stderr, "\th5debug <filename> <index block address> <array header address> <object header address\n"); exit_value = 4; @@ -695,11 +692,11 @@ main(int argc, char *argv[]) /* Check for enough valid parameters */ if (extra_count == 0 || extra[0] == 0 || extra[1] == 0 || extra[2] == 0) { - HDfprintf(stderr, "ERROR: Need extensible array header address, super block index and object " - "header address containing the layout message in order to dump super block\n"); - HDfprintf(stderr, "Extensible array super block usage:\n"); - HDfprintf(stderr, "\th5debug <filename> <super block address> <array header address> <super " - "block index> <object header address>\n"); + fprintf(stderr, "ERROR: Need extensible array header address, super block index and object " + "header address containing the layout message in order to dump super block\n"); + fprintf(stderr, "Extensible array super block usage:\n"); + fprintf(stderr, "\th5debug <filename> <super block address> <array header address> <super " + "block index> <object header address>\n"); exit_value = 4; goto done; } /* end if */ @@ -715,12 +712,12 @@ main(int argc, char *argv[]) /* Check for enough valid parameters */ if (extra_count == 0 || extra[0] == 0 || extra[1] == 0 || extra[2] == 0) { - HDfprintf(stderr, - "ERROR: Need extensible array header address, # of elements in data block and object " - "header address containing the layout message in order to dump data block\n"); - HDfprintf(stderr, "Extensible array data block usage:\n"); - HDfprintf(stderr, "\th5debug <filename> <data block address> <array header address> <# of " - "elements in data block> <object header address\n"); + fprintf(stderr, + "ERROR: Need extensible array header address, # of elements in data block and object " + "header address containing the layout message in order to dump data block\n"); + fprintf(stderr, "Extensible array data block usage:\n"); + fprintf(stderr, "\th5debug <filename> <data block address> <array header address> <# of " + "elements in data block> <object header address\n"); exit_value = 4; goto done; } /* end if */ @@ -736,11 +733,11 @@ main(int argc, char *argv[]) /* Check for enough valid parameters */ if (extra_count == 0 || extra[0] == 0) { - HDfprintf( + fprintf( stderr, "ERROR: Need object header address containing the layout message in order to dump header\n"); - HDfprintf(stderr, "Fixed array header block usage:\n"); - HDfprintf(stderr, "\th5debug <filename> <Fixed Array header address> <object header address>\n"); + fprintf(stderr, "Fixed array header block usage:\n"); + fprintf(stderr, "\th5debug <filename> <Fixed Array header address> <object header address>\n"); exit_value = 4; goto done; } /* end if */ @@ -756,10 +753,10 @@ main(int argc, char *argv[]) /* Check for enough valid parameters */ if (extra_count == 0 || extra[0] == 0 || extra[1] == 0) { - HDfprintf(stderr, "ERROR: Need fixed array header address and object header address containing " - "the layout message in order to dump data block\n"); - HDfprintf(stderr, "fixed array data block usage:\n"); - HDfprintf( + fprintf(stderr, "ERROR: Need fixed array header address and object header address containing " + "the layout message in order to dump data block\n"); + fprintf(stderr, "fixed array data block usage:\n"); + fprintf( stderr, "\th5debug <filename> <data block address> <array header address> <object header address>\n"); exit_value = 4; @@ -786,7 +783,7 @@ main(int argc, char *argv[]) /* * Got some other unrecognized signature. */ - HDprintf("%-*s ", VCOL, "Signature:"); + printf("%-*s ", VCOL, "Signature:"); for (u = 0; u < sizeof(sig); u++) { if (sig[u] > ' ' && sig[u] <= '~' && '\\' != sig[u]) HDputchar(sig[u]); @@ -795,18 +792,18 @@ main(int argc, char *argv[]) HDputchar('\\'); } else - HDprintf("\\%03o", sig[u]); + printf("\\%03o", sig[u]); } HDputchar('\n'); - HDfprintf(stderr, "unknown signature\n"); + fprintf(stderr, "unknown signature\n"); exit_value = 4; goto done; } /* end else */ /* Check for an error when dumping information */ if (status < 0) { - HDfprintf(stderr, "An error occurred!\n"); + fprintf(stderr, "An error occurred!\n"); H5Eprint2(H5E_DEFAULT, stderr); exit_value = 5; goto done; @@ -817,7 +814,7 @@ done: H5Pclose(fapl); if (fid > 0) { if (H5Fclose(fid) < 0) { - HDfprintf(stderr, "Error in closing file!\n"); + fprintf(stderr, "Error in closing file!\n"); exit_value = 1; } } diff --git a/tools/src/misc/h5delete.c b/tools/src/misc/h5delete.c index f83b379..f996d8d 100644 --- a/tools/src/misc/h5delete.c +++ b/tools/src/misc/h5delete.c @@ -25,7 +25,7 @@ static void usage(void); static void usage(void) { - HDfprintf(stderr, "usage: h5delete [-f] <filename>\n"); + fprintf(stderr, "usage: h5delete [-f] <filename>\n"); } int @@ -60,7 +60,7 @@ main(int argc, char *argv[]) H5E_END_TRY if (ret < 0 && !quiet) - HDfprintf(stderr, "Unable to delete storage at: %s\n", name); + fprintf(stderr, "Unable to delete storage at: %s\n", name); return ret < 0 ? EXIT_FAILURE : EXIT_SUCCESS; } diff --git a/tools/src/misc/h5mkgrp.c b/tools/src/misc/h5mkgrp.c index c183a41..2e146c0 100644 --- a/tools/src/misc/h5mkgrp.c +++ b/tools/src/misc/h5mkgrp.c @@ -320,7 +320,7 @@ main(int argc, char *argv[]) /* Display some output if requested */ if (params_g.verbose) - HDprintf("%s: Creating groups with latest version of the format\n", h5tools_getprogname()); + printf("%s: Creating groups with latest version of the format\n", h5tools_getprogname()); } /* Attempt to open an existing HDF5 file first */ @@ -354,7 +354,7 @@ main(int argc, char *argv[]) /* Display some output if requested */ if (params_g.verbose) - HDprintf("%s: Creating parent groups\n", h5tools_getprogname()); + printf("%s: Creating parent groups\n", h5tools_getprogname()); } /* Loop over creating requested groups */ @@ -375,7 +375,7 @@ main(int argc, char *argv[]) /* Display some output if requested */ if (params_g.verbose) - HDprintf("%s: created group '%s'\n", h5tools_getprogname(), params_g.groups[curr_group]); + printf("%s: created group '%s'\n", h5tools_getprogname(), params_g.groups[curr_group]); } /* end for */ /* Close link creation property list */ diff --git a/tools/src/misc/h5repart.c b/tools/src/misc/h5repart.c index e0201f9..c4ea0a6 100644 --- a/tools/src/misc/h5repart.c +++ b/tools/src/misc/h5repart.c @@ -50,21 +50,21 @@ static void usage(const char *progname) { - HDfprintf(stderr, "usage: %s [-v] [-V] [-[b|m] N[g|m|k]] [-family_to_sec2|-family_to_single] SRC DST\n", - progname); - HDfprintf(stderr, " -v Produce verbose output\n"); - HDfprintf(stderr, " -V Print a version number and exit\n"); - HDfprintf(stderr, " -b N The I/O block size, defaults to 1kB\n"); - HDfprintf(stderr, " -m N The destination member size or 1GB\n"); - HDfprintf(stderr, " -family_to_sec2 Deprecated version of -family_to_single (below)\n"); - HDfprintf(stderr, " -family_to_single Change file driver from family to the default single-file VFD " - "(windows or sec2)\n"); - HDfprintf(stderr, " SRC The name of the source file\n"); - HDfprintf(stderr, " DST The name of the destination files\n"); - HDfprintf(stderr, "Sizes may be suffixed with 'g' for GB, 'm' for MB or " - "'k' for kB.\n"); - HDfprintf(stderr, "File family names include an integer printf " - "format such as '%%d'\n"); + fprintf(stderr, "usage: %s [-v] [-V] [-[b|m] N[g|m|k]] [-family_to_sec2|-family_to_single] SRC DST\n", + progname); + fprintf(stderr, " -v Produce verbose output\n"); + fprintf(stderr, " -V Print a version number and exit\n"); + fprintf(stderr, " -b N The I/O block size, defaults to 1kB\n"); + fprintf(stderr, " -m N The destination member size or 1GB\n"); + fprintf(stderr, " -family_to_sec2 Deprecated version of -family_to_single (below)\n"); + fprintf(stderr, " -family_to_single Change file driver from family to the default single-file VFD " + "(windows or sec2)\n"); + fprintf(stderr, " SRC The name of the source file\n"); + fprintf(stderr, " DST The name of the destination files\n"); + fprintf(stderr, "Sizes may be suffixed with 'g' for GB, 'm' for MB or " + "'k' for kB.\n"); + fprintf(stderr, "File family names include an integer printf " + "format such as '%%d'\n"); HDexit(EXIT_FAILURE); } @@ -202,8 +202,8 @@ main(int argc, char *argv[]) argno++; } else if (!HDstrcmp(argv[argno], "-V")) { - HDprintf("This is %s version %u.%u release %u\n", prog_name, H5_VERS_MAJOR, H5_VERS_MINOR, - H5_VERS_RELEASE); + printf("This is %s version %u.%u release %u\n", prog_name, H5_VERS_MAJOR, H5_VERS_MINOR, + H5_VERS_RELEASE); HDexit(EXIT_SUCCESS); } else if (!HDstrcmp(argv[argno], "-family_to_sec2")) { @@ -252,7 +252,7 @@ main(int argc, char *argv[]) } src_size = src_act_size = sb.st_size; if (verbose) - HDfprintf(stderr, "< %s\n", src_name); + fprintf(stderr, "< %s\n", src_name); /* * Get the name for the destination file and open the first member. @@ -268,7 +268,7 @@ main(int argc, char *argv[]) HDexit(EXIT_FAILURE); } if (verbose) - HDfprintf(stderr, "> %s\n", dst_name); + fprintf(stderr, "> %s\n", dst_name); /* No more arguments */ if (argno < argc) @@ -298,7 +298,7 @@ main(int argc, char *argv[]) HDexit(EXIT_FAILURE); } else if ((size_t)nio != n) { - HDfprintf(stderr, "%s: short read\n", src_name); + fprintf(stderr, "%s: short read\n", src_name); HDexit(EXIT_FAILURE); } for (i = 0; i < n; i++) { @@ -328,7 +328,7 @@ main(int argc, char *argv[]) HDexit(EXIT_FAILURE); } else if ((size_t)nio != n) { - HDfprintf(stderr, "%s: short write\n", dst_name); + fprintf(stderr, "%s: short write\n", dst_name); HDexit(EXIT_FAILURE); } need_seek = FALSE; @@ -367,11 +367,11 @@ main(int argc, char *argv[]) } src_act_size = sb.st_size; if (src_act_size > src_size) { - HDfprintf(stderr, "%s: member truncated to %lu bytes\n", src_name, (unsigned long)src_size); + fprintf(stderr, "%s: member truncated to %lu bytes\n", src_name, (unsigned long)src_size); } src_offset = 0; if (verbose) - HDfprintf(stderr, "< %s\n", src_name); + fprintf(stderr, "< %s\n", src_name); } /* @@ -408,7 +408,7 @@ main(int argc, char *argv[]) dst_offset = 0; need_seek = FALSE; if (verbose) - HDfprintf(stderr, "> %s\n", dst_name); + fprintf(stderr, "> %s\n", dst_name); } } diff --git a/tools/test/h5copy/h5copygentest.c b/tools/test/h5copy/h5copygentest.c index 93289ad..9fb5b74 100644 --- a/tools/test/h5copy/h5copygentest.c +++ b/tools/test/h5copy/h5copygentest.c @@ -512,21 +512,21 @@ gen_obj_ref(hid_t loc_id) * add dataset */ sid = H5Screate_simple(1, dims1, NULL); if (sid < 0) { - HDfprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", __func__, __LINE__); ret = FAIL; goto out; } oid = H5Dcreate2(loc_id, OBJ_REF_DS, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (oid < 0) { - HDfprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", __func__, __LINE__); ret = FAIL; goto out; } status = H5Dwrite(oid, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -538,7 +538,7 @@ gen_obj_ref(hid_t loc_id) * add group */ oid = H5Gcreate2(loc_id, OBJ_REF_GRP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (oid < 0) { - HDfprintf(stderr, "Error: %s %d> H5Gcreate2 failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Gcreate2 failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -546,34 +546,34 @@ gen_obj_ref(hid_t loc_id) status = H5Rcreate(&or_data[0], loc_id, OBJ_REF_DS, H5R_OBJECT, (hid_t)-1); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__); ret = FAIL; goto out; } status = H5Rcreate(&or_data[1], loc_id, OBJ_REF_GRP, H5R_OBJECT, (hid_t)-1); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__); ret = FAIL; goto out; } sid = H5Screate_simple(1, dims2, NULL); if (sid < 0) { - HDfprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", __func__, __LINE__); ret = FAIL; goto out; } oid = H5Dcreate2(loc_id, "Dset_OBJREF", H5T_STD_REF_OBJ, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (oid < 0) { - HDfprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", __func__, __LINE__); ret = FAIL; goto out; } status = H5Dwrite(oid, H5T_STD_REF_OBJ, H5S_ALL, H5S_ALL, H5P_DEFAULT, or_data); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -612,7 +612,7 @@ gen_region_ref(hid_t loc_id) sid = H5Screate_simple(2, dims2, NULL); if (sid < 0) { - HDfprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -620,7 +620,7 @@ gen_region_ref(hid_t loc_id) /* create normal dataset which is referred */ oid2 = H5Dcreate2(loc_id, REG_REF_DS2, H5T_STD_I8LE, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (oid2 < 0) { - HDfprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -628,7 +628,7 @@ gen_region_ref(hid_t loc_id) /* write values to dataset */ status = H5Dwrite(oid2, H5T_NATIVE_CHAR, H5S_ALL, H5S_ALL, H5P_DEFAULT, data); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -636,7 +636,7 @@ gen_region_ref(hid_t loc_id) /* select elements space for reference */ status = H5Sselect_elements(sid, H5S_SELECT_SET, 4, coords[0]); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Sselect_elements failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Sselect_elements failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -644,7 +644,7 @@ gen_region_ref(hid_t loc_id) /* create region reference from elements space */ status = H5Rcreate(&rr_data[0], loc_id, REG_REF_DS2, H5R_DATASET_REGION, sid); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -652,7 +652,7 @@ gen_region_ref(hid_t loc_id) /* select hyperslab space for reference */ status = H5Sselect_hyperslab(sid, H5S_SELECT_SET, start, stride, count, block); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Sselect_hyperslab failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Sselect_hyperslab failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -660,7 +660,7 @@ gen_region_ref(hid_t loc_id) /* create region reference from hyperslab space */ status = H5Rcreate(&rr_data[1], loc_id, REG_REF_DS2, H5R_DATASET_REGION, sid); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -670,7 +670,7 @@ gen_region_ref(hid_t loc_id) /* Create dataspace. */ sid = H5Screate_simple(1, dims1, NULL); if (sid < 0) { - HDfprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -678,7 +678,7 @@ gen_region_ref(hid_t loc_id) /* create region reference dataset */ oid1 = H5Dcreate2(loc_id, REG_REF_DS1, H5T_STD_REF_DSETREG, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (oid1 < 0) { - HDfprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -686,7 +686,7 @@ gen_region_ref(hid_t loc_id) /* write data as region references */ status = H5Dwrite(oid1, H5T_STD_REF_DSETREG, H5S_ALL, H5S_ALL, H5P_DEFAULT, rr_data); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -716,11 +716,11 @@ Test_Obj_Copy(void) unsigned new_format; /* New format or old format */ if ((fapl_new = H5Pcreate(H5P_FILE_ACCESS)) < 0) { - HDfprintf(stderr, "Error: H5Pcreate failed.\n"); + fprintf(stderr, "Error: H5Pcreate failed.\n"); goto out; } if (H5Pset_libver_bounds(fapl_new, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) { - HDfprintf(stderr, "Error: H5Pset_libver_bounds failed.\n"); + fprintf(stderr, "Error: H5Pset_libver_bounds failed.\n"); goto out; } @@ -734,7 +734,7 @@ Test_Obj_Copy(void) else fid = H5Fcreate(HDF_FILE1_NEW, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); if (fid < 0) { - HDfprintf(stderr, "Error: H5Fcreate failed.\n"); + fprintf(stderr, "Error: H5Fcreate failed.\n"); goto out; } @@ -772,19 +772,19 @@ Test_Ref_Copy(void) fid = H5Fcreate(HDF_FILE2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); if (fid < 0) { - HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", HDF_FILE2); + fprintf(stderr, "Error: %s> H5Fcreate failed.\n", HDF_FILE2); goto out; } /* add object reference */ status = gen_obj_ref(fid); if (status < 0) - HDfprintf(stderr, "Failed to generate object reference.\n"); + fprintf(stderr, "Failed to generate object reference.\n"); /* add region reference */ status = gen_region_ref(fid); if (status < 0) - HDfprintf(stderr, "Failed to generate region reference.\n"); + fprintf(stderr, "Failed to generate region reference.\n"); out: /*----------------------------------------------------------------------- @@ -815,7 +815,7 @@ gen_extlink_trg(hid_t loc_id) * target file */ gid = H5Gcreate2(loc_id, "group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (gid < 0) { - HDfprintf(stderr, "Error: %s %d> H5Gcreate2 failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Gcreate2 failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -830,7 +830,7 @@ gen_extlink_trg(hid_t loc_id) tid = H5Tcopy(H5T_NATIVE_INT); status = H5Tcommit2(loc_id, "datatype", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Tcommit2 failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Tcommit2 failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -863,7 +863,7 @@ gen_extlink_src(hid_t loc_id) *------------------------------------------------------------------------*/ gid = H5Gcreate2(loc_id, "/group_ext", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (gid < 0) { - HDfprintf(stderr, "Error: %s %d> H5Gcreate2 failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Gcreate2 failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -874,7 +874,7 @@ gen_extlink_src(hid_t loc_id) /* link to dataset */ status = H5Lcreate_external(HDF_EXT_TRG_FILE, "/simple", gid, "extlink_dset", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Lcreate_external failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Lcreate_external failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -882,7 +882,7 @@ gen_extlink_src(hid_t loc_id) /* link to group */ status = H5Lcreate_external(HDF_EXT_TRG_FILE, "/group", gid, "extlink_grp", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Lcreate_external failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Lcreate_external failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -891,7 +891,7 @@ gen_extlink_src(hid_t loc_id) status = H5Lcreate_external(HDF_EXT_TRG_FILE, "/datatype", gid, "extlink_datatype", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Lcreate_external failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Lcreate_external failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -899,7 +899,7 @@ gen_extlink_src(hid_t loc_id) /* dangling link - no obj*/ status = H5Lcreate_external(HDF_EXT_TRG_FILE, "notyet", gid, "extlink_notyet1", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Lcreate_external failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Lcreate_external failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -907,7 +907,7 @@ gen_extlink_src(hid_t loc_id) /* dangling link - no file */ status = H5Lcreate_external("notyet_file.h5", "notyet", gid, "extlink_notyet2", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Lcreate_external failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Lcreate_external failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -934,25 +934,25 @@ Test_Extlink_Copy(void) fid1 = H5Fcreate(HDF_EXT_SRC_FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); if (fid1 < 0) { - HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", HDF_EXT_SRC_FILE); + fprintf(stderr, "Error: %s> H5Fcreate failed.\n", HDF_EXT_SRC_FILE); goto out; } fid2 = H5Fcreate(HDF_EXT_TRG_FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); if (fid2 < 0) { - HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", HDF_EXT_TRG_FILE); + fprintf(stderr, "Error: %s> H5Fcreate failed.\n", HDF_EXT_TRG_FILE); goto out; } /* add links to source external link file */ status = gen_extlink_src(fid1); if (status < 0) - HDfprintf(stderr, "Error: %s> gen_extlink_src failed.\n", HDF_EXT_SRC_FILE); + fprintf(stderr, "Error: %s> gen_extlink_src failed.\n", HDF_EXT_SRC_FILE); /* add objs to target external link file */ status = gen_extlink_trg(fid2); if (status < 0) - HDfprintf(stderr, "Error: %s> gen_extlink_trg failed.\n", HDF_EXT_TRG_FILE); + fprintf(stderr, "Error: %s> gen_extlink_trg failed.\n", HDF_EXT_TRG_FILE); out: /*----------------------------------------------------------------------- diff --git a/tools/test/h5diff/h5diffgentest.c b/tools/test/h5diff/h5diffgentest.c index 58a8685..1700177 100644 --- a/tools/test/h5diff/h5diffgentest.c +++ b/tools/test/h5diff/h5diffgentest.c @@ -120,7 +120,7 @@ size_t H5TOOLS_MALLOCSIZE = (128 * 1024 * 1024); #define ONE_DIM_SIZE 16 /* Error macros */ -#define AT() HDprintf("ERROR at %s:%d in %s()...\n", __FILE__, __LINE__, __func__); +#define AT() printf("ERROR at %s:%d in %s()...\n", __FILE__, __LINE__, __func__); #define PROGRAM_ERROR \ do { \ AT(); \ @@ -1000,11 +1000,11 @@ test_basic(const char *fname1, const char *fname2, const char *fname3) /* create the empty file */ if ((fid1 = H5Fcreate(fname3, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - HDfprintf(stderr, "empty file (%s) creation failed.\n", fname3); + fprintf(stderr, "empty file (%s) creation failed.\n", fname3); goto out; } if (H5Fclose(fid1) < 0) { - HDfprintf(stderr, "empty file (%s) close failed.\n", fname3); + fprintf(stderr, "empty file (%s) close failed.\n", fname3); goto out; } @@ -1734,7 +1734,7 @@ test_attributes_verbose_level(const char *fname1, const char *fname2) * Create file1 *-----------------------------------------------------------------------*/ if ((fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1); status = FAIL; goto out; } @@ -1744,28 +1744,28 @@ test_attributes_verbose_level(const char *fname1, const char *fname2) */ f1_gid = H5Gcreate2(fid1, "g", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (f1_gid < 0) { - HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1); status = FAIL; goto out; } f1_gid2 = H5Gcreate2(fid1, "g2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (f1_gid2 < 0) { - HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1); status = FAIL; goto out; } f1_gid3 = H5Gcreate2(fid1, "g3", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (f1_gid3 < 0) { - HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1); status = FAIL; goto out; } f1_gid4 = H5Gcreate2(fid1, "g4", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (f1_gid4 < 0) { - HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2); + fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2); status = FAIL; goto out; } @@ -1776,13 +1776,13 @@ test_attributes_verbose_level(const char *fname1, const char *fname2) f1_sid = H5Screate_simple(1, dset_dims, NULL); f1_did = H5Dcreate2(fid1, "dset", H5T_NATIVE_INT, f1_sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (f1_did == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1); + fprintf(stderr, "Error: %s> write_dset failed\n", fname1); status = FAIL; goto out; } status = H5Dwrite(f1_did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset_data); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1); status = FAIL; goto out; } @@ -1793,7 +1793,7 @@ test_attributes_verbose_level(const char *fname1, const char *fname2) f1_tid = H5Tcopy(H5T_NATIVE_INT); status = H5Tcommit2(fid1, "ntype", f1_tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Tcommit2 failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Tcommit2 failed.\n", fname1); status = FAIL; goto out; } @@ -1802,7 +1802,7 @@ test_attributes_verbose_level(const char *fname1, const char *fname2) * Create file2 *-----------------------------------------------------------------------*/ if ((fid2 = H5Fcreate(fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2); + fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2); status = FAIL; goto out; } @@ -1812,28 +1812,28 @@ test_attributes_verbose_level(const char *fname1, const char *fname2) */ f2_gid = H5Gcreate2(fid2, "g", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (f2_gid < 0) { - HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2); + fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2); status = FAIL; goto out; } f2_gid2 = H5Gcreate2(fid2, "g2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (f2_gid2 < 0) { - HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2); + fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2); status = FAIL; goto out; } f2_gid3 = H5Gcreate2(fid2, "g3", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (f2_gid3 < 0) { - HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2); + fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2); status = FAIL; goto out; } f2_gid4 = H5Gcreate2(fid2, "g4", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (f2_gid4 < 0) { - HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2); + fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2); status = FAIL; goto out; } @@ -1844,13 +1844,13 @@ test_attributes_verbose_level(const char *fname1, const char *fname2) f2_sid = H5Screate_simple(1, dset_dims, NULL); f2_did = H5Dcreate2(fid2, "dset", H5T_NATIVE_INT, f2_sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (f2_did == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2); + fprintf(stderr, "Error: %s> write_dset failed\n", fname2); status = FAIL; goto out; } status = H5Dwrite(f2_did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset_data); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname2); + fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname2); status = FAIL; goto out; } @@ -1861,7 +1861,7 @@ test_attributes_verbose_level(const char *fname1, const char *fname2) f2_tid = H5Tcopy(H5T_NATIVE_INT); status = H5Tcommit2(fid2, "ntype", f2_tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Tcommit2 failed.\n", fname2); + fprintf(stderr, "Error: %s> H5Tcommit2 failed.\n", fname2); status = FAIL; goto out; } @@ -2093,7 +2093,7 @@ test_link_name(const char *fname1) *------------------------------------------------------------------------*/ fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); if (fid1 < 0) { - HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1); status = FAIL; goto out; } @@ -2103,14 +2103,14 @@ test_link_name(const char *fname1) *------------------------------------------------------------------------*/ gid1 = H5Gcreate2(fid1, "group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (gid1 < 0) { - HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1); status = FAIL; goto out; } gid2 = H5Gcreate2(fid1, "group_longname", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (gid2 < 0) { - HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1); status = FAIL; goto out; } @@ -2120,14 +2120,14 @@ test_link_name(const char *fname1) *------------------------------------------------------------------------*/ status = H5Lcreate_soft("group", fid1, "link_g1", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); status = FAIL; goto out; } status = H5Lcreate_soft("group_longname", fid1, "link_g2", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); status = FAIL; goto out; } @@ -2168,7 +2168,7 @@ test_soft_links(const char *fname1) *------------------------------------------------------------------------*/ fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); if (fid1 < 0) { - HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1); status = FAIL; goto out; } @@ -2178,7 +2178,7 @@ test_soft_links(const char *fname1) *------------------------------------------------------------------------*/ gid1 = H5Gcreate2(fid1, "target_group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (gid1 < 0) { - HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1); status = FAIL; goto out; } @@ -2189,21 +2189,21 @@ test_soft_links(const char *fname1) /* file1 */ status = write_dset(fid1, 2, dims2, "target_dset1", H5T_NATIVE_INT, data1); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1); + fprintf(stderr, "Error: %s> write_dset failed\n", fname1); status = FAIL; goto out; } status = write_dset(fid1, 2, dims2, "target_dset2", H5T_NATIVE_INT, data2); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1); + fprintf(stderr, "Error: %s> write_dset failed\n", fname1); status = FAIL; goto out; } status = write_dset(gid1, 2, dims2, "dset", H5T_NATIVE_INT, data1); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1); + fprintf(stderr, "Error: %s> write_dset failed\n", fname1); status = FAIL; goto out; } @@ -2214,42 +2214,42 @@ test_soft_links(const char *fname1) /* file 1 */ status = H5Lcreate_soft("/target_dset1", fid1, "softlink_dset1_1", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); status = FAIL; goto out; } status = H5Lcreate_soft("/target_dset1", fid1, "softlink_dset1_2", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); status = FAIL; goto out; } status = H5Lcreate_soft("/target_dset2", fid1, "softlink_dset2", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); status = FAIL; goto out; } status = H5Lcreate_soft("/target_group", fid1, "softlink_group1", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); status = FAIL; goto out; } status = H5Lcreate_soft("/target_group", fid1, "softlink_group2", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); status = FAIL; goto out; } status = H5Lcreate_soft("/no_obj", fid1, "softlink_noexist", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); status = FAIL; goto out; } @@ -2290,7 +2290,7 @@ test_linked_softlinks(const char *fname1) *------------------------------------------------------------------------*/ fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); if (fid1 < 0) { - HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1); status = FAIL; goto out; } @@ -2300,21 +2300,21 @@ test_linked_softlinks(const char *fname1) *------------------------------------------------------------------------*/ gid1 = H5Gcreate2(fid1, "target_group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (gid1 < 0) { - HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1); status = FAIL; goto out; } gid2 = H5Gcreate2(fid1, "target_group1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (gid2 < 0) { - HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1); status = FAIL; goto out; } gid3 = H5Gcreate2(fid1, "target_group2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (gid3 < 0) { - HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1); status = FAIL; goto out; } @@ -2325,20 +2325,20 @@ test_linked_softlinks(const char *fname1) /* file1 */ status = write_dset(fid1, 2, dims2, "target_dset1", H5T_NATIVE_INT, data1); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1); + fprintf(stderr, "Error: %s> write_dset failed\n", fname1); status = FAIL; goto out; } status = write_dset(fid1, 2, dims2, "target_dset2", H5T_NATIVE_INT, data2); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1); + fprintf(stderr, "Error: %s> write_dset failed\n", fname1); status = FAIL; goto out; } status = write_dset(gid1, 2, dims2, "dset", H5T_NATIVE_INT, data1); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1); + fprintf(stderr, "Error: %s> write_dset failed\n", fname1); status = FAIL; goto out; } @@ -2350,84 +2350,84 @@ test_linked_softlinks(const char *fname1) * file 1 */ status = H5Lcreate_soft("/target_dset1", fid1, "softlink1_to_dset1", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); status = FAIL; goto out; } status = H5Lcreate_soft("softlink1_to_dset1", fid1, "softlink1_to_slink1", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); status = FAIL; goto out; } status = H5Lcreate_soft("softlink1_to_slink1", fid1, "softlink1_to_slink2", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); status = FAIL; goto out; } status = H5Lcreate_soft("/target_dset2", fid1, "softlink2_to_dset2", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); status = FAIL; goto out; } status = H5Lcreate_soft("softlink2_to_dset2", fid1, "softlink2_to_slink1", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); status = FAIL; goto out; } status = H5Lcreate_soft("softlink2_to_slink1", fid1, "softlink2_to_slink2", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); status = FAIL; goto out; } status = H5Lcreate_soft("target_group1", fid1, "softlink3_to_group1", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); status = FAIL; goto out; } status = H5Lcreate_soft("softlink3_to_group1", fid1, "softlink3_to_slink1", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); status = FAIL; goto out; } status = H5Lcreate_soft("softlink3_to_slink1", fid1, "softlink3_to_slink2", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); status = FAIL; goto out; } status = H5Lcreate_soft("target_group2", fid1, "softlink4_to_group2", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); status = FAIL; goto out; } status = H5Lcreate_soft("softlink4_to_group2", fid1, "softlink4_to_slink1", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); status = FAIL; goto out; } status = H5Lcreate_soft("softlink4_to_slink1", fid1, "softlink4_to_slink2", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); status = FAIL; goto out; } @@ -2473,7 +2473,7 @@ test_external_links(const char *fname1, const char *fname2) /* source file */ fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); if (fid1 < 0) { - HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1); status = FAIL; goto out; } @@ -2481,7 +2481,7 @@ test_external_links(const char *fname1, const char *fname2) /* target file */ fid2 = H5Fcreate(fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); if (fid2 < 0) { - HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2); + fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2); status = FAIL; goto out; } @@ -2493,14 +2493,14 @@ test_external_links(const char *fname1, const char *fname2) * target file */ gid1 = H5Gcreate2(fid2, "target_group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (gid1 < 0) { - HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2); + fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2); status = FAIL; goto out; } gid2 = H5Gcreate2(fid2, "target_group2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (gid2 < 0) { - HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2); + fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2); status = FAIL; goto out; } @@ -2511,21 +2511,21 @@ test_external_links(const char *fname1, const char *fname2) * target file */ status = write_dset(fid2, 2, dims2, "target_dset1", H5T_NATIVE_INT, data1); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2); + fprintf(stderr, "Error: %s> write_dset failed\n", fname2); status = FAIL; goto out; } status = write_dset(gid1, 2, dims2, "x_dset", H5T_NATIVE_INT, data1); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2); + fprintf(stderr, "Error: %s> write_dset failed\n", fname2); status = FAIL; goto out; } status = write_dset(gid2, 2, dims2, "x_dset", H5T_NATIVE_INT, data2); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2); + fprintf(stderr, "Error: %s> write_dset failed\n", fname2); status = FAIL; goto out; } @@ -2538,7 +2538,7 @@ test_external_links(const char *fname1, const char *fname2) status = H5Lcreate_external(fname2, "/target_group/x_dset", fid1, "ext_link_dset1", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1); status = FAIL; goto out; } @@ -2546,35 +2546,35 @@ test_external_links(const char *fname1, const char *fname2) status = H5Lcreate_external(fname2, "/target_group2/x_dset", fid1, "ext_link_dset2", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1); status = FAIL; goto out; } status = H5Lcreate_external(fname2, "/target_group", fid1, "/ext_link_grp1", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1); status = FAIL; goto out; } status = H5Lcreate_external(fname2, "/target_group2", fid1, "/ext_link_grp2", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1); status = FAIL; goto out; } status = H5Lcreate_external(fname2, "no_obj", fid1, "ext_link_noexist1", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1); status = FAIL; goto out; } status = H5Lcreate_external("no_file.h5", "no_obj", fid1, "ext_link_noexist2", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1); status = FAIL; goto out; } @@ -2620,7 +2620,7 @@ test_ext2soft_links(const char *fname1, const char *fname2) /* source file */ fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); if (fid1 < 0) { - HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1); status = FAIL; goto out; } @@ -2628,7 +2628,7 @@ test_ext2soft_links(const char *fname1, const char *fname2) /* target file */ fid2 = H5Fcreate(fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); if (fid2 < 0) { - HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2); + fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2); status = FAIL; goto out; } @@ -2639,7 +2639,7 @@ test_ext2soft_links(const char *fname1, const char *fname2) /* target file */ gid2 = H5Gcreate2(fid2, "target_group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (gid2 < 0) { - HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2); + fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2); status = FAIL; goto out; } @@ -2651,14 +2651,14 @@ test_ext2soft_links(const char *fname1, const char *fname2) * target file */ status = write_dset(fid2, 2, dims2, "dset1", H5T_NATIVE_INT, data2); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2); + fprintf(stderr, "Error: %s> write_dset failed\n", fname2); status = FAIL; goto out; } status = write_dset(fid2, 2, dims2, "dset2", H5T_NATIVE_INT, data1); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2); + fprintf(stderr, "Error: %s> write_dset failed\n", fname2); status = FAIL; goto out; } @@ -2670,14 +2670,14 @@ test_ext2soft_links(const char *fname1, const char *fname2) * target file */ status = H5Lcreate_soft("/dset1", fid2, "softlink_to_dset1", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2); + fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2); status = FAIL; goto out; } status = H5Lcreate_soft("/dset2", fid2, "softlink_to_dset2", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2); + fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2); status = FAIL; goto out; } @@ -2689,7 +2689,7 @@ test_ext2soft_links(const char *fname1, const char *fname2) * source file */ status = H5Lcreate_external(fname2, "/target_group", fid1, "ext_link", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1); status = FAIL; goto out; } @@ -2697,7 +2697,7 @@ test_ext2soft_links(const char *fname1, const char *fname2) status = H5Lcreate_external(fname2, "/softlink_to_dset1", fid1, "ext_link_to_slink1", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1); status = FAIL; goto out; } @@ -2705,7 +2705,7 @@ test_ext2soft_links(const char *fname1, const char *fname2) status = H5Lcreate_external(fname2, "/softlink_to_dset2", fid1, "ext_link_to_slink2", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1); status = FAIL; goto out; } @@ -2838,14 +2838,14 @@ test_dangle_links(const char *fname1, const char *fname2) *------------------------------------------------------------------------*/ fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); if (fid1 < 0) { - HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1); status = FAIL; goto out; } fid2 = H5Fcreate(fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); if (fid2 < 0) { - HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2); + fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2); status = FAIL; goto out; } @@ -2856,14 +2856,14 @@ test_dangle_links(const char *fname1, const char *fname2) /* file1 */ status = write_dset(fid1, 2, dims2, "dset1", H5T_NATIVE_INT, data1); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1); + fprintf(stderr, "Error: %s> write_dset failed\n", fname1); status = FAIL; goto out; } status = write_dset(fid1, 2, dims2, "dset2", H5T_NATIVE_INT, data2); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1); + fprintf(stderr, "Error: %s> write_dset failed\n", fname1); status = FAIL; goto out; } @@ -2871,14 +2871,14 @@ test_dangle_links(const char *fname1, const char *fname2) /* file2 */ status = write_dset(fid2, 2, dims2, "dset1", H5T_NATIVE_INT, data1); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2); + fprintf(stderr, "Error: %s> write_dset failed\n", fname2); status = FAIL; goto out; } status = write_dset(fid2, 2, dims2, "dset2", H5T_NATIVE_INT, data2); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2); + fprintf(stderr, "Error: %s> write_dset failed\n", fname2); status = FAIL; goto out; } @@ -2889,28 +2889,28 @@ test_dangle_links(const char *fname1, const char *fname2) /* file 1 */ status = H5Lcreate_soft("no_obj", fid1, "soft_link1", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); status = FAIL; goto out; } status = H5Lcreate_soft("/dset1", fid1, "soft_link2", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); status = FAIL; goto out; } status = H5Lcreate_soft("no_obj", fid1, "soft_link3", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); status = FAIL; goto out; } status = H5Lcreate_soft("no_obj1", fid1, "soft_link4", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); status = FAIL; goto out; } @@ -2918,28 +2918,28 @@ test_dangle_links(const char *fname1, const char *fname2) /* file 2 */ status = H5Lcreate_soft("no_obj", fid2, "soft_link1", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2); + fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2); status = FAIL; goto out; } status = H5Lcreate_soft("no_obj", fid2, "soft_link2", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2); + fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2); status = FAIL; goto out; } status = H5Lcreate_soft("/dset2", fid2, "soft_link3", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2); + fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2); status = FAIL; goto out; } status = H5Lcreate_soft("no_obj2", fid2, "soft_link4", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2); + fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2); status = FAIL; goto out; } @@ -2950,28 +2950,28 @@ test_dangle_links(const char *fname1, const char *fname2) /* file1 */ status = H5Lcreate_external(fname2, "no_obj", fid1, "ext_link1", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1); status = FAIL; goto out; } status = H5Lcreate_external(fname2, "/dset1", fid1, "ext_link2", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1); status = FAIL; goto out; } status = H5Lcreate_external(fname2, "no_obj", fid1, "ext_link3", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1); status = FAIL; goto out; } status = H5Lcreate_external("no_file.h5", "no_obj", fid1, "ext_link4", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1); status = FAIL; goto out; } @@ -2979,28 +2979,28 @@ test_dangle_links(const char *fname1, const char *fname2) /* file2 */ status = H5Lcreate_external(fname1, "no_obj", fid2, "ext_link1", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2); + fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2); status = FAIL; goto out; } status = H5Lcreate_external(fname1, "no_obj", fid2, "ext_link2", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2); + fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2); status = FAIL; goto out; } status = H5Lcreate_external(fname1, "/dset2", fid2, "ext_link3", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2); + fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2); status = FAIL; goto out; } status = H5Lcreate_external("no_file.h5", "no_obj", fid2, "ext_link4", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2); + fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2); status = FAIL; goto out; } @@ -3044,14 +3044,14 @@ test_group_recurse(const char *fname1, const char *fname2) *------------------------------------------------------------------------*/ fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); if (fid1 < 0) { - HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1); status = FAIL; goto out; } fid2 = H5Fcreate(fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); if (fid2 < 0) { - HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2); + fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2); status = FAIL; goto out; } @@ -3062,28 +3062,28 @@ test_group_recurse(const char *fname1, const char *fname2) /* file1 */ gid1_f1 = H5Gcreate2(fid1, "/grp1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (gid1_f1 < 0) { - HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1); status = FAIL; goto out; } gid2_f1 = H5Gcreate2(fid1, "/grp1/grp2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (gid2_f1 < 0) { - HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1); status = FAIL; goto out; } gid3_f1 = H5Gcreate2(fid1, "/grp1/grp2/grp3", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (gid3_f1 < 0) { - HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1); status = FAIL; goto out; } gid10_f1 = H5Gcreate2(fid1, "/grp10", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (gid10_f1 < 0) { - HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1); status = FAIL; goto out; } @@ -3091,28 +3091,28 @@ test_group_recurse(const char *fname1, const char *fname2) /* file2 */ gid1_f2 = H5Gcreate2(fid2, "/grp1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (gid1_f2 < 0) { - HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2); + fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2); status = FAIL; goto out; } gid2_f2 = H5Gcreate2(fid2, "/grp1/grp2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (gid2_f2 < 0) { - HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2); + fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2); status = FAIL; goto out; } gid3_f2 = H5Gcreate2(fid2, "/grp1/grp2/grp3", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (gid3_f2 < 0) { - HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2); + fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2); status = FAIL; goto out; } gid11_f2 = H5Gcreate2(fid2, "/grp11", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (gid11_f2 < 0) { - HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2); + fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2); status = FAIL; goto out; } @@ -3123,21 +3123,21 @@ test_group_recurse(const char *fname1, const char *fname2) /* file1 */ status = write_dset(fid1, 2, dims2, "dset1", H5T_NATIVE_INT, data1); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1); + fprintf(stderr, "Error: %s> write_dset failed\n", fname1); status = FAIL; goto out; } status = write_dset(fid1, 2, dims2, "dset2", H5T_NATIVE_INT, data2); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1); + fprintf(stderr, "Error: %s> write_dset failed\n", fname1); status = FAIL; goto out; } status = write_dset(fid1, 2, dims2, "dset3", H5T_NATIVE_INT, data3); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1); + fprintf(stderr, "Error: %s> write_dset failed\n", fname1); status = FAIL; goto out; } @@ -3145,21 +3145,21 @@ test_group_recurse(const char *fname1, const char *fname2) /* file2 */ status = write_dset(fid2, 2, dims2, "dset1", H5T_NATIVE_INT, data1); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2); + fprintf(stderr, "Error: %s> write_dset failed\n", fname2); status = FAIL; goto out; } status = write_dset(fid2, 2, dims2, "dset2", H5T_NATIVE_INT, data2); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2); + fprintf(stderr, "Error: %s> write_dset failed\n", fname2); status = FAIL; goto out; } status = write_dset(fid2, 2, dims2, "dset3", H5T_NATIVE_INT, data3); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2); + fprintf(stderr, "Error: %s> write_dset failed\n", fname2); status = FAIL; goto out; } @@ -3170,54 +3170,54 @@ test_group_recurse(const char *fname1, const char *fname2) /* file1 */ status = write_dset(gid1_f1, 2, dims2, "dset1", H5T_NATIVE_INT, data1); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1); + fprintf(stderr, "Error: %s> write_dset failed\n", fname1); status = FAIL; goto out; } status = write_dset(gid2_f1, 2, dims2, "dset1", H5T_NATIVE_INT, data1); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1); + fprintf(stderr, "Error: %s> write_dset failed\n", fname1); status = FAIL; goto out; } status = write_dset(gid2_f1, 2, dims2, "dset2", H5T_NATIVE_INT, data2); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1); + fprintf(stderr, "Error: %s> write_dset failed\n", fname1); status = FAIL; goto out; } status = write_dset(gid3_f1, 2, dims2, "dset1", H5T_NATIVE_INT, data1); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1); + fprintf(stderr, "Error: %s> write_dset failed\n", fname1); status = FAIL; goto out; } status = write_dset(gid3_f1, 2, dims2, "dset2", H5T_NATIVE_INT, data2); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1); + fprintf(stderr, "Error: %s> write_dset failed\n", fname1); status = FAIL; goto out; } status = write_dset(gid3_f1, 2, dims2, "dset3", H5T_NATIVE_INT, data3); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1); + fprintf(stderr, "Error: %s> write_dset failed\n", fname1); status = FAIL; goto out; } status = write_dset(gid10_f1, 2, dims2, "dset4", H5T_NATIVE_INT, data1); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1); + fprintf(stderr, "Error: %s> write_dset failed\n", fname1); status = FAIL; goto out; } status = write_dset(gid10_f1, 2, dims2, "dset5", H5T_NATIVE_INT, data3); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1); + fprintf(stderr, "Error: %s> write_dset failed\n", fname1); status = FAIL; goto out; } @@ -3225,54 +3225,54 @@ test_group_recurse(const char *fname1, const char *fname2) /* file2 */ status = write_dset(gid1_f2, 2, dims2, "dset1", H5T_NATIVE_INT, data1); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2); + fprintf(stderr, "Error: %s> write_dset failed\n", fname2); status = FAIL; goto out; } status = write_dset(gid2_f2, 2, dims2, "dset1", H5T_NATIVE_INT, data1); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2); + fprintf(stderr, "Error: %s> write_dset failed\n", fname2); status = FAIL; goto out; } status = write_dset(gid2_f2, 2, dims2, "dset2", H5T_NATIVE_INT, data2); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2); + fprintf(stderr, "Error: %s> write_dset failed\n", fname2); status = FAIL; goto out; } status = write_dset(gid3_f2, 2, dims2, "dset1", H5T_NATIVE_INT, data1); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2); + fprintf(stderr, "Error: %s> write_dset failed\n", fname2); status = FAIL; goto out; } status = write_dset(gid3_f2, 2, dims2, "dset2", H5T_NATIVE_INT, data2); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2); + fprintf(stderr, "Error: %s> write_dset failed\n", fname2); status = FAIL; goto out; } status = write_dset(gid3_f2, 2, dims2, "dset3", H5T_NATIVE_INT, data3); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2); + fprintf(stderr, "Error: %s> write_dset failed\n", fname2); status = FAIL; goto out; } status = write_dset(gid11_f2, 2, dims2, "dset4", H5T_NATIVE_INT, data1); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2); + fprintf(stderr, "Error: %s> write_dset failed\n", fname2); status = FAIL; goto out; } status = write_dset(gid11_f2, 2, dims2, "dset5", H5T_NATIVE_INT, data2); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2); + fprintf(stderr, "Error: %s> write_dset failed\n", fname2); status = FAIL; goto out; } @@ -3283,28 +3283,28 @@ test_group_recurse(const char *fname1, const char *fname2) /* file 1 */ status = H5Lcreate_soft("/grp1", fid1, "slink_grp1", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); status = FAIL; goto out; } status = H5Lcreate_soft("/grp1/grp2", fid1, "slink_grp2", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); status = FAIL; goto out; } status = H5Lcreate_soft("/grp1/grp2/grp3", fid1, "slink_grp3", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); status = FAIL; goto out; } status = H5Lcreate_soft("/grp10", fid1, "slink_grp10", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname1); status = FAIL; goto out; } @@ -3312,28 +3312,28 @@ test_group_recurse(const char *fname1, const char *fname2) /* file 2 */ status = H5Lcreate_soft("/grp1", fid2, "slink_grp1", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2); + fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2); status = FAIL; goto out; } status = H5Lcreate_soft("/grp1/grp2", fid2, "slink_grp2", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2); + fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2); status = FAIL; goto out; } status = H5Lcreate_soft("/grp1/grp2/grp3", fid2, "slink_grp3", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2); + fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2); status = FAIL; goto out; } status = H5Lcreate_soft("/grp11", fid2, "slink_grp11", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2); + fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", fname2); status = FAIL; goto out; } @@ -3344,21 +3344,21 @@ test_group_recurse(const char *fname1, const char *fname2) /* file1 */ status = H5Lcreate_external(fname2, "/grp1", fid1, "elink_grp1", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1); status = FAIL; goto out; } status = H5Lcreate_external(fname2, "/grp1/grp2", fid1, "elink_grp2", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1); status = FAIL; goto out; } status = H5Lcreate_external(fname2, "/grp1/grp2/grp3", fid1, "elink_grp3", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1); status = FAIL; goto out; } @@ -3366,21 +3366,21 @@ test_group_recurse(const char *fname1, const char *fname2) /* file2 */ status = H5Lcreate_external(fname1, "/grp1", fid2, "elink_grp1", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2); + fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2); status = FAIL; goto out; } status = H5Lcreate_external(fname1, "/grp1/grp2", fid2, "elink_grp2", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2); + fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2); status = FAIL; goto out; } status = H5Lcreate_external(fname1, "/grp1/grp2/grp3", fid2, "elink_grp3", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2); + fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2); status = FAIL; goto out; } @@ -3392,14 +3392,14 @@ test_group_recurse(const char *fname1, const char *fname2) /* file1 */ status = H5Lcreate_external(fname2, "/grp11", gid10_f1, "elink_grp_circle", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname1); status = FAIL; goto out; } /* file2 */ status = H5Lcreate_external(fname1, "/grp10", gid11_f2, "elink_grp_circle", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2); + fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", fname2); status = FAIL; goto out; } @@ -3474,28 +3474,28 @@ test_group_recurse2(void) *------------------------------------------------------------------------*/ grp1 = H5Gcreate2(fileid1, "/g1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (grp1 < 0) { - HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE1_EXT); + fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE1_EXT); status = FAIL; goto out; } grp2 = H5Gcreate2(grp1, "g2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (grp2 < 0) { - HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE1_EXT); + fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE1_EXT); status = FAIL; goto out; } grp3 = H5Gcreate2(grp2, "g3", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (grp3 < 0) { - HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE1_EXT); + fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE1_EXT); status = FAIL; goto out; } grp4 = H5Gcreate2(grp3, "g4", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (grp4 < 0) { - HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE1_EXT); + fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE1_EXT); status = FAIL; goto out; } @@ -3570,7 +3570,7 @@ test_group_recurse2(void) /* link to dset1 */ status = H5Lcreate_soft(GRP_R_DSETNAME1, fileid1, "soft_dset1", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", GRP_RECURSE1_EXT); + fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", GRP_RECURSE1_EXT); status = FAIL; goto out; } @@ -3594,7 +3594,7 @@ test_group_recurse2(void) */ grp4 = H5Gcreate2(fileid4, "/g4", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (grp4 < 0) { - HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE2_EXT3); + fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE2_EXT3); status = FAIL; goto out; } @@ -3628,14 +3628,14 @@ test_group_recurse2(void) */ grp2 = H5Gcreate2(fileid3, "g2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (grp2 < 0) { - HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE2_EXT2); + fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE2_EXT2); status = FAIL; goto out; } grp3 = H5Gcreate2(grp2, "g3", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (grp3 < 0) { - HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE2_EXT2); + fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE2_EXT2); status = FAIL; goto out; } @@ -3659,7 +3659,7 @@ test_group_recurse2(void) */ status = H5Lcreate_external(GRP_RECURSE2_EXT3, "/g4", fileid3, "/g2/g3/g4", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", GRP_RECURSE2_EXT2); + fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", GRP_RECURSE2_EXT2); status = FAIL; goto out; } @@ -3680,7 +3680,7 @@ test_group_recurse2(void) */ grp1 = H5Gcreate2(fileid2, "g1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (grp1 < 0) { - HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE1_EXT); + fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", GRP_RECURSE1_EXT); status = FAIL; goto out; } @@ -3704,7 +3704,7 @@ test_group_recurse2(void) /* link to dset1 */ status = H5Lcreate_soft(GRP_R_DSETNAME1, fileid2, "soft_dset1", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", GRP_RECURSE2_EXT1); + fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", GRP_RECURSE2_EXT1); status = FAIL; goto out; } @@ -3714,7 +3714,7 @@ test_group_recurse2(void) */ status = H5Lcreate_external(GRP_RECURSE2_EXT2, "/g2", fileid2, "/g1/g2", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", GRP_RECURSE2_EXT1); + fprintf(stderr, "Error: %s> H5Lcreate_external failed.\n", GRP_RECURSE2_EXT1); status = FAIL; goto out; } @@ -3768,14 +3768,14 @@ test_exclude_obj1(const char *fname1, const char *fname2) *------------------------------------------------------------------------*/ fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); if (fid1 < 0) { - HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1); status = FAIL; goto out; } fid2 = H5Fcreate(fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); if (fid2 < 0) { - HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2); + fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2); status = FAIL; goto out; } @@ -3786,7 +3786,7 @@ test_exclude_obj1(const char *fname1, const char *fname2) /* file1 */ gid1 = H5Gcreate2(fid1, "group1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (gid1 < 0) { - HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1); status = FAIL; goto out; } @@ -3795,7 +3795,7 @@ test_exclude_obj1(const char *fname1, const char *fname2) gid2 = H5Gcreate2(fid2, "group1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (gid2 < 0) { - HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2); + fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2); status = FAIL; goto out; } @@ -3806,21 +3806,21 @@ test_exclude_obj1(const char *fname1, const char *fname2) /* file1 */ status = write_dset(fid1, 2, dims2, "dset1", H5T_NATIVE_INT, data1); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1); + fprintf(stderr, "Error: %s> write_dset failed\n", fname1); status = FAIL; goto out; } status = write_dset(gid1, 2, dims2, "dset2", H5T_NATIVE_INT, data1); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1); + fprintf(stderr, "Error: %s> write_dset failed\n", fname1); status = FAIL; goto out; } status = write_dset(gid1, 2, dims2, "dset3", H5T_NATIVE_INT, data1); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1); + fprintf(stderr, "Error: %s> write_dset failed\n", fname1); status = FAIL; goto out; } @@ -3828,21 +3828,21 @@ test_exclude_obj1(const char *fname1, const char *fname2) /* file2 */ status = write_dset(fid2, 2, dims2, "dset1", H5T_NATIVE_INT, data1); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2); + fprintf(stderr, "Error: %s> write_dset failed\n", fname2); status = FAIL; goto out; } status = write_dset(gid2, 2, dims2, "dset2", H5T_NATIVE_INT, data1); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2); + fprintf(stderr, "Error: %s> write_dset failed\n", fname2); status = FAIL; goto out; } status = write_dset(gid2, 2, dims2, "dset3", H5T_NATIVE_INT, data2); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2); + fprintf(stderr, "Error: %s> write_dset failed\n", fname2); status = FAIL; goto out; } @@ -3890,14 +3890,14 @@ test_exclude_obj2(const char *fname1, const char *fname2) *------------------------------------------------------------------------*/ fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); if (fid1 < 0) { - HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1); status = FAIL; goto out; } fid2 = H5Fcreate(fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); if (fid2 < 0) { - HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2); + fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2); status = FAIL; goto out; } @@ -3908,7 +3908,7 @@ test_exclude_obj2(const char *fname1, const char *fname2) /* file1 */ gid1 = H5Gcreate2(fid1, "group10", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (gid1 < 0) { - HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1); status = FAIL; goto out; } @@ -3916,7 +3916,7 @@ test_exclude_obj2(const char *fname1, const char *fname2) /* file2 */ gid2 = H5Gcreate2(fid2, "group10", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (gid2 < 0) { - HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2); + fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2); status = FAIL; goto out; } @@ -3925,7 +3925,7 @@ test_exclude_obj2(const char *fname1, const char *fname2) gid3 = H5Gcreate2(fid2, "group1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (gid3 < 0) { - HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2); + fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname2); status = FAIL; goto out; } @@ -3936,21 +3936,21 @@ test_exclude_obj2(const char *fname1, const char *fname2) /* file1 */ status = write_dset(fid1, 2, dims2, "dset10", H5T_NATIVE_INT, data1); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1); + fprintf(stderr, "Error: %s> write_dset failed\n", fname1); status = FAIL; goto out; } status = write_dset(fid1, 2, dims2, "dset1", H5T_NATIVE_INT, data1); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1); + fprintf(stderr, "Error: %s> write_dset failed\n", fname1); status = FAIL; goto out; } status = write_dset(gid1, 2, dims2, "dset2", H5T_NATIVE_INT, data1); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1); + fprintf(stderr, "Error: %s> write_dset failed\n", fname1); status = FAIL; goto out; } @@ -3958,21 +3958,21 @@ test_exclude_obj2(const char *fname1, const char *fname2) /* file2 */ status = write_dset(fid2, 2, dims2, "dset10", H5T_NATIVE_INT, data1); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2); + fprintf(stderr, "Error: %s> write_dset failed\n", fname2); status = FAIL; goto out; } status = write_dset(gid2, 2, dims2, "dset2", H5T_NATIVE_INT, data1); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2); + fprintf(stderr, "Error: %s> write_dset failed\n", fname2); status = FAIL; goto out; } status = write_dset(gid3, 2, dims2, "dset3", H5T_NATIVE_INT, data2); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2); + fprintf(stderr, "Error: %s> write_dset failed\n", fname2); status = FAIL; goto out; } @@ -4019,14 +4019,14 @@ test_exclude_obj3(const char *fname1, const char *fname2) *------------------------------------------------------------------------*/ fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); if (fid1 < 0) { - HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1); status = FAIL; goto out; } fid2 = H5Fcreate(fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); if (fid2 < 0) { - HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2); + fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2); status = FAIL; goto out; } @@ -4037,7 +4037,7 @@ test_exclude_obj3(const char *fname1, const char *fname2) /* file1 */ gid1 = H5Gcreate2(fid1, "group1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (gid1 < 0) { - HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1); status = FAIL; goto out; } @@ -4048,14 +4048,14 @@ test_exclude_obj3(const char *fname1, const char *fname2) /* file1 */ status = write_dset(fid1, 2, dims2, "dset1", H5T_NATIVE_INT, data1); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1); + fprintf(stderr, "Error: %s> write_dset failed\n", fname1); status = FAIL; goto out; } status = write_dset(gid1, 2, dims2, "dset", H5T_NATIVE_INT, data1); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname1); + fprintf(stderr, "Error: %s> write_dset failed\n", fname1); status = FAIL; goto out; } @@ -4063,7 +4063,7 @@ test_exclude_obj3(const char *fname1, const char *fname2) /* file2 */ status = write_dset(fid2, 2, dims2, "dset1", H5T_NATIVE_INT, data1); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname2); + fprintf(stderr, "Error: %s> write_dset failed\n", fname2); status = FAIL; goto out; } @@ -4374,7 +4374,7 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new if (is_file_new == 1) { fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); if (fid1 < 0) { - HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1); status = FAIL; goto out; } @@ -4382,7 +4382,7 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new else { fid1 = H5Fopen(fname1, H5F_ACC_RDWR, H5P_DEFAULT); if (fid1 < 0) { - HDfprintf(stderr, "Error: %s> H5Fopen failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Fopen failed.\n", fname1); status = FAIL; goto out; } @@ -4393,7 +4393,7 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new *------------------------------------------------------------------------*/ gid = H5Gcreate2(fid1, grp_name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (gid < 0) { - HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname1); status = FAIL; goto out; } @@ -4403,7 +4403,7 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new *------------------------------------------------------------------------*/ sid_vlen_str = H5Screate_simple(STR_RANK, dims_vlen_str, NULL); if (sid_vlen_str < 0) { - HDfprintf(stderr, "Error: %s> H5Screate_simple failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Screate_simple failed.\n", fname1); status = FAIL; goto out; } @@ -4411,7 +4411,7 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new tid_vlen_str = H5Tcopy(H5T_C_S1); status = H5Tset_size(tid_vlen_str, H5T_VARIABLE); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Tset_size failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Tset_size failed.\n", fname1); status = FAIL; goto out; } @@ -4421,7 +4421,7 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new *------------------------------------------------------------------------*/ sid_fixlen_str = H5Screate_simple(STR_RANK, dims_fixlen_str, NULL); if (sid_fixlen_str < 0) { - HDfprintf(stderr, "Error: %s> H5Screate_simple failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Screate_simple failed.\n", fname1); status = FAIL; goto out; } @@ -4429,7 +4429,7 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new tid_fixlen_str = H5Tcopy(H5T_C_S1); status = H5Tset_size(tid_fixlen_str, FIXLEN_STR_SIZE); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Tset_size failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Tset_size failed.\n", fname1); status = FAIL; goto out; } @@ -4439,7 +4439,7 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new *------------------------------------------------------------------------*/ sid_vlen_str_array = H5Screate_simple(STR_RANK, dims_vlen_str_array, NULL); if (sid_vlen_str_array < 0) { - HDfprintf(stderr, "Error: %s> H5Screate_simple failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Screate_simple failed.\n", fname1); status = FAIL; goto out; } @@ -4447,7 +4447,7 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new tid_vlen_str_array_pre = H5Tcopy(H5T_C_S1); status = H5Tset_size(tid_vlen_str_array_pre, H5T_VARIABLE); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Tset_size failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Tset_size failed.\n", fname1); status = FAIL; goto out; } @@ -4455,7 +4455,7 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new /* Create the array data type for the string array */ tid_vlen_str_array = H5Tarray_create2(tid_vlen_str_array_pre, COMP_RANK, dims_vlen_str_array); if (tid_vlen_str_array < 0) { - HDfprintf(stderr, "Error: %s> H5Tarray_create2 failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Tarray_create2 failed.\n", fname1); status = FAIL; goto out; } @@ -4465,7 +4465,7 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new *------------------------------------------------------------------------*/ sid_fixlen_str_array = H5Screate_simple(STR_RANK, dims_fixlen_str_array, NULL); if (sid_fixlen_str_array < 0) { - HDfprintf(stderr, "Error: %s> H5Screate_simple failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Screate_simple failed.\n", fname1); status = FAIL; goto out; } @@ -4473,14 +4473,14 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new tid_fixlen_str_array_pre = H5Tcopy(H5T_C_S1); status = H5Tset_size(tid_fixlen_str_array_pre, FIXLEN_STR_ARRY_SIZE); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Tset_size failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Tset_size failed.\n", fname1); status = FAIL; goto out; } /* Create the array data type for the string array */ tid_fixlen_str_array = H5Tarray_create2(tid_fixlen_str_array_pre, COMP_RANK, dims_fixlen_str_array); if (tid_fixlen_str_array < 0) { - HDfprintf(stderr, "Error: %s> H5Tarray_create2 failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Tarray_create2 failed.\n", fname1); status = FAIL; goto out; } @@ -4490,7 +4490,7 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new *------------------------------------------------------------------------*/ sid_comp = H5Screate_simple(COMP_RANK, dims_comp, NULL); if (sid_comp < 0) { - HDfprintf(stderr, "Error: %s> H5Screate_simple failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Screate_simple failed.\n", fname1); status = FAIL; goto out; } @@ -4604,7 +4604,7 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new did_comp = H5Dcreate2(gid, "Compound_dset1", tid1_comp, sid_comp, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); status = H5Dwrite(did_comp, tid1_comp, H5S_ALL, H5S_ALL, H5P_DEFAULT, &comp1_buf); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1); status = FAIL; goto out; } @@ -4614,7 +4614,7 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new did_comp = H5Dcreate2(gid, "Compound_dset2", tid2_comp, sid_comp, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); status = H5Dwrite(did_comp, tid2_comp, H5S_ALL, H5S_ALL, H5P_DEFAULT, &comp2_buf); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1); status = FAIL; goto out; } @@ -4624,7 +4624,7 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new did_comp = H5Dcreate2(gid, "Compound_dset3", tid3_comp, sid_comp, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); status = H5Dwrite(did_comp, tid3_comp, H5S_ALL, H5S_ALL, H5P_DEFAULT, &comp3_buf); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1); status = FAIL; goto out; } @@ -4634,7 +4634,7 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new did_comp = H5Dcreate2(gid, "Compound_dset4", tid4_comp, sid_comp, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); status = H5Dwrite(did_comp, tid4_comp, H5S_ALL, H5S_ALL, H5P_DEFAULT, &comp4_buf); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1); status = FAIL; goto out; } @@ -4644,7 +4644,7 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new did_comp = H5Dcreate2(gid, "Compound_dset5", tid5_comp, sid_comp, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); status = H5Dwrite(did_comp, tid5_comp, H5S_ALL, H5S_ALL, H5P_DEFAULT, &comp5_buf); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1); status = FAIL; goto out; } @@ -4654,7 +4654,7 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new did_comp = H5Dcreate2(gid, "Compound_dset6", tid6_comp, sid_comp, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); status = H5Dwrite(did_comp, tid6_comp, H5S_ALL, H5S_ALL, H5P_DEFAULT, &comp6_buf); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1); status = FAIL; goto out; } @@ -4664,7 +4664,7 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new did_comp = H5Dcreate2(gid, "Compound_dset7", tid7_comp, sid_comp, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); status = H5Dwrite(did_comp, tid7_comp, H5S_ALL, H5S_ALL, H5P_DEFAULT, &comp7_buf); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1); status = FAIL; goto out; } @@ -4674,7 +4674,7 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new did_comp = H5Dcreate2(gid, "Compound_dset8", tid8_comp, sid_comp, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); status = H5Dwrite(did_comp, tid8_comp, H5S_ALL, H5S_ALL, H5P_DEFAULT, &comp8_buf); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1); status = FAIL; goto out; } @@ -4690,7 +4690,7 @@ test_comp_vlen_strings(const char *fname1, const char *grp_name, int is_file_new status = H5Dwrite(did_comp, tid9_comp, H5S_ALL, H5S_ALL, H5P_DEFAULT, &comp9_buf); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Dwrite failed.\n", fname1); status = FAIL; goto out; } @@ -4813,14 +4813,14 @@ test_enums(const char *fname) enum_val = 0; status = H5Tenum_insert(tid, "YIN", &enum_val); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Tenum_insert failed.\n", fname); + fprintf(stderr, "Error: %s> H5Tenum_insert failed.\n", fname); status = FAIL; goto out; } enum_val = 1; status = H5Tenum_insert(tid, "YANG", &enum_val); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Tenum_insert failed.\n", fname); + fprintf(stderr, "Error: %s> H5Tenum_insert failed.\n", fname); status = FAIL; goto out; } @@ -4831,13 +4831,13 @@ test_enums(const char *fname) status = write_dset(fid, 1, &dims, "dset1", tid, data1); if (status < 0) { - HDfprintf(stderr, "Error: %s> write_dset failed.\n", fname); + fprintf(stderr, "Error: %s> write_dset failed.\n", fname); status = FAIL; goto out; } status = write_dset(fid, 1, &dims, "dset2", tid, data2); if (status < 0) { - HDfprintf(stderr, "Error: %s> write_dset failed.\n", fname); + fprintf(stderr, "Error: %s> write_dset failed.\n", fname); status = FAIL; goto out; } @@ -5470,7 +5470,7 @@ test_data_nocomparables(const char *fname, int make_diffs) *------------------------------------------------------------------------*/ fid = H5Fcreate(fname, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); if (fid < 0) { - HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname); + fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname); status = FAIL; goto out; } @@ -5480,14 +5480,14 @@ test_data_nocomparables(const char *fname, int make_diffs) *------------------------------------------------------------------------*/ gid1 = H5Gcreate2(fid, "g1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (gid1 < 0) { - HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname); + fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname); status = FAIL; goto out; } gid2 = H5Gcreate2(fid, "g2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (gid2 < 0) { - HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname); + fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", fname); status = FAIL; goto out; } @@ -5500,13 +5500,13 @@ test_data_nocomparables(const char *fname, int make_diffs) /* dset1 */ if ((did1 = H5Dcreate2(gid1, "dset1", tid_dset1, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - HDfprintf(stderr, "Error: %s> H5Dcreate2 failed.\n", "dset1"); + fprintf(stderr, "Error: %s> H5Dcreate2 failed.\n", "dset1"); status = FAIL; goto out; } if (H5Dwrite(did1, tid_dset1, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset_data_ptr1) < 0) { - HDfprintf(stderr, "Error: %s> H5Dwrite failed.\n", "dset1"); + fprintf(stderr, "Error: %s> H5Dwrite failed.\n", "dset1"); status = FAIL; goto out; } @@ -5515,7 +5515,7 @@ test_data_nocomparables(const char *fname, int make_diffs) /* dset2 */ status = write_dset(gid1, 1, dims1_1, "dset2", H5T_NATIVE_INT, dset_data_ptr2); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname); + fprintf(stderr, "Error: %s> write_dset failed\n", fname); goto out; } @@ -5525,13 +5525,13 @@ test_data_nocomparables(const char *fname, int make_diffs) /* --------- * dset1 */ if ((did2 = H5Dcreate2(gid2, "dset1", H5T_NATIVE_INT, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - HDfprintf(stderr, "Error: %s> H5Dcreate2 failed.\n", "dset1"); + fprintf(stderr, "Error: %s> H5Dcreate2 failed.\n", "dset1"); status = FAIL; goto out; } if (H5Dwrite(did2, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, dset_data_ptr3) < 0) { - HDfprintf(stderr, "Error: %s> H5Dwrite failed.\n", "dset1"); + fprintf(stderr, "Error: %s> H5Dwrite failed.\n", "dset1"); status = FAIL; goto out; } @@ -5551,7 +5551,7 @@ test_data_nocomparables(const char *fname, int make_diffs) * dset2 */ status = write_dset(gid2, 1, dims1_1, "dset2", H5T_NATIVE_INT, dset_data_ptr3); if (status == FAIL) { - HDfprintf(stderr, "Error: %s> write_dset failed\n", fname); + fprintf(stderr, "Error: %s> write_dset failed\n", fname); goto out; } @@ -5755,14 +5755,14 @@ test_objs_strings(const char *fname1, const char *fname2) /* file1 */ fid1 = H5Fcreate(fname1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); if (fid1 < 0) { - HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1); + fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname1); goto out; } /* file2 */ fid2 = H5Fcreate(fname2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); if (fid2 < 0) { - HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2); + fprintf(stderr, "Error: %s> H5Fcreate failed.\n", fname2); goto out; } diff --git a/tools/test/h5dump/h5dumpgentest.c b/tools/test/h5dump/h5dumpgentest.c index 2341a04..82ac178 100644 --- a/tools/test/h5dump/h5dumpgentest.c +++ b/tools/test/h5dump/h5dumpgentest.c @@ -683,7 +683,7 @@ gent_softlink2(void) /* Create a new file */ fileid1 = H5Fcreate(FILE4_1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); if (fileid1 < 0) { - HDfprintf(stderr, "Error: %s> H5Fcreate failed.\n", FILE4_1); + fprintf(stderr, "Error: %s> H5Fcreate failed.\n", FILE4_1); status = FAIL; goto out; } @@ -693,14 +693,14 @@ gent_softlink2(void) *------------------------------------------------------------------------*/ gid1 = H5Gcreate2(fileid1, "group1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (gid1 < 0) { - HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", FILE4_1); + fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", FILE4_1); status = FAIL; goto out; } gid2 = H5Gcreate2(fileid1, "group_empty", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (gid2 < 0) { - HDfprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", FILE4_1); + fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", FILE4_1); status = FAIL; goto out; } @@ -711,7 +711,7 @@ gent_softlink2(void) datatype = H5Tcopy(H5T_NATIVE_INT); status = H5Tcommit2(fileid1, "dtype", datatype, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Tcommit2 failed.\n", FILE4_1); + fprintf(stderr, "Error: %s> H5Tcommit2 failed.\n", FILE4_1); status = FAIL; goto out; } @@ -737,14 +737,14 @@ gent_softlink2(void) /* Create a new dataset as sample object */ dset1 = H5Dcreate2(fileid1, "/dset1", H5T_NATIVE_INT, dataspace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (dset1 < 0) { - HDfprintf(stderr, "Error: %s> H5Dcreate2 failed.\n", FILE4_1); + fprintf(stderr, "Error: %s> H5Dcreate2 failed.\n", FILE4_1); status = FAIL; goto out; } status = H5Dwrite(dset1, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data1); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Dwrite failed.\n", FILE4_1); + fprintf(stderr, "Error: %s> H5Dwrite failed.\n", FILE4_1); status = FAIL; goto out; } @@ -755,14 +755,14 @@ gent_softlink2(void) /* Create a new dataset as sample object */ dset2 = H5Dcreate2(fileid1, "/dset2", H5T_NATIVE_INT, dataspace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (dset2 < 0) { - HDfprintf(stderr, "Error: %s> H5Dcreate2 failed.\n", FILE4_1); + fprintf(stderr, "Error: %s> H5Dcreate2 failed.\n", FILE4_1); status = FAIL; goto out; } status = H5Dwrite(dset2, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data2); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Dwrite failed.\n", FILE4_1); + fprintf(stderr, "Error: %s> H5Dwrite failed.\n", FILE4_1); status = FAIL; goto out; } @@ -776,7 +776,7 @@ gent_softlink2(void) /* link to dset1 */ status = H5Lcreate_soft("/dset1", fileid1, "soft_dset1", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", FILE4_1); + fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", FILE4_1); status = FAIL; goto out; } @@ -784,7 +784,7 @@ gent_softlink2(void) /* link to data type */ status = H5Lcreate_soft("/dtype", fileid1, "soft_dtype", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", FILE4_1); + fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", FILE4_1); status = FAIL; goto out; } @@ -792,7 +792,7 @@ gent_softlink2(void) /* link to group1 */ status = H5Lcreate_soft("/group1", fileid1, "soft_group1", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", FILE4_1); + fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", FILE4_1); status = FAIL; goto out; } @@ -800,7 +800,7 @@ gent_softlink2(void) /* link to empty group */ status = H5Lcreate_soft("/group_empty", fileid1, "soft_empty_grp", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", FILE4_1); + fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", FILE4_1); status = FAIL; goto out; } @@ -808,7 +808,7 @@ gent_softlink2(void) /* dangling link */ status = H5Lcreate_soft("not_yet", fileid1, "soft_dangle", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", FILE4_1); + fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", FILE4_1); status = FAIL; goto out; } @@ -819,7 +819,7 @@ gent_softlink2(void) /* link to dset1 */ status = H5Lcreate_soft("/dset1", gid1, "soft_dset1", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", FILE4_1); + fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", FILE4_1); status = FAIL; goto out; } @@ -827,7 +827,7 @@ gent_softlink2(void) /* link to dset2 */ status = H5Lcreate_soft("/dset2", gid1, "soft_dset2", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", FILE4_1); + fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", FILE4_1); status = FAIL; goto out; } @@ -835,7 +835,7 @@ gent_softlink2(void) /* link to data type */ status = H5Lcreate_soft("/dtype", gid1, "soft_dtype", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", FILE4_1); + fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", FILE4_1); status = FAIL; goto out; } @@ -843,7 +843,7 @@ gent_softlink2(void) /* link to empty group */ status = H5Lcreate_soft("/group_empty", gid1, "soft_empty_grp", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", FILE4_1); + fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", FILE4_1); status = FAIL; goto out; } @@ -851,7 +851,7 @@ gent_softlink2(void) /* dangling link */ status = H5Lcreate_soft("not_yet", gid1, "soft_dangle", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", FILE4_1); + fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", FILE4_1); status = FAIL; goto out; } @@ -861,31 +861,31 @@ out: * Close/release resources. */ if (dataspace >= 0 && H5Sclose(dataspace) < 0) { - HDfprintf(stderr, "Error: %s> H5Sclose failed.\n", FILE4_1); + fprintf(stderr, "Error: %s> H5Sclose failed.\n", FILE4_1); status = FAIL; } if (gid1 >= 0 && H5Gclose(gid1) < 0) { - HDfprintf(stderr, "Error: %s> H5Gclose failed.\n", FILE4_1); + fprintf(stderr, "Error: %s> H5Gclose failed.\n", FILE4_1); status = FAIL; } if (gid2 >= 0 && H5Gclose(gid2) < 0) { - HDfprintf(stderr, "Error: %s> H5Gclose failed.\n", FILE4_1); + fprintf(stderr, "Error: %s> H5Gclose failed.\n", FILE4_1); status = FAIL; } if (datatype >= 0 && H5Tclose(datatype) < 0) { - HDfprintf(stderr, "Error: %s> H5Tclose failed.\n", FILE4_1); + fprintf(stderr, "Error: %s> H5Tclose failed.\n", FILE4_1); status = FAIL; } if (dset1 >= 0 && H5Dclose(dset1) < 0) { - HDfprintf(stderr, "Error: %s> H5Dclose failed.\n", FILE4_1); + fprintf(stderr, "Error: %s> H5Dclose failed.\n", FILE4_1); status = FAIL; } if (dset2 >= 0 && H5Dclose(dset2) < 0) { - HDfprintf(stderr, "Error: %s> H5Dclose failed.\n", FILE4_1); + fprintf(stderr, "Error: %s> H5Dclose failed.\n", FILE4_1); status = FAIL; } if (fileid1 >= 0 && H5Fclose(fileid1) < 0) { - HDfprintf(stderr, "Error: %s> H5Fclose failed.\n", FILE4_1); + fprintf(stderr, "Error: %s> H5Fclose failed.\n", FILE4_1); status = FAIL; } @@ -2560,7 +2560,7 @@ gent_nestcomp(void) */ status = H5Dwrite(dataset, s2_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, s1); if (status < 0) - HDfprintf(stderr, "gent_nestcomp H5Dwrite failed\n"); + fprintf(stderr, "gent_nestcomp H5Dwrite failed\n"); /* * Release resources @@ -2788,14 +2788,14 @@ gent_vldatatypes2(void) for (i = 0; i < SPACE1_DIM1; i++) { wdata[i].p = (hvl_t *)HDmalloc((i + 1) * sizeof(hvl_t)); if (wdata[i].p == NULL) { - HDprintf("Cannot allocate memory for VL data! i=%u\n", i); + printf("Cannot allocate memory for VL data! i=%u\n", i); return; } /* end if */ wdata[i].len = i + 1; for (t1 = (hvl_t *)wdata[i].p, j = 0; j < (i + 1); j++, t1++) { t1->p = (unsigned *)HDmalloc((j + 1) * sizeof(unsigned)); if (t1->p == NULL) { - HDprintf("Cannot allocate memory for VL data! i=%u, j=%u\n", i, j); + printf("Cannot allocate memory for VL data! i=%u, j=%u\n", i, j); return; } /* end if */ t1->len = j + 1; @@ -3888,7 +3888,7 @@ gent_multi(void) memb_map[mt] = mt; HDsprintf(sv[mt], "%%s-%c.h5", multi_letters[mt]); memb_name[mt] = sv[mt]; - /*HDprintf("memb_name[%d]=%s, memb_map[%d]=%d; ", mt, memb_name[mt], mt, memb_map[mt]);*/ + /*printf("memb_name[%d]=%s, memb_map[%d]=%d; ", mt, memb_name[mt], mt, memb_map[mt]);*/ memb_addr[mt] = (haddr_t)MAX(mt - 1, 0) * (HADDR_MAX / 10); } memb_map[H5FD_MEM_DEFAULT] = H5FD_MEM_SUPER; @@ -6349,7 +6349,7 @@ gent_ldouble(void) return 0; error: - HDprintf("error !\n"); + printf("error !\n"); return -1; } @@ -6400,7 +6400,7 @@ gent_ldouble_scalar(void) return 0; error: - HDprintf("error !\n"); + printf("error !\n"); return -1; } @@ -6557,7 +6557,7 @@ gent_bigdims(void) return; out: - HDprintf("Error.....\n"); + printf("Error.....\n"); H5E_BEGIN_TRY { H5Pclose(dcpl); @@ -6744,7 +6744,7 @@ gent_group_creation_order(void) return; out: - HDprintf("Error.....\n"); + printf("Error.....\n"); H5E_BEGIN_TRY { H5Gclose(gid); @@ -7000,7 +7000,7 @@ gent_attr_creation_order(void) return; out: - HDprintf("Error.....\n"); + printf("Error.....\n"); H5E_BEGIN_TRY { H5Gclose(gid); @@ -10930,7 +10930,7 @@ gent_compound_complex2(void) } if (H5Dwrite(dset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) - HDfprintf(stderr, "gent_tcompound_complex2 H5Dwrite failed\n"); + fprintf(stderr, "gent_tcompound_complex2 H5Dwrite failed\n"); H5Dclose(dset); } @@ -11061,7 +11061,7 @@ gent_vlenstr_array(void) if ((dset = H5Dcreate2(file, F83_DATASETNAME, type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) >= 0) { if (H5Dwrite(dset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, buffer) < 0) - HDfprintf(stderr, "gent_vlenstr_array H5Dwrite failed\n"); + fprintf(stderr, "gent_vlenstr_array H5Dwrite failed\n"); H5Dclose(dset); } @@ -11083,7 +11083,7 @@ gent_vlenstr_array(void) if ((dset = H5Dcreate2(file, F83_DATASETNAME2, type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) >= 0) { if (H5Dwrite(dset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) - HDfprintf(stderr, "gent_vlenstr_array H5Dwrite failed\n"); + fprintf(stderr, "gent_vlenstr_array H5Dwrite failed\n"); H5Dclose(dset); } diff --git a/tools/test/h5format_convert/h5fc_chk_idx.c b/tools/test/h5format_convert/h5fc_chk_idx.c index 97688ad..ffa3327 100644 --- a/tools/test/h5format_convert/h5fc_chk_idx.c +++ b/tools/test/h5format_convert/h5fc_chk_idx.c @@ -25,7 +25,7 @@ static void usage(void); static void usage(void) { - HDfprintf(stdout, "Usage: h5fc_chk_idx file_name dataset_pathname\n"); + fprintf(stdout, "Usage: h5fc_chk_idx file_name dataset_pathname\n"); } /* usage() */ /*------------------------------------------------------------------------- @@ -60,31 +60,31 @@ main(int argc, char *argv[]) /* Try opening the file */ if ((fid = h5tools_fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT, FALSE, NULL, (size_t)0)) < 0) { - HDfprintf(stderr, "h5fc_chk_idx: unable to open the file\n"); + fprintf(stderr, "h5fc_chk_idx: unable to open the file\n"); HDexit(EXIT_FAILURE); } /* end if */ /* Open the dataset */ if ((did = H5Dopen2(fid, dname, H5P_DEFAULT)) < 0) { - HDfprintf(stderr, "h5fc_chk_idx: unable to open the dataset\n"); + fprintf(stderr, "h5fc_chk_idx: unable to open the dataset\n"); HDexit(EXIT_FAILURE); } /* end if */ /* Get the dataset's chunk indexing type */ if (H5Dget_chunk_index_type(did, &idx_type) < 0) { - HDfprintf(stderr, "h5fc_chk_idx: unable to get chunk index type for the dataset\n"); + fprintf(stderr, "h5fc_chk_idx: unable to get chunk index type for the dataset\n"); HDexit(EXIT_FAILURE); } /* end if */ /* Close the dataset */ if (H5Dclose(did) < 0) { - HDfprintf(stderr, "h5fc_chk_idx: unable to close the dataset\n"); + fprintf(stderr, "h5fc_chk_idx: unable to close the dataset\n"); HDexit(EXIT_FAILURE); } /* end if */ /* Close the file */ if (H5Fclose(fid) < 0) { - HDfprintf(stderr, "h5fc_chk_idx_type: cannot close the file\n"); + fprintf(stderr, "h5fc_chk_idx_type: cannot close the file\n"); HDexit(EXIT_FAILURE); } /* end if */ @@ -92,7 +92,7 @@ main(int argc, char *argv[]) if (idx_type == H5D_CHUNK_IDX_BTREE) HDexit(EXIT_SUCCESS); else { - HDfprintf(stderr, "Error: chunk indexing type is %d\n", idx_type); + fprintf(stderr, "Error: chunk indexing type is %d\n", idx_type); HDexit(EXIT_FAILURE); } /* end if */ diff --git a/tools/test/h5import/h5importtest.c b/tools/test/h5import/h5importtest.c index b05ea82..96da5c8 100644 --- a/tools/test/h5import/h5importtest.c +++ b/tools/test/h5import/h5importtest.c @@ -163,8 +163,8 @@ main(void) for (k = 0; k < npln; k++) { for (i = 0; i < nrow; i++) { for (j = 0; j < ncol; j++) - (void)HDfprintf(sp, "%10u", b8i3[k][i][j]); - (void)HDfprintf(sp, "\n"); + (void)fprintf(sp, "%10u", b8i3[k][i][j]); + (void)fprintf(sp, "\n"); } } (void)HDfclose(sp); @@ -178,8 +178,8 @@ main(void) for (k = 0; k < npln; k++) { for (i = 0; i < nrow; i++) { for (j = 0; j < ncol; j++) - (void)HDfprintf(sp, "%10u", b16i3[k][i][j]); - (void)HDfprintf(sp, "\n"); + (void)fprintf(sp, "%10u", b16i3[k][i][j]); + (void)fprintf(sp, "\n"); } } (void)HDfclose(sp); @@ -193,8 +193,8 @@ main(void) for (k = 0; k < npln; k++) { for (i = 0; i < nrow; i++) { for (j = 0; j < ncol; j++) - (void)HDfprintf(sp, "%10d", b32i3[k][i][j]); - (void)HDfprintf(sp, "\n"); + (void)fprintf(sp, "%10d", b32i3[k][i][j]); + (void)fprintf(sp, "\n"); } } (void)HDfclose(sp); @@ -216,16 +216,16 @@ main(void) (void)HDfclose(sp); sp = HDfopen("binin32.conf", "w"); - (void)HDfprintf(sp, "PATH /int/bin/32-bit\n"); - (void)HDfprintf(sp, "INPUT-CLASS IN\n"); - (void)HDfprintf(sp, "INPUT-SIZE 32\n"); - (void)HDfprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order); - (void)HDfprintf(sp, "RANK 3\n"); - (void)HDfprintf(sp, "OUTPUT-ARCHITECTURE STD\n"); - (void)HDfprintf(sp, "OUTPUT-BYTE-ORDER BE\n"); - (void)HDfprintf(sp, "DIMENSION-SIZES 5 3 4\n"); - (void)HDfprintf(sp, "CHUNKED-DIMENSION-SIZES 1 2 1\n"); - (void)HDfprintf(sp, "\n"); + (void)fprintf(sp, "PATH /int/bin/32-bit\n"); + (void)fprintf(sp, "INPUT-CLASS IN\n"); + (void)fprintf(sp, "INPUT-SIZE 32\n"); + (void)fprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order); + (void)fprintf(sp, "RANK 3\n"); + (void)fprintf(sp, "OUTPUT-ARCHITECTURE STD\n"); + (void)fprintf(sp, "OUTPUT-BYTE-ORDER BE\n"); + (void)fprintf(sp, "DIMENSION-SIZES 5 3 4\n"); + (void)fprintf(sp, "CHUNKED-DIMENSION-SIZES 1 2 1\n"); + (void)fprintf(sp, "\n"); (void)HDfclose(sp); /*------------------------------------------------------------------------- @@ -244,15 +244,15 @@ main(void) (void)HDfclose(sp); sp = HDfopen("binuin32.conf", "w"); - (void)HDfprintf(sp, "PATH /int/buin/32-bit\n"); - (void)HDfprintf(sp, "INPUT-CLASS UIN\n"); - (void)HDfprintf(sp, "INPUT-SIZE 32\n"); - (void)HDfprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order); - (void)HDfprintf(sp, "RANK 3\n"); - (void)HDfprintf(sp, "OUTPUT-ARCHITECTURE STD\n"); - (void)HDfprintf(sp, "OUTPUT-BYTE-ORDER LE\n"); - (void)HDfprintf(sp, "DIMENSION-SIZES 5 3 4\n"); - (void)HDfprintf(sp, "\n"); + (void)fprintf(sp, "PATH /int/buin/32-bit\n"); + (void)fprintf(sp, "INPUT-CLASS UIN\n"); + (void)fprintf(sp, "INPUT-SIZE 32\n"); + (void)fprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order); + (void)fprintf(sp, "RANK 3\n"); + (void)fprintf(sp, "OUTPUT-ARCHITECTURE STD\n"); + (void)fprintf(sp, "OUTPUT-BYTE-ORDER LE\n"); + (void)fprintf(sp, "DIMENSION-SIZES 5 3 4\n"); + (void)fprintf(sp, "\n"); (void)HDfclose(sp); /*------------------------------------------------------------------------- @@ -271,17 +271,17 @@ main(void) (void)HDfclose(sp); sp = HDfopen("binin16.conf", "w"); - (void)HDfprintf(sp, "PATH /int/bin/16-bit\n"); - (void)HDfprintf(sp, "INPUT-CLASS IN\n"); - (void)HDfprintf(sp, "INPUT-SIZE 16\n"); - (void)HDfprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order); - (void)HDfprintf(sp, "RANK 3\n"); - (void)HDfprintf(sp, "OUTPUT-ARCHITECTURE STD\n"); - (void)HDfprintf(sp, "OUTPUT-BYTE-ORDER LE\n"); - (void)HDfprintf(sp, "DIMENSION-SIZES 2 3 4\n"); - (void)HDfprintf(sp, "CHUNKED-DIMENSION-SIZES 2 2 2\n"); - (void)HDfprintf(sp, "MAXIMUM-DIMENSIONS -1 -1 8\n"); - (void)HDfprintf(sp, "\n"); + (void)fprintf(sp, "PATH /int/bin/16-bit\n"); + (void)fprintf(sp, "INPUT-CLASS IN\n"); + (void)fprintf(sp, "INPUT-SIZE 16\n"); + (void)fprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order); + (void)fprintf(sp, "RANK 3\n"); + (void)fprintf(sp, "OUTPUT-ARCHITECTURE STD\n"); + (void)fprintf(sp, "OUTPUT-BYTE-ORDER LE\n"); + (void)fprintf(sp, "DIMENSION-SIZES 2 3 4\n"); + (void)fprintf(sp, "CHUNKED-DIMENSION-SIZES 2 2 2\n"); + (void)fprintf(sp, "MAXIMUM-DIMENSIONS -1 -1 8\n"); + (void)fprintf(sp, "\n"); (void)HDfclose(sp); /*------------------------------------------------------------------------- @@ -299,17 +299,17 @@ main(void) (void)HDfclose(sp); sp = HDfopen("binuin16.conf", "w"); - (void)HDfprintf(sp, "PATH /int/buin/16-bit\n"); - (void)HDfprintf(sp, "INPUT-CLASS UIN\n"); - (void)HDfprintf(sp, "INPUT-SIZE 16\n"); - (void)HDfprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order); - (void)HDfprintf(sp, "RANK 3\n"); - (void)HDfprintf(sp, "OUTPUT-ARCHITECTURE STD\n"); - (void)HDfprintf(sp, "OUTPUT-BYTE-ORDER BE\n"); - (void)HDfprintf(sp, "DIMENSION-SIZES 2 3 4\n"); - (void)HDfprintf(sp, "CHUNKED-DIMENSION-SIZES 2 2 2\n"); - (void)HDfprintf(sp, "MAXIMUM-DIMENSIONS -1 -1 8\n"); - (void)HDfprintf(sp, "\n"); + (void)fprintf(sp, "PATH /int/buin/16-bit\n"); + (void)fprintf(sp, "INPUT-CLASS UIN\n"); + (void)fprintf(sp, "INPUT-SIZE 16\n"); + (void)fprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order); + (void)fprintf(sp, "RANK 3\n"); + (void)fprintf(sp, "OUTPUT-ARCHITECTURE STD\n"); + (void)fprintf(sp, "OUTPUT-BYTE-ORDER BE\n"); + (void)fprintf(sp, "DIMENSION-SIZES 2 3 4\n"); + (void)fprintf(sp, "CHUNKED-DIMENSION-SIZES 2 2 2\n"); + (void)fprintf(sp, "MAXIMUM-DIMENSIONS -1 -1 8\n"); + (void)fprintf(sp, "\n"); (void)HDfclose(sp); /*------------------------------------------------------------------------- @@ -328,20 +328,20 @@ main(void) (void)HDfclose(sp); sp = HDfopen("binin8.conf", "w"); - (void)HDfprintf(sp, "PATH /int/bin/8-bit\n"); - (void)HDfprintf(sp, "INPUT-CLASS IN\n"); - (void)HDfprintf(sp, "INPUT-SIZE 8\n"); - (void)HDfprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order); - (void)HDfprintf(sp, "RANK 3\n"); - (void)HDfprintf(sp, "OUTPUT-CLASS IN\n"); - (void)HDfprintf(sp, "OUTPUT-SIZE 16\n"); - (void)HDfprintf(sp, "OUTPUT-ARCHITECTURE STD\n"); - (void)HDfprintf(sp, "OUTPUT-BYTE-ORDER LE\n"); - (void)HDfprintf(sp, "DIMENSION-SIZES 5 3 4\n"); - (void)HDfprintf(sp, "CHUNKED-DIMENSION-SIZES 2 2 2\n"); - (void)HDfprintf(sp, "MAXIMUM-DIMENSIONS -1 -1 -1\n"); - (void)HDfprintf(sp, "COMPRESSION-PARAM 3\n"); - (void)HDfprintf(sp, "\n"); + (void)fprintf(sp, "PATH /int/bin/8-bit\n"); + (void)fprintf(sp, "INPUT-CLASS IN\n"); + (void)fprintf(sp, "INPUT-SIZE 8\n"); + (void)fprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order); + (void)fprintf(sp, "RANK 3\n"); + (void)fprintf(sp, "OUTPUT-CLASS IN\n"); + (void)fprintf(sp, "OUTPUT-SIZE 16\n"); + (void)fprintf(sp, "OUTPUT-ARCHITECTURE STD\n"); + (void)fprintf(sp, "OUTPUT-BYTE-ORDER LE\n"); + (void)fprintf(sp, "DIMENSION-SIZES 5 3 4\n"); + (void)fprintf(sp, "CHUNKED-DIMENSION-SIZES 2 2 2\n"); + (void)fprintf(sp, "MAXIMUM-DIMENSIONS -1 -1 -1\n"); + (void)fprintf(sp, "COMPRESSION-PARAM 3\n"); + (void)fprintf(sp, "\n"); (void)HDfclose(sp); #endif /* UNICOS */ @@ -366,18 +366,18 @@ main(void) (void)HDfclose(sp); sp = HDfopen("binfp64.conf", "w"); - (void)HDfprintf(sp, "PATH /fp/bin/64-bit\n"); - (void)HDfprintf(sp, "INPUT-CLASS FP\n"); - (void)HDfprintf(sp, "INPUT-SIZE 64\n"); - (void)HDfprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order); - (void)HDfprintf(sp, "RANK 3\n"); - (void)HDfprintf(sp, "OUTPUT-ARCHITECTURE IEEE\n"); - (void)HDfprintf(sp, "OUTPUT-BYTE-ORDER LE\n"); - (void)HDfprintf(sp, "DIMENSION-SIZES 5 3 4\n"); - (void)HDfprintf(sp, "CHUNKED-DIMENSION-SIZES 2 2 2\n"); - (void)HDfprintf(sp, "MAXIMUM-DIMENSIONS -1 6 7\n"); - (void)HDfprintf(sp, "COMPRESSION-PARAM 8\n"); - (void)HDfprintf(sp, "\n"); + (void)fprintf(sp, "PATH /fp/bin/64-bit\n"); + (void)fprintf(sp, "INPUT-CLASS FP\n"); + (void)fprintf(sp, "INPUT-SIZE 64\n"); + (void)fprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order); + (void)fprintf(sp, "RANK 3\n"); + (void)fprintf(sp, "OUTPUT-ARCHITECTURE IEEE\n"); + (void)fprintf(sp, "OUTPUT-BYTE-ORDER LE\n"); + (void)fprintf(sp, "DIMENSION-SIZES 5 3 4\n"); + (void)fprintf(sp, "CHUNKED-DIMENSION-SIZES 2 2 2\n"); + (void)fprintf(sp, "MAXIMUM-DIMENSIONS -1 6 7\n"); + (void)fprintf(sp, "COMPRESSION-PARAM 8\n"); + (void)fprintf(sp, "\n"); (void)HDfclose(sp); /*------------------------------------------------------------------------- @@ -393,21 +393,21 @@ main(void) for (i = 0; i < 4; i++) { char c = bin8w[i]; if (HDfwrite(&c, sizeof(char), 1, sp) != 1) - HDprintf("error writing file\n"); + printf("error writing file\n"); } HDfclose(sp); sp = HDfopen("binin8w.conf", "w"); - (void)HDfprintf(sp, "INPUT-CLASS IN\n"); - (void)HDfprintf(sp, "INPUT-SIZE 8\n"); - (void)HDfprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order); - (void)HDfprintf(sp, "RANK 1\n"); - (void)HDfprintf(sp, "OUTPUT-CLASS IN\n"); - (void)HDfprintf(sp, "OUTPUT-SIZE 8\n"); - (void)HDfprintf(sp, "OUTPUT-ARCHITECTURE STD\n"); - (void)HDfprintf(sp, "OUTPUT-BYTE-ORDER LE\n"); - (void)HDfprintf(sp, "DIMENSION-SIZES 4\n"); - (void)HDfprintf(sp, "\n"); + (void)fprintf(sp, "INPUT-CLASS IN\n"); + (void)fprintf(sp, "INPUT-SIZE 8\n"); + (void)fprintf(sp, "INPUT-BYTE-ORDER %s\n", machine_order); + (void)fprintf(sp, "RANK 1\n"); + (void)fprintf(sp, "OUTPUT-CLASS IN\n"); + (void)fprintf(sp, "OUTPUT-SIZE 8\n"); + (void)fprintf(sp, "OUTPUT-ARCHITECTURE STD\n"); + (void)fprintf(sp, "OUTPUT-BYTE-ORDER LE\n"); + (void)fprintf(sp, "DIMENSION-SIZES 4\n"); + (void)fprintf(sp, "\n"); (void)HDfclose(sp); } return (EXIT_SUCCESS); diff --git a/tools/test/h5jam/getub.c b/tools/test/h5jam/getub.c index 8928ee8..192371d 100644 --- a/tools/test/h5jam/getub.c +++ b/tools/test/h5jam/getub.c @@ -36,8 +36,8 @@ static void usage(const char *prog) { HDfflush(stdout); - HDfprintf(stdout, "usage: %s -c nb file] \n", prog); - HDfprintf(stdout, " print first 'nb' byts of file to stdoug.\n"); + fprintf(stdout, "usage: %s -c nb file] \n", prog); + fprintf(stdout, " print first 'nb' byts of file to stdoug.\n"); } /*------------------------------------------------------------------------- diff --git a/tools/test/h5jam/h5jamgentest.c b/tools/test/h5jam/h5jamgentest.c index 1376e78..a9df43b 100644 --- a/tools/test/h5jam/h5jamgentest.c +++ b/tools/test/h5jam/h5jamgentest.c @@ -420,6 +420,6 @@ main(void) return EXIT_SUCCESS; error: - HDfprintf(stderr, "h5jam test generator FAILED\n"); + fprintf(stderr, "h5jam test generator FAILED\n"); return EXIT_FAILURE; } diff --git a/tools/test/h5jam/tellub.c b/tools/test/h5jam/tellub.c index d0e717a..ba0457b 100644 --- a/tools/test/h5jam/tellub.c +++ b/tools/test/h5jam/tellub.c @@ -38,10 +38,10 @@ static void usage(const char *prog) { HDfflush(stdout); - HDfprintf(stdout, "usage: %s h5_file\n", prog); - HDfprintf(stdout, " Check that h5_fil is HDF5 file and print size of user block \n"); - HDfprintf(stdout, " %s -h\n", prog); - HDfprintf(stdout, " Print a usage message and exit\n"); + fprintf(stdout, "usage: %s h5_file\n", prog); + fprintf(stdout, " Check that h5_fil is HDF5 file and print size of user block \n"); + fprintf(stdout, " %s -h\n", prog); + fprintf(stdout, " Print a usage message and exit\n"); } /* end usage() */ /*------------------------------------------------------------------------- @@ -156,7 +156,7 @@ main(int argc, char *argv[]) goto done; } - HDprintf("%ld\n", (long)usize); + printf("%ld\n", (long)usize); done: H5Pclose(plist); diff --git a/tools/test/h5repack/h5repackgentest.c b/tools/test/h5repack/h5repackgentest.c index bc22e8d..8910abb 100644 --- a/tools/test/h5repack/h5repackgentest.c +++ b/tools/test/h5repack/h5repackgentest.c @@ -329,19 +329,19 @@ main(void) for (i = 0; i < 2; i++) { hbool_t external = (i & 1) ? TRUE : FALSE; if (generate_int32le_1d(external) < 0) - HDprintf("A generate_int32le_1d failed!\n"); + printf("A generate_int32le_1d failed!\n"); if (generate_int32le_2d(external) < 0) - HDprintf("A generate_int32le_2d failed!\n"); + printf("A generate_int32le_2d failed!\n"); if (generate_int32le_3d(external) < 0) - HDprintf("A generate_int32le_3d failed!\n"); + printf("A generate_int32le_3d failed!\n"); if (generate_uint8be(external) < 0) - HDprintf("A generate_uint8be failed!\n"); + printf("A generate_uint8be failed!\n"); if (generate_f32le(external) < 0) - HDprintf("A generate_f32le failed!\n"); + printf("A generate_f32le failed!\n"); } /* end for external data storage or not */ diff --git a/tools/test/h5repack/h5repacktst.c b/tools/test/h5repack/h5repacktst.c index 35b6b07..ca56c79 100644 --- a/tools/test/h5repack/h5repacktst.c +++ b/tools/test/h5repack/h5repacktst.c @@ -4179,8 +4179,8 @@ write_dset_in(hid_t loc_id, const char *dset_name, /* for saving reference to da size = (TEST_BUFSIZE / sizeof(double) + 1) * sizeof(double); dbuf = (double *)HDmalloc(size); if (NULL == dbuf) { - HDprintf("\nError: Cannot allocate memory for \"arrayd\" data buffer size %dMB.\n", - (int)size / 1000000); + printf("\nError: Cannot allocate memory for \"arrayd\" data buffer size %dMB.\n", + (int)size / 1000000); goto out; } @@ -6214,7 +6214,7 @@ add_attr_with_objref(hid_t file_id, hid_t obj_id) /* ref to dset */ status = H5Rcreate(&data_attr_objref[0], file_id, NAME_OBJ_DS1, H5R_OBJECT, (hid_t)-1); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -6222,7 +6222,7 @@ add_attr_with_objref(hid_t file_id, hid_t obj_id) /* ref to group */ status = H5Rcreate(&data_attr_objref[1], file_id, NAME_OBJ_GRP, H5R_OBJECT, (hid_t)-1); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -6230,7 +6230,7 @@ add_attr_with_objref(hid_t file_id, hid_t obj_id) /* ref to datatype */ status = H5Rcreate(&data_attr_objref[2], file_id, NAME_OBJ_NDTYPE, H5R_OBJECT, (hid_t)-1); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -6238,7 +6238,7 @@ add_attr_with_objref(hid_t file_id, hid_t obj_id) /* create attr with obj ref type */ status = make_attr(obj_id, 1, dim_attr_objref, "Attr_OBJREF", H5T_STD_REF_OBJ, data_attr_objref); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> make_attr failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> make_attr failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -6278,7 +6278,7 @@ add_attr_with_regref(hid_t file_id, hid_t obj_id) */ sid_regrefed_dset = H5Screate_simple(2, dim_regrefed_dset, NULL); if (sid_regrefed_dset < 0) { - HDfprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -6286,7 +6286,7 @@ add_attr_with_regref(hid_t file_id, hid_t obj_id) /* select elements space for reference */ status = H5Sselect_elements(sid_regrefed_dset, H5S_SELECT_SET, (size_t)3, coords_regrefed_dset[0]); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Sselect_elements failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Sselect_elements failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -6294,7 +6294,7 @@ add_attr_with_regref(hid_t file_id, hid_t obj_id) /* create region reference from elements space */ status = H5Rcreate(&data_attr_regref[0], file_id, NAME_OBJ_DS2, H5R_DATASET_REGION, sid_regrefed_dset); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -6302,7 +6302,7 @@ add_attr_with_regref(hid_t file_id, hid_t obj_id) /* create attr with region ref type */ status = make_attr(obj_id, 1, dim_attr_regref, "Attr_REGREF", H5T_STD_REF_DSETREG, data_attr_regref); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> make_attr failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> make_attr failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -6347,21 +6347,21 @@ gen_refered_objs(hid_t loc_id) */ sid = H5Screate_simple(1, dims1, NULL); if (sid < 0) { - HDfprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", __func__, __LINE__); ret = FAIL; goto out; } did1 = H5Dcreate2(loc_id, NAME_OBJ_DS1, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (did1 < 0) { - HDfprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", __func__, __LINE__); ret = FAIL; goto out; } status = H5Dwrite(did1, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -6372,7 +6372,7 @@ gen_refered_objs(hid_t loc_id) */ gid = H5Gcreate2(loc_id, NAME_OBJ_GRP, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (gid < 0) { - HDfprintf(stderr, "Error: %s %d> H5Gcreate2 failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Gcreate2 failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -6384,7 +6384,7 @@ gen_refered_objs(hid_t loc_id) tid = H5Tcopy(H5T_NATIVE_INT); status = H5Tcommit2(loc_id, NAME_OBJ_NDTYPE, tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Tcommit2 failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Tcommit2 failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -6395,7 +6395,7 @@ gen_refered_objs(hid_t loc_id) */ sid2 = H5Screate_simple(2, dims2, NULL); if (sid2 < 0) { - HDfprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -6403,7 +6403,7 @@ gen_refered_objs(hid_t loc_id) /* create normal dataset which is referred */ did2 = H5Dcreate2(loc_id, NAME_OBJ_DS2, H5T_STD_I8LE, sid2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (did2 < 0) { - HDfprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -6411,7 +6411,7 @@ gen_refered_objs(hid_t loc_id) /* write values to dataset */ status = H5Dwrite(did2, H5T_NATIVE_CHAR, H5S_ALL, H5S_ALL, H5P_DEFAULT, data2); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -6467,7 +6467,7 @@ gen_obj_ref(hid_t loc_id) /* obj ref to dataset */ status = H5Rcreate(&objref_buf[0], loc_id, NAME_OBJ_DS1, H5R_OBJECT, (hid_t)-1); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -6475,7 +6475,7 @@ gen_obj_ref(hid_t loc_id) /* obj ref to group */ status = H5Rcreate(&objref_buf[1], loc_id, NAME_OBJ_GRP, H5R_OBJECT, (hid_t)-1); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -6483,7 +6483,7 @@ gen_obj_ref(hid_t loc_id) /* obj ref to named-datatype */ status = H5Rcreate(&objref_buf[2], loc_id, NAME_OBJ_NDTYPE, H5R_OBJECT, (hid_t)-1); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -6493,21 +6493,21 @@ gen_obj_ref(hid_t loc_id) */ sid = H5Screate_simple(1, dims_dset_objref, NULL); if (sid < 0) { - HDfprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", __func__, __LINE__); ret = FAIL; goto out; } oid = H5Dcreate2(loc_id, "Dset_OBJREF", H5T_STD_REF_OBJ, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (oid < 0) { - HDfprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", __func__, __LINE__); ret = FAIL; goto out; } status = H5Dwrite(oid, H5T_STD_REF_OBJ, H5S_ALL, H5S_ALL, H5P_DEFAULT, objref_buf); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -6519,7 +6519,7 @@ gen_obj_ref(hid_t loc_id) /* add attribute with obj ref */ status = add_attr_with_objref(loc_id, oid); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> add_attr_with_objref failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> add_attr_with_objref failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -6527,7 +6527,7 @@ gen_obj_ref(hid_t loc_id) /* add attribute with region ref */ status = add_attr_with_regref(loc_id, oid); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> add_attr_with_regref failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> add_attr_with_regref failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -6579,7 +6579,7 @@ gen_region_ref(hid_t loc_id) sid_trg = H5Screate_simple(2, dims_trg, NULL); if (sid_trg < 0) { - HDfprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -6587,7 +6587,7 @@ gen_region_ref(hid_t loc_id) /* select elements space for reference */ status = H5Sselect_elements(sid_trg, H5S_SELECT_SET, (size_t)4, coords[0]); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Sselect_elements failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Sselect_elements failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -6595,7 +6595,7 @@ gen_region_ref(hid_t loc_id) /* create region reference from elements space */ status = H5Rcreate(&rr_data[0], loc_id, NAME_OBJ_DS2, H5R_DATASET_REGION, sid_trg); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -6603,7 +6603,7 @@ gen_region_ref(hid_t loc_id) /* select hyperslab space for reference */ status = H5Sselect_hyperslab(sid_trg, H5S_SELECT_SET, start, stride, count, block); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Sselect_hyperslab failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Sselect_hyperslab failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -6611,7 +6611,7 @@ gen_region_ref(hid_t loc_id) /* create region reference from hyperslab space */ status = H5Rcreate(&rr_data[1], loc_id, NAME_OBJ_DS2, H5R_DATASET_REGION, sid_trg); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -6619,7 +6619,7 @@ gen_region_ref(hid_t loc_id) /* Create dataspace. */ sid_ref = H5Screate_simple(1, dims1, NULL); if (sid_ref < 0) { - HDfprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Screate_simple failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -6628,7 +6628,7 @@ gen_region_ref(hid_t loc_id) oid_ref = H5Dcreate2(loc_id, REG_REF_DS1, H5T_STD_REF_DSETREG, sid_ref, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (oid_ref < 0) { - HDfprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Dcreate2 failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -6636,7 +6636,7 @@ gen_region_ref(hid_t loc_id) /* write data as region references */ status = H5Dwrite(oid_ref, H5T_STD_REF_DSETREG, H5S_ALL, H5S_ALL, H5P_DEFAULT, rr_data); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -6648,7 +6648,7 @@ gen_region_ref(hid_t loc_id) /* add attribute with obj ref */ status = add_attr_with_objref(loc_id, oid_ref); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> add_attr_with_objref failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> add_attr_with_objref failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -6656,7 +6656,7 @@ gen_region_ref(hid_t loc_id) /* add attribute with region ref */ status = add_attr_with_regref(loc_id, oid_ref); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> add_attr_with_regref failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> add_attr_with_regref failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -6689,21 +6689,21 @@ make_references(hid_t loc_id) /* add target objects */ status = gen_refered_objs(loc_id); if (status == FAIL) { - HDfprintf(stderr, "Failed to generate referenced object.\n"); + fprintf(stderr, "Failed to generate referenced object.\n"); ret = FAIL; } /* add object reference */ status = gen_obj_ref(loc_id); if (status == FAIL) { - HDfprintf(stderr, "Failed to generate object reference.\n"); + fprintf(stderr, "Failed to generate object reference.\n"); ret = FAIL; } /* add region reference */ status = gen_region_ref(loc_id); if (status == FAIL) { - HDfprintf(stderr, "Failed to generate region reference.\n"); + fprintf(stderr, "Failed to generate region reference.\n"); ret = FAIL; } @@ -6823,7 +6823,7 @@ make_complex_attr_references(hid_t loc_id) objdid = H5Dcreate2(loc_id, NAME_OBJ_DS1, H5T_NATIVE_INT, objsid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); status = H5Dwrite(objdid, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, obj_data[0]); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -6832,7 +6832,7 @@ make_complex_attr_references(hid_t loc_id) objtid = H5Tcopy(H5T_NATIVE_INT); status = H5Tcommit2(loc_id, NAME_OBJ_NDTYPE, objtid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Tcommit2 failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Tcommit2 failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -6843,7 +6843,7 @@ make_complex_attr_references(hid_t loc_id) * compound type which contain obj and region reference */ main_gid = H5Gcreate2(loc_id, "group_main", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); if (main_gid < 0) { - HDfprintf(stderr, "Error: %s %d> H5Gcreate2 failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Gcreate2 failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -6858,7 +6858,7 @@ make_complex_attr_references(hid_t loc_id) status = H5Dwrite(main_did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, obj_data[0]); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Dwrite failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -6881,7 +6881,7 @@ make_complex_attr_references(hid_t loc_id) /* references to dataset */ status = H5Rcreate(&(comp_objref_data[0].val_objref), loc_id, NAME_OBJ_DS1, H5R_OBJECT, (hid_t)-1); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -6890,7 +6890,7 @@ make_complex_attr_references(hid_t loc_id) /* references to group */ status = H5Rcreate(&(comp_objref_data[1].val_objref), loc_id, NAME_OBJ_GRP, H5R_OBJECT, (hid_t)-1); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -6899,7 +6899,7 @@ make_complex_attr_references(hid_t loc_id) /* references to datatype */ status = H5Rcreate(&(comp_objref_data[2].val_objref), loc_id, NAME_OBJ_NDTYPE, H5R_OBJECT, (hid_t)-1); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -6913,7 +6913,7 @@ make_complex_attr_references(hid_t loc_id) H5Acreate2(main_did, "Comp_OBJREF", comp_objref_tid, comp_objref_attr_sid, H5P_DEFAULT, H5P_DEFAULT); status = H5Awrite(comp_objref_aid, comp_objref_tid, comp_objref_data); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Awrite failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Awrite failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -6934,13 +6934,13 @@ make_complex_attr_references(hid_t loc_id) */ status = H5Sselect_elements(objsid, H5S_SELECT_SET, (size_t)4, coords[0]); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Sselect_elements failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Sselect_elements failed.\n", __func__, __LINE__); ret = FAIL; goto out; } status = H5Rcreate(&(comp_regref_data[0].val_regref), loc_id, NAME_OBJ_DS1, H5R_DATASET_REGION, objsid); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -6954,7 +6954,7 @@ make_complex_attr_references(hid_t loc_id) H5Acreate2(main_did, "Comp_REGREF", comp_regref_tid, comp_regref_attr_sid, H5P_DEFAULT, H5P_DEFAULT); status = H5Awrite(comp_regref_aid, comp_regref_tid, comp_regref_data); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Awrite failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Awrite failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -6979,7 +6979,7 @@ make_complex_attr_references(hid_t loc_id) status = H5Rcreate(&((hobj_ref_t *)vlen_objref_data[0].p)[0], loc_id, NAME_OBJ_DS1, H5R_OBJECT, (hid_t)-1); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -6987,7 +6987,7 @@ make_complex_attr_references(hid_t loc_id) status = H5Rcreate(&((hobj_ref_t *)vlen_objref_data[1].p)[0], loc_id, NAME_OBJ_GRP, H5R_OBJECT, (hid_t)-1); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -6995,7 +6995,7 @@ make_complex_attr_references(hid_t loc_id) status = H5Rcreate(&((hobj_ref_t *)vlen_objref_data[2].p)[0], loc_id, NAME_OBJ_NDTYPE, H5R_OBJECT, (hid_t)-1); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -7013,7 +7013,7 @@ make_complex_attr_references(hid_t loc_id) H5P_DEFAULT, H5P_DEFAULT); status = H5Awrite(vlen_objref_attr_id, vlen_objref_attr_tid, vlen_objref_data); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Awrite failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Awrite failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -7021,7 +7021,7 @@ make_complex_attr_references(hid_t loc_id) /* close resource for vlen data */ status = H5Treclaim(vlen_objref_attr_tid, vlen_objref_attr_sid, H5P_DEFAULT, vlen_objref_data); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Treclaim failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Treclaim failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -7041,14 +7041,14 @@ make_complex_attr_references(hid_t loc_id) */ status = H5Sselect_elements(objsid, H5S_SELECT_SET, (size_t)4, coords[0]); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Sselect_elements failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Sselect_elements failed.\n", __func__, __LINE__); ret = FAIL; goto out; } status = H5Rcreate(&((hdset_reg_ref_t *)vlen_regref_data[0].p)[0], loc_id, NAME_OBJ_DS1, H5R_DATASET_REGION, objsid); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Rcreate failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -7066,7 +7066,7 @@ make_complex_attr_references(hid_t loc_id) H5P_DEFAULT, H5P_DEFAULT); status = H5Awrite(vlen_regref_attr_id, vlen_regref_attr_tid, vlen_regref_data); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Awrite failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Awrite failed.\n", __func__, __LINE__); ret = FAIL; goto out; } @@ -7074,7 +7074,7 @@ make_complex_attr_references(hid_t loc_id) /* close resource for vlen data */ status = H5Treclaim(vlen_regref_attr_tid, vlen_regref_attr_sid, H5P_DEFAULT, vlen_regref_data); if (status < 0) { - HDfprintf(stderr, "Error: %s %d> H5Treclaim failed.\n", __func__, __LINE__); + fprintf(stderr, "Error: %s %d> H5Treclaim failed.\n", __func__, __LINE__); ret = FAIL; goto out; } diff --git a/tools/test/h5repack/testh5repack_detect_szip.c b/tools/test/h5repack/testh5repack_detect_szip.c index b2be484..02a6d2b 100644 --- a/tools/test/h5repack/testh5repack_detect_szip.c +++ b/tools/test/h5repack/testh5repack_detect_szip.c @@ -44,10 +44,10 @@ main(void) #ifdef H5_HAVE_FILTER_SZIP if (h5tools_can_encode(H5Z_FILTER_SZIP) == 1) { - HDprintf("yes\n"); + printf("yes\n"); return (1); } #endif /* H5_HAVE_FILTER_SZIP */ - HDprintf("no\n"); + printf("no\n"); return (0); } diff --git a/tools/test/h5stat/h5stat_gentest.c b/tools/test/h5stat/h5stat_gentest.c index 47c06ad..44428fe 100644 --- a/tools/test/h5stat/h5stat_gentest.c +++ b/tools/test/h5stat/h5stat_gentest.c @@ -626,6 +626,6 @@ main(void) return EXIT_SUCCESS; error: - HDfprintf(stderr, "h5stat test generator FAILED\n"); + fprintf(stderr, "h5stat test generator FAILED\n"); return EXIT_FAILURE; } diff --git a/tools/test/misc/clear_open_chk.c b/tools/test/misc/clear_open_chk.c index 37e7307..ac31375 100644 --- a/tools/test/misc/clear_open_chk.c +++ b/tools/test/misc/clear_open_chk.c @@ -18,9 +18,9 @@ static void usage(void); static void usage(void) { - HDfprintf(stdout, "\n"); - HDfprintf(stdout, "Usage error!\n"); - HDfprintf(stdout, "Usage: clear_open_chk filename\n"); + fprintf(stdout, "\n"); + fprintf(stdout, "Usage error!\n"); + fprintf(stdout, "Usage: clear_open_chk filename\n"); } /* usage() */ /*------------------------------------------------------------------------- @@ -53,7 +53,7 @@ main(int argc, char *argv[]) /* Try opening the file */ if ((fid = h5tools_fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT, FALSE, NULL, (size_t)0)) < 0) { - HDfprintf(stderr, "clear_open_chk: unable to open the file\n"); + fprintf(stderr, "clear_open_chk: unable to open the file\n"); HDfree(fname); HDexit(EXIT_FAILURE); } @@ -61,7 +61,7 @@ main(int argc, char *argv[]) /* Close the file */ if (H5Fclose(fid) < 0) { - HDfprintf(stderr, "clear_open_chk: cannot close the file\n"); + fprintf(stderr, "clear_open_chk: cannot close the file\n"); HDexit(EXIT_FAILURE); } diff --git a/tools/test/misc/h5perf_gentest.c b/tools/test/misc/h5perf_gentest.c index 5b898db..cf91c79 100644 --- a/tools/test/misc/h5perf_gentest.c +++ b/tools/test/misc/h5perf_gentest.c @@ -85,20 +85,20 @@ main(int argc, char *argv[]) else if (strcmp(argv[i], "-z") == 0) z = 1; else if (strcmp(argv[i], "-h") == 0) { - HDprintf("\nOPTONS:\n"); - HDprintf("\t-f F:\tname of the test file (default: %s).\n", FNAME); - HDprintf("\t-g N:\tnumber of top level groups (default: %d).\n", NGROUPS); - HDprintf("\t-d N:\tnumber of datasets (default: %d).\n", NDSETS); - HDprintf("\t-a N:\tnumber of attributes (default: %d).\n", NATTRS); - HDprintf("\t-r N:\tnumber of rows in the large compound dataset (default: %d).\n", NROWS); - HDprintf("\t-s N:\tsize of dim0 in datasets (default: %d).\n", DIM0); - HDprintf("\t-c N:\tchunk size of dim0 (default: %d).\n", (DIM0 / 10 + 1)); - HDprintf("\t-v N:\tmax vlen size (default: %d).\n", MAXVLEN); - HDprintf("\t-l:\tuse latest format (default: no).\n"); - HDprintf("\t-z:\tuse gzip compression (default: no).\n"); - HDprintf("\t-h:\tthis help information.\n"); - HDprintf("Example:\n"); - HDprintf("\t./a.out -f test.h5 -g 10000 -d 5000 -a 500 -r 10000 -s 200 -c 20 -v 40 -l -z\n\n"); + printf("\nOPTONS:\n"); + printf("\t-f F:\tname of the test file (default: %s).\n", FNAME); + printf("\t-g N:\tnumber of top level groups (default: %d).\n", NGROUPS); + printf("\t-d N:\tnumber of datasets (default: %d).\n", NDSETS); + printf("\t-a N:\tnumber of attributes (default: %d).\n", NATTRS); + printf("\t-r N:\tnumber of rows in the large compound dataset (default: %d).\n", NROWS); + printf("\t-s N:\tsize of dim0 in datasets (default: %d).\n", DIM0); + printf("\t-c N:\tchunk size of dim0 (default: %d).\n", (DIM0 / 10 + 1)); + printf("\t-v N:\tmax vlen size (default: %d).\n", MAXVLEN); + printf("\t-l:\tuse latest format (default: no).\n"); + printf("\t-z:\tuse gzip compression (default: no).\n"); + printf("\t-h:\tthis help information.\n"); + printf("Example:\n"); + printf("\t./a.out -f test.h5 -g 10000 -d 5000 -a 500 -r 10000 -s 200 -c 20 -v 40 -l -z\n\n"); exit(0); } } diff --git a/tools/test/misc/repart_test.c b/tools/test/misc/repart_test.c index 9359015..1ff6230 100644 --- a/tools/test/misc/repart_test.c +++ b/tools/test/misc/repart_test.c @@ -146,6 +146,6 @@ main(void) error: nerrors = MAX(1, nerrors); - HDprintf("***** %d FAMILY FILE TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S"); + printf("***** %d FAMILY FILE TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S"); HDexit(EXIT_FAILURE); } /* end main() */ diff --git a/tools/test/misc/talign.c b/tools/test/misc/talign.c index 4c145ba..72b98ed 100644 --- a/tools/test/misc/talign.c +++ b/tools/test/misc/talign.c @@ -51,7 +51,7 @@ main(void) int result = 0; herr_t error = 1; - HDprintf("%-70s", "Testing alignment in compound datatypes"); + printf("%-70s", "Testing alignment in compound datatypes"); HDstrcpy(string5, "Hi!"); HDunlink(fname); @@ -146,39 +146,39 @@ out: result = 1; mname = H5Tget_member_name(fix, 0); - HDprintf("%14s (%2d) %6s = %s\n", mname ? mname : "(null)", (int)H5Tget_member_offset(fix, 0), - string5, (char *)(data + H5Tget_member_offset(fix, 0))); + printf("%14s (%2d) %6s = %s\n", mname ? mname : "(null)", (int)H5Tget_member_offset(fix, 0), string5, + (char *)(data + H5Tget_member_offset(fix, 0))); if (mname) H5free_memory(mname); fptr = (float *)((void *)(data + H5Tget_member_offset(fix, 1))); mname = H5Tget_member_name(fix, 1); - HDprintf("Data comparison:\n" - "%14s (%2d) %6f = %f\n" - " %6f = %f\n", - mname ? mname : "(null)", (int)H5Tget_member_offset(fix, 1), (double)fok[0], (double)fptr[0], - (double)fok[1], (double)fptr[1]); + printf("Data comparison:\n" + "%14s (%2d) %6f = %f\n" + " %6f = %f\n", + mname ? mname : "(null)", (int)H5Tget_member_offset(fix, 1), (double)fok[0], (double)fptr[0], + (double)fok[1], (double)fptr[1]); if (mname) H5free_memory(mname); fptr = (float *)((void *)(data + H5Tget_member_offset(fix, 2))); mname = H5Tget_member_name(fix, 2); - HDprintf("%14s (%2d) %6f = %f\n" - " %6f = %6f\n", - mname ? mname : "(null)", (int)H5Tget_member_offset(fix, 2), (double)fnok[0], - (double)fptr[0], (double)fnok[1], (double)fptr[1]); + printf("%14s (%2d) %6f = %f\n" + " %6f = %6f\n", + mname ? mname : "(null)", (int)H5Tget_member_offset(fix, 2), (double)fnok[0], (double)fptr[0], + (double)fnok[1], (double)fptr[1]); if (mname) H5free_memory(mname); fptr = (float *)((void *)(data + H5Tget_member_offset(fix, 1))); - HDprintf("\n" - "Short circuit\n" - " %6f = %f\n" - " %6f = %f\n" - " %6f = %f\n" - " %6f = %f\n", - (double)fok[0], (double)fptr[0], (double)fok[1], (double)fptr[1], (double)fnok[0], - (double)fptr[2], (double)fnok[1], (double)fptr[3]); + printf("\n" + "Short circuit\n" + " %6f = %f\n" + " %6f = %f\n" + " %6f = %f\n" + " %6f = %f\n", + (double)fok[0], (double)fptr[0], (double)fok[1], (double)fptr[1], (double)fnok[0], + (double)fptr[2], (double)fnok[1], (double)fptr[3]); HDputs("*FAILED - compound type alignmnent problem*"); } else { diff --git a/tools/test/perform/chunk_cache.c b/tools/test/perform/chunk_cache.c index 13d7a12..33ea706 100644 --- a/tools/test/perform/chunk_cache.c +++ b/tools/test/perform/chunk_cache.c @@ -264,13 +264,12 @@ check_partial_chunks_perf(hid_t file) end_t = H5_get_time(); if ((end_t - start_t) > 0.0) - HDprintf("1. Partial chunks: total read time is %lf; number of bytes being read from file is %zu\n", - (end_t - start_t), nbytes_global); + printf("1. Partial chunks: total read time is %lf; number of bytes being read from file is %zu\n", + (end_t - start_t), nbytes_global); else - HDprintf( - "1. Partial chunks: no total read time because timer is not available; number of bytes being " - "read from file is %zu\n", - nbytes_global); + printf("1. Partial chunks: no total read time because timer is not available; number of bytes being " + "read from file is %zu\n", + nbytes_global); H5Dclose(dataset); H5Sclose(filespace); @@ -343,13 +342,12 @@ check_hash_value_perf(hid_t file) end_t = H5_get_time(); if ((end_t - start_t) > 0.0) - HDprintf("2. Hash value: total read time is %lf; number of bytes being read from file is %zu\n", - (end_t - start_t), nbytes_global); + printf("2. Hash value: total read time is %lf; number of bytes being read from file is %zu\n", + (end_t - start_t), nbytes_global); else - HDprintf( - "2. Hash value: no total read time because timer is not available; number of bytes being read " - "from file is %zu\n", - nbytes_global); + printf("2. Hash value: no total read time because timer is not available; number of bytes being read " + "from file is %zu\n", + nbytes_global); H5Dclose(dataset); H5Sclose(filespace); @@ -407,6 +405,6 @@ main(void) return 0; error: - HDfprintf(stderr, "*** ERRORS DETECTED ***\n"); + fprintf(stderr, "*** ERRORS DETECTED ***\n"); return 1; } diff --git a/tools/test/perform/direct_write_perf.c b/tools/test/perform/direct_write_perf.c index 1308fec..be9d583 100644 --- a/tools/test/perform/direct_write_perf.c +++ b/tools/test/perform/direct_write_perf.c @@ -693,7 +693,7 @@ main(void) int main(void) { - HDfprintf(stdout, "No compression IO performance because zlib was not configured\n"); + fprintf(stdout, "No compression IO performance because zlib was not configured\n"); return EXIT_SUCCESS; } diff --git a/tools/test/perform/iopipe.c b/tools/test/perform/iopipe.c index b815939..fb62f16 100644 --- a/tools/test/perform/iopipe.c +++ b/tools/test/perform/iopipe.c @@ -73,9 +73,9 @@ print_stats(const char *prefix, H5_bandwidth(bw, sizeof(bw), (double)nbytes, e_time); #ifdef H5_HAVE_GETRUSAGE - HDprintf(HEADING "%1.2fuser %1.2fsystem %1.2felapsed %s\n", prefix, u_time, s_time, e_time, bw); + printf(HEADING "%1.2fuser %1.2fsystem %1.2felapsed %s\n", prefix, u_time, s_time, e_time, bw); #else - HDprintf(HEADING "%1.2felapsed %s\n", prefix, e_time, bw); + printf(HEADING "%1.2felapsed %s\n", prefix, e_time, bw); #endif } @@ -146,7 +146,7 @@ main(void) * Win32 version 5.0 compiler. * 1998-11-06 ptl */ - HDprintf("I/O request size is %1.1fMB\n", (double)(hssize_t)(size[0] * size[1]) / 1024.0 * 1024.0); + printf("I/O request size is %1.1fMB\n", (double)(hssize_t)(size[0] * size[1]) / 1024.0 * 1024.0); /* Open the files */ file = H5Fcreate(HDF5_FILE_NAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); @@ -170,7 +170,7 @@ main(void) HDgetrusage(RUSAGE_SELF, &r_start); #endif t_start = H5_get_time(); - HDfprintf(stderr, HEADING, "fill raw"); + fprintf(stderr, HEADING, "fill raw"); for (u = 0; u < nwrite; u++) { HDputc(PROGRESS, stderr); HDfflush(stderr); @@ -193,7 +193,7 @@ main(void) HDgetrusage(RUSAGE_SELF, &r_start); #endif t_start = H5_get_time(); - HDfprintf(stderr, HEADING, "fill hdf5"); + fprintf(stderr, HEADING, "fill hdf5"); for (u = 0; u < nread; u++) { HDputc(PROGRESS, stderr); HDfflush(stderr); @@ -217,7 +217,7 @@ main(void) HDgetrusage(RUSAGE_SELF, &r_start); #endif t_start = H5_get_time(); - HDfprintf(stderr, HEADING, "out raw"); + fprintf(stderr, HEADING, "out raw"); for (u = 0; u < nwrite; u++) { HDputc(PROGRESS, stderr); HDfflush(stderr); @@ -243,7 +243,7 @@ main(void) HDgetrusage(RUSAGE_SELF, &r_start); #endif t_start = H5_get_time(); - HDfprintf(stderr, HEADING, "out hdf5"); + fprintf(stderr, HEADING, "out hdf5"); for (u = 0; u < nwrite; u++) { HDputc(PROGRESS, stderr); HDfflush(stderr); @@ -267,7 +267,7 @@ main(void) HDgetrusage(RUSAGE_SELF, &r_start); #endif t_start = H5_get_time(); - HDfprintf(stderr, HEADING, "in raw"); + fprintf(stderr, HEADING, "in raw"); for (u = 0; u < nread; u++) { HDputc(PROGRESS, stderr); HDfflush(stderr); @@ -293,7 +293,7 @@ main(void) HDgetrusage(RUSAGE_SELF, &r_start); #endif t_start = H5_get_time(); - HDfprintf(stderr, HEADING, "in hdf5"); + fprintf(stderr, HEADING, "in hdf5"); for (u = 0; u < nread; u++) { HDputc(PROGRESS, stderr); HDfflush(stderr); @@ -322,7 +322,7 @@ main(void) HDgetrusage(RUSAGE_SELF, &r_start); #endif t_start = H5_get_time(); - HDfprintf(stderr, HEADING, "in hdf5 partial"); + fprintf(stderr, HEADING, "in hdf5 partial"); for (u = 0; u < nread; u++) { HDputc(PROGRESS, stderr); HDfflush(stderr); diff --git a/tools/test/perform/overhead.c b/tools/test/perform/overhead.c index 257d3ec..82c7131 100644 --- a/tools/test/perform/overhead.c +++ b/tools/test/perform/overhead.c @@ -67,8 +67,8 @@ typedef enum fill_t { FILL_ALL, FILL_FORWARD, FILL_REVERSE, FILL_INWARD, FILL_OU static void usage(const char *prog) { - HDfprintf(stderr, "usage: %s [STYLE|cache] [LEFT [MIDDLE [RIGHT]]]\n", prog); - HDfprintf(stderr, "\ + fprintf(stderr, "usage: %s [STYLE|cache] [LEFT [MIDDLE [RIGHT]]]\n", prog); + fprintf(stderr, "\ STYLE is the order that the dataset is filled and should be one of:\n\ forward -- Fill the dataset from lowest address to highest\n\ address. This style tests the right split ratio.\n\ @@ -230,7 +230,7 @@ test(fill_t fill_style, const double splits[], hbool_t verbose, hbool_t use_rdcc abort(); default: /* unknown request */ - HDfprintf(stderr, "Unknown fill style\n"); + fprintf(stderr, "Unknown fill style\n"); goto error; break; } @@ -286,7 +286,7 @@ test(fill_t fill_style, const double splits[], hbool_t verbose, hbool_t use_rdcc abort(); default: /* unknown request */ - HDfprintf(stderr, "Unknown fill style\n"); + fprintf(stderr, "Unknown fill style\n"); goto error; break; } @@ -394,6 +394,6 @@ main(int argc, char *argv[]) return 0; error: - HDfprintf(stderr, "*** ERRORS DETECTED ***\n"); + fprintf(stderr, "*** ERRORS DETECTED ***\n"); return 1; } diff --git a/tools/test/perform/perf_meta.c b/tools/test/perform/perf_meta.c index 5fe3631..5f1bbbe 100644 --- a/tools/test/perform/perf_meta.c +++ b/tools/test/perform/perf_meta.c @@ -399,8 +399,7 @@ create_attrs_1(void) attr_t.avg = attr_t.total / (NUM_ATTRS * NUM_DSETS); /* Print out the performance result */ - HDfprintf(stderr, "1. Create %d attributes for each of %d existing datasets\n", NUM_ATTRS, - NUM_DSETS); + fprintf(stderr, "1. Create %d attributes for each of %d existing datasets\n", NUM_ATTRS, NUM_DSETS); print_perf(open_t, close_t, attr_t); } @@ -500,7 +499,7 @@ create_attrs_2(void) attr_t.avg = attr_t.total / (NUM_ATTRS * NUM_DSETS); /* Print out the performance result */ - HDfprintf(stderr, "2. Create %d attributes for each of %d new datasets\n", NUM_ATTRS, NUM_DSETS); + fprintf(stderr, "2. Create %d attributes for each of %d new datasets\n", NUM_ATTRS, NUM_DSETS); print_perf(create_t, close_t, attr_t); } @@ -608,8 +607,8 @@ create_attrs_3(void) attr_t.avg = attr_t.total / (NUM_ATTRS * NUM_DSETS); /* Print out the performance result */ - HDfprintf(stderr, "3. Create %d attributes for each of %d existing datasets for %d times\n", - BATCH_ATTRS, NUM_DSETS, loop_num); + fprintf(stderr, "3. Create %d attributes for each of %d existing datasets for %d times\n", + BATCH_ATTRS, NUM_DSETS, loop_num); print_perf(open_t, close_t, attr_t); } @@ -715,13 +714,13 @@ perf(p_time *perf_t, double start_t, double end_t) void print_perf(p_time open_t, p_time close_t, p_time attr_t) { - HDfprintf(stderr, "\t%s:\t\tavg=%.6fs;\tmax=%.6fs;\tmin=%.6fs\n", open_t.func, open_t.avg, open_t.max, - open_t.min); - HDfprintf(stderr, "\tH5Dclose:\t\tavg=%.6fs;\tmax=%.6fs;\tmin=%.6fs\n", close_t.avg, close_t.max, - close_t.min); + fprintf(stderr, "\t%s:\t\tavg=%.6fs;\tmax=%.6fs;\tmin=%.6fs\n", open_t.func, open_t.avg, open_t.max, + open_t.min); + fprintf(stderr, "\tH5Dclose:\t\tavg=%.6fs;\tmax=%.6fs;\tmin=%.6fs\n", close_t.avg, close_t.max, + close_t.min); if (NUM_ATTRS) - HDfprintf(stderr, "\tH5A(create & close):\tavg=%.6fs;\tmax=%.6fs;\tmin=%.6fs\n", attr_t.avg, - attr_t.max, attr_t.min); + fprintf(stderr, "\tH5A(create & close):\tavg=%.6fs;\tmax=%.6fs;\tmin=%.6fs\n", attr_t.avg, attr_t.max, + attr_t.min); } /*------------------------------------------------------------------------- @@ -761,7 +760,7 @@ main(int argc, char **argv) #ifdef H5_HAVE_PARALLEL if (facc_type == FACC_DEFAULT || (facc_type != FACC_DEFAULT && MAINPROCESS)) #endif /*H5_HAVE_PARALLEL*/ - HDfprintf(stderr, "\t\tPerformance result of metadata for datasets and attributes\n\n"); + fprintf(stderr, "\t\tPerformance result of metadata for datasets and attributes\n\n"); fapl = H5Pcreate(H5P_FILE_ACCESS); #ifdef H5_HAVE_PARALLEL diff --git a/tools/test/perform/zip_perf.c b/tools/test/perform/zip_perf.c index 256289c..abd1649 100644 --- a/tools/test/perform/zip_perf.c +++ b/tools/test/perform/zip_perf.c @@ -84,11 +84,11 @@ error(const char *fmt, ...) va_list ap; va_start(ap, fmt); - HDfprintf(stderr, "%s: error: ", prog); + fprintf(stderr, "%s: error: ", prog); H5_GCC_CLANG_DIAG_OFF("format-nonliteral") HDvfprintf(stderr, fmt, ap); H5_GCC_CLANG_DIAG_ON("format-nonliteral") - HDfprintf(stderr, "\n"); + fprintf(stderr, "\n"); va_end(ap); HDexit(EXIT_FAILURE); } @@ -130,7 +130,7 @@ write_file(Bytef *source, uLongf sourceLen) ((double)timer_start.tv_sec + ((double)timer_start.tv_usec) / MICROSECOND); if (report_once_flag) { - HDfprintf(stdout, "\tCompression Ratio: %g\n", ((double)destLen) / (double)sourceLen); + fprintf(stdout, "\tCompression Ratio: %g\n", ((double)destLen) / (double)sourceLen); report_once_flag = 0; } @@ -235,29 +235,29 @@ get_unique_name(void) static void usage(void) { - HDfprintf(stdout, "usage: %s [OPTIONS]\n", prog); - HDfprintf(stdout, " OPTIONS\n"); - HDfprintf(stdout, " -h, --help Print this usage message and exit\n"); - HDfprintf(stdout, " -1...-9 Level of compression, from 1 to 9\n"); - HDfprintf(stdout, " -c P, --compressability=P Percentage of compressability of the random\n"); - HDfprintf(stdout, " data you want [default: 0]"); - HDfprintf(stdout, " -s S, --file-size=S Maximum size of uncompressed file [default: 64M]\n"); - HDfprintf(stdout, " -B S, --max-buffer_size=S Maximum size of buffer [default: 1M]\n"); - HDfprintf(stdout, " -b S, --min-buffer_size=S Minimum size of buffer [default: 128K]\n"); - HDfprintf(stdout, " -p D, --prefix=D The directory prefix to place the file\n"); - HDfprintf(stdout, " -r, --random-test Use random data to write to the file\n"); - HDfprintf(stdout, " [default: no]\n"); - HDfprintf(stdout, "\n"); - HDfprintf(stdout, " D - a directory which exists\n"); - HDfprintf(stdout, " P - a number between 0 and 100\n"); - HDfprintf(stdout, " S - is a size specifier, an integer >=0 followed by a size indicator:\n"); - HDfprintf(stdout, "\n"); - HDfprintf(stdout, " K - Kilobyte (%d)\n", ONE_KB); - HDfprintf(stdout, " M - Megabyte (%d)\n", ONE_MB); - HDfprintf(stdout, " G - Gigabyte (%d)\n", ONE_GB); - HDfprintf(stdout, "\n"); - HDfprintf(stdout, " Example: 37M = 37 Megabytes = %d bytes\n", 37 * ONE_MB); - HDfprintf(stdout, "\n"); + fprintf(stdout, "usage: %s [OPTIONS]\n", prog); + fprintf(stdout, " OPTIONS\n"); + fprintf(stdout, " -h, --help Print this usage message and exit\n"); + fprintf(stdout, " -1...-9 Level of compression, from 1 to 9\n"); + fprintf(stdout, " -c P, --compressability=P Percentage of compressability of the random\n"); + fprintf(stdout, " data you want [default: 0]"); + fprintf(stdout, " -s S, --file-size=S Maximum size of uncompressed file [default: 64M]\n"); + fprintf(stdout, " -B S, --max-buffer_size=S Maximum size of buffer [default: 1M]\n"); + fprintf(stdout, " -b S, --min-buffer_size=S Minimum size of buffer [default: 128K]\n"); + fprintf(stdout, " -p D, --prefix=D The directory prefix to place the file\n"); + fprintf(stdout, " -r, --random-test Use random data to write to the file\n"); + fprintf(stdout, " [default: no]\n"); + fprintf(stdout, "\n"); + fprintf(stdout, " D - a directory which exists\n"); + fprintf(stdout, " P - a number between 0 and 100\n"); + fprintf(stdout, " S - is a size specifier, an integer >=0 followed by a size indicator:\n"); + fprintf(stdout, "\n"); + fprintf(stdout, " K - Kilobyte (%d)\n", ONE_KB); + fprintf(stdout, " M - Megabyte (%d)\n", ONE_MB); + fprintf(stdout, " G - Gigabyte (%d)\n", ONE_GB); + fprintf(stdout, "\n"); + fprintf(stdout, " Example: 37M = 37 Megabytes = %d bytes\n", 37 * ONE_MB); + fprintf(stdout, "\n"); HDfflush(stdout); } @@ -319,7 +319,7 @@ fill_with_random_data(Bytef *src, uLongf src_len) Bytef *buf = src; int fd = HDopen("/dev/urandom", O_RDONLY, 0); - HDfprintf(stdout, "Using /dev/urandom for random data\n"); + fprintf(stdout, "Using /dev/urandom for random data\n"); if (fd < 0) error(HDstrerror(errno)); @@ -339,7 +339,7 @@ fill_with_random_data(Bytef *src, uLongf src_len) HDclose(fd); } else { - HDfprintf(stdout, "Using random() for random data\n"); + fprintf(stdout, "Using random() for random data\n"); for (u = 0; u < src_len; ++u) src[u] = (Bytef)(0xff & HDrandom()); @@ -376,21 +376,21 @@ do_write_test(unsigned long file_size, unsigned long min_buf_size, unsigned long if (random_test) fill_with_random_data(src, src_len); - HDfprintf(stdout, "Buffer size == "); + fprintf(stdout, "Buffer size == "); if (src_len >= ONE_KB && (src_len % ONE_KB) == 0) { if (src_len >= ONE_MB && (src_len % ONE_MB) == 0) { - HDfprintf(stdout, "%ldMB", src_len / ONE_MB); + fprintf(stdout, "%ldMB", src_len / ONE_MB); } else { - HDfprintf(stdout, "%ldKB", src_len / ONE_KB); + fprintf(stdout, "%ldKB", src_len / ONE_KB); } } else { - HDfprintf(stdout, "%ld", src_len); + fprintf(stdout, "%ld", src_len); } - HDfprintf(stdout, "\n"); + fprintf(stdout, "\n"); /* do uncompressed data write */ HDgettimeofday(&timer_start, NULL); @@ -424,8 +424,8 @@ do_write_test(unsigned long file_size, unsigned long min_buf_size, unsigned long total_time = ((double)timer_stop.tv_sec + ((double)timer_stop.tv_usec) / (double)MICROSECOND) - ((double)timer_start.tv_sec + ((double)timer_start.tv_usec) / (double)MICROSECOND); - HDfprintf(stdout, "\tUncompressed Write Time: %.2fs\n", total_time); - HDfprintf(stdout, "\tUncompressed Write Throughput: %.2fMB/s\n", MB_PER_SEC(file_size, total_time)); + fprintf(stdout, "\tUncompressed Write Time: %.2fs\n", total_time); + fprintf(stdout, "\tUncompressed Write Throughput: %.2fMB/s\n", MB_PER_SEC(file_size, total_time)); HDunlink(filename); @@ -447,9 +447,9 @@ do_write_test(unsigned long file_size, unsigned long min_buf_size, unsigned long total_time = ((double)timer_stop.tv_sec + ((double)timer_stop.tv_usec) / (double)MICROSECOND) - ((double)timer_start.tv_sec + ((double)timer_start.tv_usec) / (double)MICROSECOND); - HDfprintf(stdout, "\tCompressed Write Time: %.2fs\n", total_time); - HDfprintf(stdout, "\tCompressed Write Throughput: %.2fMB/s\n", MB_PER_SEC(file_size, total_time)); - HDfprintf(stdout, "\tCompression Time: %gs\n", compression_time); + fprintf(stdout, "\tCompressed Write Time: %.2fs\n", total_time); + fprintf(stdout, "\tCompressed Write Throughput: %.2fMB/s\n", MB_PER_SEC(file_size, total_time)); + fprintf(stdout, "\tCompression Time: %gs\n", compression_time); HDunlink(filename); HDfree(src); @@ -527,12 +527,12 @@ main(int argc, char *argv[]) if (min_buf_size > max_buf_size) error("minimum buffer size (%d) exceeds maximum buffer size (%d)", min_buf_size, max_buf_size); - HDfprintf(stdout, "Filesize: %ld\n", file_size); + fprintf(stdout, "Filesize: %ld\n", file_size); if (compress_level == Z_DEFAULT_COMPRESSION) - HDfprintf(stdout, "Compression Level: 6\n"); + fprintf(stdout, "Compression Level: 6\n"); else - HDfprintf(stdout, "Compression Level: %d\n", compress_level); + fprintf(stdout, "Compression Level: %d\n", compress_level); get_unique_name(); do_write_test(file_size, min_buf_size, max_buf_size); @@ -552,7 +552,7 @@ main(int argc, char *argv[]) int main(void) { - HDfprintf(stdout, "No compression IO performance because zlib was not configured\n"); + fprintf(stdout, "No compression IO performance because zlib was not configured\n"); return EXIT_SUCCESS; } |