summaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
Diffstat (limited to 'utils')
-rw-r--r--utils/mirror_vfd/mirror_remote.c4
-rw-r--r--utils/mirror_vfd/mirror_server.c16
-rw-r--r--utils/mirror_vfd/mirror_server_stop.c20
-rw-r--r--utils/mirror_vfd/mirror_writer.c4
-rwxr-xr-xutils/subfiling_vfd/h5fuse.sh.in4
-rw-r--r--utils/test/swmr_check_compat_vfd.c2
-rw-r--r--utils/tools/h5dwalk/h5dwalk.142
-rw-r--r--utils/tools/h5dwalk/h5dwalk.c98
-rw-r--r--utils/tools/test/h5dwalk/testh5dwalk.sh.in5
9 files changed, 76 insertions, 119 deletions
diff --git a/utils/mirror_vfd/mirror_remote.c b/utils/mirror_vfd/mirror_remote.c
index 4f87c17..a511527 100644
--- a/utils/mirror_vfd/mirror_remote.c
+++ b/utils/mirror_vfd/mirror_remote.c
@@ -60,7 +60,7 @@ mirror_log(struct mirror_log_info *info, unsigned int level, const char *format,
if (format != NULL) {
va_list args;
va_start(args, format);
- HDvfprintf(stream, format, args);
+ vfprintf(stream, format, args);
va_end(args);
}
@@ -158,7 +158,7 @@ mirror_log_init(char *path, const char *prefix, unsigned int verbosity)
info->prefix[0] = '\0';
if (prefix && *prefix) {
- HDstrncpy(info->prefix, prefix, MIRROR_LOG_PREFIX_MAX);
+ strncpy(info->prefix, prefix, MIRROR_LOG_PREFIX_MAX);
}
if (path && *path) {
diff --git a/utils/mirror_vfd/mirror_server.c b/utils/mirror_vfd/mirror_server.c
index 3bf075a..597e307 100644
--- a/utils/mirror_vfd/mirror_server.c
+++ b/utils/mirror_vfd/mirror_server.c
@@ -187,22 +187,22 @@ parse_args(int argc, char **argv, struct op_args *args_out)
/* Loop over arguments after program name */
for (int i = 1; i < argc; i++) {
- if (!HDstrncmp(argv[i], "-h", 3) || !HDstrncmp(argv[i], "--help", 7)) {
+ if (!strncmp(argv[i], "-h", 3) || !strncmp(argv[i], "--help", 7)) {
mirror_log(NULL, V_INFO, "found help argument");
args_out->help = 1;
return 0;
} /* end if help */
- else if (!HDstrncmp(argv[i], "--port=", 7)) {
+ else if (!strncmp(argv[i], "--port=", 7)) {
mirror_log(NULL, V_INFO, "parsing 'main_port' (%s)", argv[i] + 7);
args_out->main_port = atoi(argv[i] + 7);
} /* end if port */
- else if (!HDstrncmp(argv[i], "--verbosity=", 12)) {
+ else if (!strncmp(argv[i], "--verbosity=", 12)) {
mirror_log(NULL, V_INFO, "parsing 'verbosity' (%s)", argv[i] + 12);
args_out->verbosity = (unsigned int)atoi(argv[i] + 12);
} /* end if verbosity */
- else if (!HDstrncmp(argv[i], "--logpath=", 10)) {
+ else if (!strncmp(argv[i], "--logpath=", 10)) {
mirror_log(NULL, V_INFO, "parsing 'logpath' (%s)", argv[i] + 10);
- HDstrncpy(args_out->log_path, argv[i] + 10, PATH_MAX);
+ strncpy(args_out->log_path, argv[i] + 10, PATH_MAX);
} /* end if logpath */
else {
mirror_log(NULL, V_ERR, "unrecognized argument: %s", argv[i]);
@@ -257,7 +257,7 @@ prepare_listening_socket(struct server_run *run)
mirror_log(run->loginfo, V_INFO, "bind()");
ret = bind(ret_value, (struct sockaddr *)&server_addr, sizeof(server_addr));
if (ret < 0) {
- mirror_log(run->loginfo, V_ERR, "bind() %s", HDstrerror(errno));
+ mirror_log(run->loginfo, V_ERR, "bind() %s", strerror(errno));
goto error;
}
@@ -517,7 +517,7 @@ handle_requests(struct server_run *run)
/* Respond to handshake message.
*/
- if (!HDstrncmp("SHUTDOWN", mybuf, 8)) {
+ if (!strncmp("SHUTDOWN", mybuf, 8)) {
/* Stop operation if told to stop */
mirror_log(run->loginfo, V_INFO, "received SHUTDOWN!", ret);
@@ -533,7 +533,7 @@ handle_requests(struct server_run *run)
connfd = -1;
goto done;
} /* end if explicit "SHUTDOWN" directive */
- if (!HDstrncmp("CONFIRM", mybuf, 7)) {
+ if (!strncmp("CONFIRM", mybuf, 7)) {
/* Confirm operation */
if ((ret = HDwrite(connfd, "ALIVE", 6)) < 0) {
mirror_log(run->loginfo, V_ERR, "write:%d", ret);
diff --git a/utils/mirror_vfd/mirror_server_stop.c b/utils/mirror_vfd/mirror_server_stop.c
index 52dea08..6b2b1b1 100644
--- a/utils/mirror_vfd/mirror_server_stop.c
+++ b/utils/mirror_vfd/mirror_server_stop.c
@@ -89,16 +89,16 @@ parse_args(int argc, char **argv, struct mshs_opts *opts)
opts->magic = MSHS_OPTS_MAGIC;
opts->help = 0;
opts->portno = MSHS_DEFAULT_PORTNO;
- HDstrncpy(opts->ip, MSHS_DEFAULT_IP, MSHS_IP_STR_SIZE);
+ strncpy(opts->ip, MSHS_DEFAULT_IP, MSHS_IP_STR_SIZE);
for (i = 1; i < argc; i++) { /* start with first possible option argument */
- if (!HDstrncmp(argv[i], "-h", 3) || !HDstrncmp(argv[i], "--help", 7)) {
+ if (!strncmp(argv[i], "-h", 3) || !strncmp(argv[i], "--help", 7)) {
opts->help = 1;
}
- else if (!HDstrncmp(argv[i], "--ip=", 5)) {
- HDstrncpy(opts->ip, argv[i] + 5, MSHS_IP_STR_SIZE);
+ else if (!strncmp(argv[i], "--ip=", 5)) {
+ strncpy(opts->ip, argv[i] + 5, MSHS_IP_STR_SIZE);
}
- else if (!HDstrncmp(argv[i], "--port=", 7)) {
+ else if (!strncmp(argv[i], "--port=", 7)) {
opts->portno = atoi(argv[i] + 7);
}
else {
@@ -110,8 +110,8 @@ parse_args(int argc, char **argv, struct mshs_opts *opts)
} /* end for each argument from command line */
/* auto-replace 'localhost' with numeric IP */
- if (!HDstrncmp(opts->ip, "localhost", 10)) { /* include null terminator */
- HDstrncpy(opts->ip, "127.0.0.1", MSHS_IP_STR_SIZE);
+ if (!strncmp(opts->ip, "localhost", 10)) { /* include null terminator */
+ strncpy(opts->ip, "127.0.0.1", MSHS_IP_STR_SIZE);
}
return 0;
@@ -149,12 +149,12 @@ send_shutdown(struct mshs_opts *opts)
memset(target_addr.sin_zero, 0, sizeof(target_addr.sin_zero));
if (connect(live_socket, (struct sockaddr *)&target_addr, (socklen_t)sizeof(target_addr)) < 0) {
- printf("ERROR connect() (%d)\n%s\n", errno, HDstrerror(errno));
+ printf("ERROR connect() (%d)\n%s\n", errno, strerror(errno));
return -1;
}
if (HDwrite(live_socket, "SHUTDOWN", 9) == -1) {
- printf("ERROR write() (%d)\n%s\n", errno, HDstrerror(errno));
+ printf("ERROR write() (%d)\n%s\n", errno, strerror(errno));
return -1;
}
@@ -163,7 +163,7 @@ send_shutdown(struct mshs_opts *opts)
printf("ERROR read() can't receive data\n");
return -1;
}
- if (HDstrncmp("CLOSING", mybuf, 8)) {
+ if (strncmp("CLOSING", mybuf, 8)) {
printf("ERROR read() didn't receive data from server\n");
return -1;
}
diff --git a/utils/mirror_vfd/mirror_writer.c b/utils/mirror_vfd/mirror_writer.c
index 24fbc77..a5a1d27 100644
--- a/utils/mirror_vfd/mirror_writer.c
+++ b/utils/mirror_vfd/mirror_writer.c
@@ -382,7 +382,7 @@ reply_error(struct mirror_session *session, const char *msg)
mirror_log(session->loginfo, V_ALL, "reply_error(%s)", msg);
reply->status = H5FD_MIRROR_STATUS_ERROR;
- HDsnprintf(reply->message, H5FD_MIRROR_STATUS_MESSAGE_MAX - 1, "%s", msg);
+ snprintf(reply->message, H5FD_MIRROR_STATUS_MESSAGE_MAX - 1, "%s", msg);
return _xmit_reply(session);
} /* end reply_error() */
@@ -838,7 +838,7 @@ receive_communique(struct mirror_session *session, struct sock_comm *comm)
} /* end if hexdump transmissions received */
/* old-fashioned manual kill (for debugging) */
- if (!HDstrncmp("GOODBYE", comm->raw, 7)) {
+ if (!strncmp("GOODBYE", comm->raw, 7)) {
mirror_log(session->loginfo, V_INFO, "received GOODBYE");
comm->recd_die = 1;
goto done;
diff --git a/utils/subfiling_vfd/h5fuse.sh.in b/utils/subfiling_vfd/h5fuse.sh.in
index 2085033..c6d715f 100755
--- a/utils/subfiling_vfd/h5fuse.sh.in
+++ b/utils/subfiling_vfd/h5fuse.sh.in
@@ -20,7 +20,7 @@ NC='\033[0m' # No Color
############################################################
# Usage #
############################################################
-function usage() {
+function usage {
echo ""
# Display usage
echo "Purpose: Combine subfiles into a single HDF5 file. Requires the subfiling
@@ -37,7 +37,7 @@ function usage() {
echo ""
}
-function gen_mpi() {
+function gen_mpi {
# Program to determine MPI rank and size if being run in parallel (-p).
diff --git a/utils/test/swmr_check_compat_vfd.c b/utils/test/swmr_check_compat_vfd.c
index 765ebd9..b5cfb1b 100644
--- a/utils/test/swmr_check_compat_vfd.c
+++ b/utils/test/swmr_check_compat_vfd.c
@@ -42,7 +42,7 @@ main(void)
{
char *driver = NULL;
- driver = HDgetenv(HDF5_DRIVER);
+ driver = getenv(HDF5_DRIVER);
if (H5FD__supports_swmr_test(driver))
return EXIT_SUCCESS;
diff --git a/utils/tools/h5dwalk/h5dwalk.1 b/utils/tools/h5dwalk/h5dwalk.1
deleted file mode 100644
index eb0e5e8..0000000
--- a/utils/tools/h5dwalk/h5dwalk.1
+++ /dev/null
@@ -1,42 +0,0 @@
-.TH "h5dwalk" 1
-.SH NAME
-h5dwalk \- Provides a means of extending HDF5 tools by using parallelism on groups of files.
-.SH SYNOPSIS
-h5dwalk [OPTIONS] -T h5tool [H5TOOL_options...]
-.SH DESCRIPTION
-h5dwalk utilizes the mpiFileUtils library to invoke a selected HDF5 tool on a collection of files. The mpiFileUtils library provides the facilities to walk directory trees and provide a selection of files contained therein. This selection can be filtered in various ways. At present, h5dwalk filters the original file selection to include only HDF5 formatted files. The resulting collection or collections can be utilized as the file inputs to the selected h5tool.
-.SH OPTIONS
-.TP
-.B \-h
-or
-.B \-\-help
-Print a usage message and exit.
-.TP
-.B \-i
-or
-.B \-\-input filename
-Read command input from a file. Not yet implemented.
-.TP
-.B \-o
-or
-.B \-\-output filename
-Captures the hdf5 tool output into a named file.
-.TP
-.B \-l
-or
-.B \-\-log [file]
-Captures hdf5 tool output into a individual log files. If an optional file (directory) is specified, then output from all tool instances will be written in the given file directory. Without the optional filename, each tool instance output will be captured in a new log file whose name is associated with the hdf5 tool that was run and is written in the current working directory.
-.TP
-.B \-E
-or
-.B \-\-error [file]
-Show all HDF5 error reporting. Behavior is similar to --log, i.e. errors can either be logged in a single named file or in individual tool specific files. Not yet implemented.
-.TP
-.B \-T
-or
-.B \-\-tool hdf5_tool
-Specifies the hdf5 tool that should be invoked for each file in a collection of files. The collection consists of individual HDF5 files found by walking a specified directory tree which is used in place of the normal tool filename argument. The '-T' option should appear on the command line just prior to the HDF5 tool argument options.
-.TP
-.SH "SEE ALSO"
-\&\fIh5dump\fR\|(1), \fIh5diff\fR\|(1), \fIh5repart\fR\|(1), \fIh5diff\fR\|(1),
-\&\fIh5import\fR\|(1), \fIgif2h5\fR\|(1), \fIh52gif\fR\|(1), \fIh5perf\fR\|(1)
diff --git a/utils/tools/h5dwalk/h5dwalk.c b/utils/tools/h5dwalk/h5dwalk.c
index 256ac45..b510f3e 100644
--- a/utils/tools/h5dwalk/h5dwalk.c
+++ b/utils/tools/h5dwalk/h5dwalk.c
@@ -97,7 +97,7 @@ static void
save_command(const char *argv0)
{
assert(argv0);
- user_cmd = HDstrdup(argv0);
+ user_cmd = strdup(argv0);
}
static void
@@ -328,7 +328,7 @@ distribution_parse(struct distribute_option *option, const char *string)
return -1;
}
- str = HDstrdup(string);
+ str = strdup(string);
/* Parse separators */
ptr = str + strlen("size:");
next = ptr;
@@ -761,9 +761,9 @@ fill_file_list(mfu_flist new_flist, const char *config_filename, int myrank, int
FILE *config = fopen(config_filename, "r");
if (config == NULL)
return -1;
- while (HDfgets(linebuf, sizeof(linebuf), config) != NULL) {
+ while (fgets(linebuf, sizeof(linebuf), config) != NULL) {
struct stat statbuf;
- char *eol = HDstrchr(linebuf, '\n');
+ char *eol = strchr(linebuf, '\n');
if (eol)
*eol = '\0';
if (HDstat(linebuf, &statbuf) == 0) {
@@ -835,10 +835,10 @@ copy_args(int argc, const char *argv[], int *mfu_argc, int *copy_len)
save_command(argv[0]);
for (i = 0; i < argc; i++) {
- argv_copy[i] = HDstrdup(argv[i]);
+ argv_copy[i] = strdup(argv[i]);
bytes_copied += (int)(strlen(argv[i]) + 1);
- argv_copy[i] = HDstrdup(argv[i]);
- if (check_mfu_args && (HDstrncmp(argv[i], "-T", 2) == 0)) {
+ argv_copy[i] = strdup(argv[i]);
+ if (check_mfu_args && (strncmp(argv[i], "-T", 2) == 0)) {
check_mfu_args = 0;
*mfu_argc = i + 1;
}
@@ -878,7 +878,7 @@ get_copy_count(char *fname, char *appname)
hash_index = filehash % NAME_ENTRIES;
if (filename_cache[hash_index].name == NULL) {
filename_cache[hash_index].hash = apphash;
- filename_cache[hash_index].name = HDstrdup(fname);
+ filename_cache[hash_index].name = strdup(fname);
filename_cache[hash_index].next = NULL;
filename_cache[hash_index].nextCount = 1;
return 0;
@@ -906,7 +906,7 @@ get_copy_count(char *fname, char *appname)
nextEntry = (hash_entry_t *)malloc(sizeof(hash_entry_t));
if (nextEntry) {
lastEntry->next = nextEntry;
- nextEntry->name = HDstrdup(fname);
+ nextEntry->name = strdup(fname);
nextEntry->hash = apphash;
nextEntry->next = NULL;
nextEntry->nextCount = 1;
@@ -929,7 +929,7 @@ run_command(int argc __attribute__((unused)), char **argv, char *cmdline, const
#else
/* create a copy of the 1st file passed to the application */
- HDstrcpy(filepath, fname);
+ strcpy(filepath, fname);
if (log_output_in_single_file || use_stdout) {
pid_t pid;
@@ -992,7 +992,7 @@ run_command(int argc __attribute__((unused)), char **argv, char *cmdline, const
nbytes = strlen(cmdline);
/* Record the command line for the log! */
if (nbytes < remaining) {
- HDstrcpy(&buf[offset], cmdline);
+ strcpy(&buf[offset], cmdline);
thisbuft->chars += nbytes;
thisbuft->count -= nbytes;
remaining -= nbytes;
@@ -1014,7 +1014,7 @@ run_command(int argc __attribute__((unused)), char **argv, char *cmdline, const
thisbuft->bufsize = BUFT_SIZE;
thisbuft->dt = MPI_CHAR;
/* Copy the remaining cmdline text into the new buffer */
- HDstrcpy(buf, nextpart);
+ strcpy(buf, nextpart);
/* And update our buffer info */
// thisbuft->chars = strlen(nextpart) +1;
thisbuft->chars = strlen(nextpart);
@@ -1061,8 +1061,8 @@ run_command(int argc __attribute__((unused)), char **argv, char *cmdline, const
char logpath[2048];
char logErrors[2048];
char current_dir[2048];
- char *logbase = HDstrdup(basename(filepath));
- char *thisapp = HDstrdup(basename(toolname));
+ char *logbase = strdup(basename(filepath));
+ char *thisapp = strdup(basename(toolname));
if (processing_inputfile == 0)
log_instance = get_copy_count(logbase, thisapp);
@@ -1071,12 +1071,12 @@ run_command(int argc __attribute__((unused)), char **argv, char *cmdline, const
if ((log_instance > 0) || processing_inputfile) {
if (processing_inputfile)
log_instance = current_input_index;
- HDsnprintf(logpath, sizeof(logpath), "%s/%s_%s.log_%d",
- HDgetcwd(current_dir, sizeof(current_dir)), logbase, thisapp, log_instance);
+ snprintf(logpath, sizeof(logpath), "%s/%s_%s.log_%d",
+ HDgetcwd(current_dir, sizeof(current_dir)), logbase, thisapp, log_instance);
}
else {
- HDsnprintf(logpath, sizeof(logpath), "%s/%s_%s.log",
- HDgetcwd(current_dir, sizeof(current_dir)), logbase, thisapp);
+ snprintf(logpath, sizeof(logpath), "%s/%s_%s.log", HDgetcwd(current_dir, sizeof(current_dir)),
+ logbase, thisapp);
}
}
else {
@@ -1085,17 +1085,17 @@ run_command(int argc __attribute__((unused)), char **argv, char *cmdline, const
if (processing_inputfile)
log_instance = current_input_index;
if (txtlog[log_len - 1] == '/')
- HDsnprintf(logpath, sizeof(logpath), "%s%s_%s.log_%d", txtlog, logbase, thisapp,
- log_instance);
+ snprintf(logpath, sizeof(logpath), "%s%s_%s.log_%d", txtlog, logbase, thisapp,
+ log_instance);
else
- HDsnprintf(logpath, sizeof(logpath), "%s/%s_%s.log_%d", txtlog, logbase, thisapp,
- log_instance);
+ snprintf(logpath, sizeof(logpath), "%s/%s_%s.log_%d", txtlog, logbase, thisapp,
+ log_instance);
}
else {
if (txtlog[log_len - 1] == '/')
- HDsnprintf(logpath, sizeof(logpath), "%s%s_%s.log", txtlog, logbase, thisapp);
+ snprintf(logpath, sizeof(logpath), "%s%s_%s.log", txtlog, logbase, thisapp);
else
- HDsnprintf(logpath, sizeof(logpath), "%s/%s_%s.log", txtlog, logbase, thisapp);
+ snprintf(logpath, sizeof(logpath), "%s/%s_%s.log", txtlog, logbase, thisapp);
}
}
@@ -1105,8 +1105,8 @@ run_command(int argc __attribute__((unused)), char **argv, char *cmdline, const
* copy of the logpath variable.
*/
log_len = strlen(logpath);
- HDstrcpy(logErrors, logpath);
- HDstrcpy(&logErrors[log_len - 3], "err");
+ strcpy(logErrors, logpath);
+ strcpy(&logErrors[log_len - 3], "err");
}
if (mfu_debug_level == MFU_LOG_VERBOSE) {
printf("\tCreating logfile: %s\n", logpath);
@@ -1161,7 +1161,7 @@ MFU_PRED_EXEC(mfu_flist flist, uint64_t idx, void *arg)
toolname = buf;
/* Get a copy of fname */
- HDstrcpy(filepath, fname);
+ strcpy(filepath, fname);
/* allocate a char* for each item in the argv array,
* plus one more for a trailing NULL
@@ -1173,10 +1173,10 @@ MFU_PRED_EXEC(mfu_flist flist, uint64_t idx, void *arg)
char cmdline[2048];
char **argv = (char **)MFU_CALLOC((size_t)(count + 2), sizeof(char *));
- argv[k++] = HDstrdup(toolname);
+ argv[k++] = strdup(toolname);
memset(cmdline, 0, sizeof(cmdline));
- buf += HDstrlen(toolname) + 1;
+ buf += strlen(toolname) + 1;
/* Reconstruct the command line that the user provided for the h5tool */
for (k = 1; k < count; k++) {
if (buf[0] == '&') {
@@ -1193,26 +1193,26 @@ MFU_PRED_EXEC(mfu_flist flist, uint64_t idx, void *arg)
if (fname_arg == NULL) {
printf("[%d] Warning: Unable to resolve file_substitution %d (idx=%ld)\n", sg_mpi_rank,
file_substituted, idx);
- argv[k] = HDstrdup(fname);
+ argv[k] = strdup(fname);
}
else {
- argv[k] = HDstrdup(fname_arg);
+ argv[k] = strdup(fname_arg);
file_substituted++;
}
}
else {
- argv[k] = HDstrdup(buf);
- buf += HDstrlen(argv[k]) + 1;
+ argv[k] = strdup(buf);
+ buf += strlen(argv[k]) + 1;
}
}
- HDsnprintf(cmdline, sizeof(cmdline), "\n---------\nCommand:");
+ snprintf(cmdline, sizeof(cmdline), "\n---------\nCommand:");
b_offset = strlen(cmdline);
for (k = 0; k < count; k++) {
- HDsprintf(&cmdline[b_offset], " %s", argv[k]);
+ sprintf(&cmdline[b_offset], " %s", argv[k]);
b_offset = strlen(cmdline);
}
- HDsprintf(&cmdline[b_offset], "\n");
+ sprintf(&cmdline[b_offset], "\n");
run_command(count, argv, cmdline, fname);
mfu_free(argv);
@@ -1244,7 +1244,7 @@ static void
add_executable(int argc, char **argv, char *cmdstring, int *f_index, int f_count __attribute__((unused)))
{
char cmdline[2048];
- HDsnprintf(cmdline, sizeof(cmdline), "\n---------\nCommand: %s\n", cmdstring);
+ snprintf(cmdline, sizeof(cmdline), "\n---------\nCommand: %s\n", cmdstring);
argv[argc] = NULL;
run_command(argc, argv, cmdline, argv[f_index[0]]);
return;
@@ -1270,7 +1270,7 @@ process_input_file(char *inputname, int myrank, int size)
*/
processing_inputfile = 1;
- while (HDfgets(linebuf, sizeof(linebuf), config) != NULL) {
+ while (fgets(linebuf, sizeof(linebuf), config) != NULL) {
const char *delim = " \n";
char *cmdline = NULL;
char *cmd = NULL;
@@ -1285,8 +1285,8 @@ process_input_file(char *inputname, int myrank, int size)
if (eol) {
*eol = '\0';
}
- cmdline = HDstrdup(linebuf);
- cmd = HDstrtok(linebuf, delim);
+ cmdline = strdup(linebuf);
+ cmd = strtok(linebuf, delim);
if (cmd) {
arg = cmd;
while (arg != NULL) {
@@ -1350,7 +1350,7 @@ main(int argc, char *argv[])
sg_mpi_rank = rank;
#if 0
- env_var = HDgetenv("HDF5_H5DWALK_PRINT_CMDLINE");
+ env_var = getenv("HDF5_H5DWALK_PRINT_CMDLINE");
if (env_var) {
int enable = atoi(env_var);
if (enable) {
@@ -1401,29 +1401,29 @@ main(int argc, char *argv[])
h5dwalk_exit(EXIT_FAILURE);
break;
case 'i':
- inputname = HDstrdup(H5_optarg);
+ inputname = strdup(H5_optarg);
last_mfu_arg = H5_optind;
if (inputname)
tool_selected = 1;
break;
case 'o':
- outputname = HDstrdup(H5_optarg);
+ outputname = strdup(H5_optarg);
last_mfu_arg = H5_optind;
if (outputname) {
log_output_in_single_file = 1;
- output_log_file = HDstrdup(H5_optarg);
+ output_log_file = strdup(H5_optarg);
text = 1; /* Format TXT, not HDF5 */
}
break;
case 'E':
log_errors_in_file = 1;
- errlog = HDstrdup(H5_optarg);
+ errlog = strdup(H5_optarg);
last_mfu_arg = H5_optind;
break;
case 'l':
log_stdout_in_file = 1;
if (H5_optarg)
- txtlog = HDstrdup(H5_optarg);
+ txtlog = strdup(H5_optarg);
break;
case 'T':
/* We need to stop parsing user options at this point.
@@ -1562,7 +1562,7 @@ main(int argc, char *argv[])
mfu_dst_file = mfu_file_new();
destpath = &paths[1];
path2 = destpath->path;
- pathlen_total += HDstrlen(path2);
+ pathlen_total += strlen(path2);
mfu_flist_walk_param_paths(1, destpath, walk_opts, flist2, mfu_dst_file);
}
@@ -1616,8 +1616,8 @@ main(int argc, char *argv[])
k++;
}
else {
- HDstrcpy(ptr, argv[i]);
- ptr += HDstrlen(argv[i]);
+ strcpy(ptr, argv[i]);
+ ptr += strlen(argv[i]);
}
*ptr++ = 0;
}
diff --git a/utils/tools/test/h5dwalk/testh5dwalk.sh.in b/utils/tools/test/h5dwalk/testh5dwalk.sh.in
index 4f6dbde..a123f8d 100644
--- a/utils/tools/test/h5dwalk/testh5dwalk.sh.in
+++ b/utils/tools/test/h5dwalk/testh5dwalk.sh.in
@@ -57,11 +57,10 @@ export LD_LIBRARY_PATH=@LL_PATH@
# source dirs
SRC_TOOLS="$TOP_DIR/tools/test"
-SRC_TOOLS_TESTFILES="$SRC_TOOLS/testfiles"
# testfiles source dirs for tools
-SRC_H5LS_TESTFILES="$SRC_TOOLS_TESTFILES"
-SRC_H5DUMP_TESTFILES="$SRC_TOOLS_TESTFILES"
+SRC_H5LS_TESTFILES="$SRC_TOOLS/test/h5ls/testfiles"
+SRC_H5DUMP_TESTFILES="$SRC_TOOLS/test/h5dump/testfiles"
SRC_H5DIFF_TESTFILES="$SRC_TOOLS/h5diff/testfiles"
SRC_H5COPY_TESTFILES="$SRC_TOOLS/h5copy/testfiles"
SRC_H5REPACK_TESTFILES="$SRC_TOOLS/h5repack/testfiles"
generated by cgit v0.12 at 2024-10-04 03:56:20 (GMT)