diff options
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/mirror_vfd/mirror_server.c | 4 | ||||
| -rw-r--r-- | utils/mirror_vfd/mirror_server_stop.c | 2 | ||||
| -rw-r--r-- | utils/mirror_vfd/mirror_writer.c | 6 | ||||
| -rw-r--r-- | utils/tools/h5dwalk/h5dwalk.c | 12 |
4 files changed, 12 insertions, 12 deletions
diff --git a/utils/mirror_vfd/mirror_server.c b/utils/mirror_vfd/mirror_server.c index 8ef7b9d..3bf075a 100644 --- a/utils/mirror_vfd/mirror_server.c +++ b/utils/mirror_vfd/mirror_server.c @@ -177,8 +177,8 @@ parse_args(int argc, char **argv, struct op_args *args_out) args_out->verbosity = MIRROR_LOG_DEFAULT_VERBOSITY; /* Preset empty strings */ - HDmemset(args_out->log_path, 0, PATH_MAX + 1); - HDmemset(args_out->writer_log_path, 0, PATH_MAX + 1); + memset(args_out->log_path, 0, PATH_MAX + 1); + memset(args_out->writer_log_path, 0, PATH_MAX + 1); if (argv == NULL || *argv == NULL) { mirror_log(NULL, V_ERR, "invalid argv pointer"); diff --git a/utils/mirror_vfd/mirror_server_stop.c b/utils/mirror_vfd/mirror_server_stop.c index 8877f3d..52dea08 100644 --- a/utils/mirror_vfd/mirror_server_stop.c +++ b/utils/mirror_vfd/mirror_server_stop.c @@ -146,7 +146,7 @@ send_shutdown(struct mshs_opts *opts) target_addr.sin_family = AF_INET; target_addr.sin_port = htons((uint16_t)opts->portno); target_addr.sin_addr.s_addr = inet_addr(opts->ip); - HDmemset(target_addr.sin_zero, 0, sizeof(target_addr.sin_zero)); + 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)); diff --git a/utils/mirror_vfd/mirror_writer.c b/utils/mirror_vfd/mirror_writer.c index 644fc77..2acc166 100644 --- a/utils/mirror_vfd/mirror_writer.c +++ b/utils/mirror_vfd/mirror_writer.c @@ -194,7 +194,7 @@ session_init(struct mirror_writer_opts *opts) session->reply.pub.version = H5FD_MIRROR_XMIT_CURR_VERSION; session->reply.pub.op = H5FD_MIRROR_OP_REPLY; session->reply.pub.session_token = 0; - HDmemset(session->reply.message, 0, H5FD_MIRROR_STATUS_MESSAGE_MAX); + memset(session->reply.message, 0, H5FD_MIRROR_STATUS_MESSAGE_MAX); /* Options-derived population */ @@ -358,7 +358,7 @@ reply_ok(struct mirror_session *session) mirror_log(session->loginfo, V_ALL, "reply_ok()"); reply->status = H5FD_MIRROR_STATUS_OK; - HDmemset(reply->message, 0, H5FD_MIRROR_STATUS_MESSAGE_MAX); + memset(reply->message, 0, H5FD_MIRROR_STATUS_MESSAGE_MAX); return _xmit_reply(session); } /* end reply_ok() */ @@ -820,7 +820,7 @@ receive_communique(struct mirror_session *session, struct sock_comm *comm) mirror_log(session->loginfo, V_INFO, "receive_communique()"); - HDmemset(comm->raw, 0, comm->raw_size); + memset(comm->raw, 0, comm->raw_size); comm->recd_die = 0; mirror_log(session->loginfo, V_INFO, "ready to receive"); /* TODO */ diff --git a/utils/tools/h5dwalk/h5dwalk.c b/utils/tools/h5dwalk/h5dwalk.c index f8aa472..256ac45 100644 --- a/utils/tools/h5dwalk/h5dwalk.c +++ b/utils/tools/h5dwalk/h5dwalk.c @@ -299,8 +299,8 @@ distribute_separator_add(struct distribute_option *option, uint64_t separator) pos = low; if (pos < count) - HDmemmove(&option->separators[low + 1], &option->separators[low], - sizeof(*option->separators) * (uint64_t)(count - pos)); + memmove(&option->separators[low + 1], &option->separators[low], + sizeof(*option->separators) * (uint64_t)(count - pos)); option->separators[pos] = separator; return 0; @@ -1175,7 +1175,7 @@ MFU_PRED_EXEC(mfu_flist flist, uint64_t idx, void *arg) argv[k++] = HDstrdup(toolname); - HDmemset(cmdline, 0, sizeof(cmdline)); + memset(cmdline, 0, sizeof(cmdline)); buf += HDstrlen(toolname) + 1; /* Reconstruct the command line that the user provided for the h5tool */ for (k = 1; k < count; k++) { @@ -1184,7 +1184,7 @@ MFU_PRED_EXEC(mfu_flist flist, uint64_t idx, void *arg) mfu_flist flist_arg; void *check_ptr[2] = {NULL, NULL}; - HDmemcpy(check_ptr, &buf[1], sizeof(void *)); + memcpy(check_ptr, &buf[1], sizeof(void *)); flist_arg = (mfu_flist)check_ptr[0]; /* +2 (see below) accounts for the '&' and the trailing zero pad */ @@ -1607,10 +1607,10 @@ main(int argc, char *argv[]) *ptr++ = '&'; /* Select which argument list should be used */ if (k == 0) { - HDmemcpy(ptr, &flist1, sizeof(void *)); + memcpy(ptr, &flist1, sizeof(void *)); } if (k == 1) { - HDmemcpy(ptr, &flist2, sizeof(void *)); + memcpy(ptr, &flist2, sizeof(void *)); } ptr += sizeof(mfu_flist *); k++; |