summaryrefslogtreecommitdiff
path: root/util/nvmutil/lib/command.c
diff options
context:
space:
mode:
Diffstat (limited to 'util/nvmutil/lib/command.c')
-rw-r--r--util/nvmutil/lib/command.c16
1 files changed, 5 insertions, 11 deletions
diff --git a/util/nvmutil/lib/command.c b/util/nvmutil/lib/command.c
index b70430aa..367c949a 100644
--- a/util/nvmutil/lib/command.c
+++ b/util/nvmutil/lib/command.c
@@ -5,21 +5,15 @@
* Command handlers for nvmutil
*/
-#ifdef __OpenBSD__
-#include <sys/param.h>
-#endif
#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h>
#include <fcntl.h>
#include <limits.h>
-#include <stdarg.h>
-#include <stddef.h>
#include <stdio.h>
-#include <stdlib.h>
+#include <stddef.h>
#include <string.h>
-#include <time.h>
#include <unistd.h>
#include "../include/common.h"
@@ -421,17 +415,17 @@ cmd_helper_swap(void)
check_cmd(cmd_helper_swap, "swap");
- x_v_memcpy(
+ memcpy(
f->buf + (unsigned long)GBE_WORK_SIZE,
f->buf,
GBE_PART_SIZE);
- x_v_memcpy(
+ memcpy(
f->buf,
f->buf + (unsigned long)GBE_PART_SIZE,
GBE_PART_SIZE);
- x_v_memcpy(
+ memcpy(
f->buf + (unsigned long)GBE_PART_SIZE,
f->buf + (unsigned long)GBE_WORK_SIZE,
GBE_PART_SIZE);
@@ -448,7 +442,7 @@ cmd_helper_copy(void)
check_cmd(cmd_helper_copy, "copy");
- x_v_memcpy(
+ memcpy(
f->buf + (unsigned long)((f->part ^ 1) * GBE_PART_SIZE),
f->buf + (unsigned long)(f->part * GBE_PART_SIZE),
GBE_PART_SIZE);