diff options
Diffstat (limited to 'tests/zfs-tests/cmd')
| -rw-r--r-- | tests/zfs-tests/cmd/dir_rd_update/dir_rd_update.c | 2 | ||||
| -rw-r--r-- | tests/zfs-tests/cmd/mkfile/mkfile.c | 4 | ||||
| -rw-r--r-- | tests/zfs-tests/cmd/xattrtest/xattrtest.c | 29 |
3 files changed, 18 insertions, 17 deletions
diff --git a/tests/zfs-tests/cmd/dir_rd_update/dir_rd_update.c b/tests/zfs-tests/cmd/dir_rd_update/dir_rd_update.c index 64348549d..ea46f047a 100644 --- a/tests/zfs-tests/cmd/dir_rd_update/dir_rd_update.c +++ b/tests/zfs-tests/cmd/dir_rd_update/dir_rd_update.c @@ -65,7 +65,7 @@ main(int argc, char **argv) cp1 = argv[1]; if (strlen(cp1) >= (sizeof (dirpath) - strlen("TMP_DIR"))) { (void) printf("The string length of mount point is " - "too large\n"); + "too large\n"); exit(-1); } (void) strcpy(&dirpath[0], (const char *)cp1); diff --git a/tests/zfs-tests/cmd/mkfile/mkfile.c b/tests/zfs-tests/cmd/mkfile/mkfile.c index 4e0be9383..000249f11 100644 --- a/tests/zfs-tests/cmd/mkfile/mkfile.c +++ b/tests/zfs-tests/cmd/mkfile/mkfile.c @@ -215,7 +215,7 @@ main(int argc, char **argv) (ssize_t)bytes) { saverr = errno; if (result < 0) - result = 0; + result = 0; written += result; (void) fprintf(stderr, gettext( "%s: initialized %lu of %lu bytes: %s\n"), @@ -269,7 +269,7 @@ main(int argc, char **argv) static void usage() { (void) fprintf(stderr, gettext( - "Usage: mkfile [-nv] <size>[g|k|b|m] <name1> [<name2>] ...\n")); + "Usage: mkfile [-nv] <size>[g|k|b|m] <name1> [<name2>] ...\n")); exit(1); /* NOTREACHED */ } diff --git a/tests/zfs-tests/cmd/xattrtest/xattrtest.c b/tests/zfs-tests/cmd/xattrtest/xattrtest.c index 991dd066d..c8921fb69 100644 --- a/tests/zfs-tests/cmd/xattrtest/xattrtest.c +++ b/tests/zfs-tests/cmd/xattrtest/xattrtest.c @@ -289,7 +289,8 @@ run_process(const char *path, char *argv[]) } else if (pid > 0) { int status; - while ((rc = waitpid(pid, &status, 0)) == -1 && errno == EINTR); + while ((rc = waitpid(pid, &status, 0)) == -1 && + errno == EINTR) { } if (rc < 0 || !WIFEXITED(status)) return (-1); @@ -369,8 +370,8 @@ create_files(void) file = malloc(PATH_MAX); if (file == NULL) { rc = ENOMEM; - ERROR("Error %d: malloc(%d) bytes for file name\n", - rc, PATH_MAX); + ERROR("Error %d: malloc(%d) bytes for file name\n", rc, + PATH_MAX); goto out; } @@ -392,7 +393,7 @@ create_files(void) rc = open(file, O_CREAT, 0644); if (rc == -1) { ERROR("Error %d: open(%s, O_CREATE, 0644)\n", - errno, file); + errno, file); rc = errno; goto out; } @@ -454,16 +455,16 @@ setxattrs(void) value = malloc(XATTR_SIZE_MAX); if (value == NULL) { rc = ENOMEM; - ERROR("Error %d: malloc(%d) bytes for xattr value\n", - rc, XATTR_SIZE_MAX); + ERROR("Error %d: malloc(%d) bytes for xattr value\n", rc, + XATTR_SIZE_MAX); goto out; } file = malloc(PATH_MAX); if (file == NULL) { rc = ENOMEM; - ERROR("Error %d: malloc(%d) bytes for file name\n", - rc, PATH_MAX); + ERROR("Error %d: malloc(%d) bytes for file name\n", rc, + PATH_MAX); goto out; } @@ -525,16 +526,16 @@ getxattrs(void) verify_value = malloc(XATTR_SIZE_MAX); if (verify_value == NULL) { rc = ENOMEM; - ERROR("Error %d: malloc(%d) bytes for xattr verify\n", - rc, XATTR_SIZE_MAX); + ERROR("Error %d: malloc(%d) bytes for xattr verify\n", rc, + XATTR_SIZE_MAX); goto out; } value = malloc(XATTR_SIZE_MAX); if (value == NULL) { rc = ENOMEM; - ERROR("Error %d: malloc(%d) bytes for xattr value\n", - rc, XATTR_SIZE_MAX); + ERROR("Error %d: malloc(%d) bytes for xattr value\n", rc, + XATTR_SIZE_MAX); goto out; } @@ -544,8 +545,8 @@ getxattrs(void) file = malloc(PATH_MAX); if (file == NULL) { rc = ENOMEM; - ERROR("Error %d: malloc(%d) bytes for file name\n", - rc, PATH_MAX); + ERROR("Error %d: malloc(%d) bytes for file name\n", rc, + PATH_MAX); goto out; } |