diff options
author | Brian Behlendorf <[email protected]> | 2016-12-12 10:46:26 -0800 |
---|---|---|
committer | GitHub <[email protected]> | 2016-12-12 10:46:26 -0800 |
commit | 02730c333c4fce8c0ead1f7f3404caca5cdb3936 (patch) | |
tree | e3943bf33ee177c50004a08d1d4ea4188dbfc542 /tests/zfs-tests/cmd/xattrtest | |
parent | d57f03e40ec3bbf109e75b83699b58157b9a867d (diff) |
Use cstyle -cpP in `make cstyle` check
Enable picky cstyle checks and resolve the new warnings. The vast
majority of the changes needed were to handle minor issues with
whitespace formatting. This patch contains no functional changes.
Non-whitespace changes are as follows:
* 8 times ; to { } in for/while loop
* fix missing ; in cmd/zed/agents/zfs_diagnosis.c
* comment (confim -> confirm)
* change endline , to ; in cmd/zpool/zpool_main.c
* a number of /* BEGIN CSTYLED */ /* END CSTYLED */ blocks
* /* CSTYLED */ markers
* change == 0 to !
* ulong to unsigned long in module/zfs/dsl_scan.c
* rearrangement of module_param lines in module/zfs/metaslab.c
* add { } block around statement after for_each_online_node
Reviewed-by: Giuseppe Di Natale <[email protected]>
Reviewed-by: HÃ¥kan Johansson <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #5465
Diffstat (limited to 'tests/zfs-tests/cmd/xattrtest')
-rw-r--r-- | tests/zfs-tests/cmd/xattrtest/xattrtest.c | 29 |
1 files changed, 15 insertions, 14 deletions
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; } |