summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Danneman <steven.danneman@isilon.com>2009-12-03 19:32:53 -0800
committerSteven Danneman <steven.danneman@isilon.com>2009-12-07 16:10:24 -0800
commitb4c72e44a83157768ae991e72d824f56a381eab6 (patch)
treedecaecf271bbd4dd652700bcaf1be92b6d3439b6
parent0c42d65d7cbc24b96f0e9ec700d32da860060174 (diff)
downloadsamba-b4c72e44a83157768ae991e72d824f56a381eab6.tar.gz
samba-b4c72e44a83157768ae991e72d824f56a381eab6.tar.bz2
samba-b4c72e44a83157768ae991e72d824f56a381eab6.zip
s4/torture: fix >80 column spacing issues
-rw-r--r--source4/torture/raw/lock.c7
-rw-r--r--source4/torture/smb2/lock.c12
2 files changed, 10 insertions, 9 deletions
diff --git a/source4/torture/raw/lock.c b/source4/torture/raw/lock.c
index 6871ed3546..05d9beda30 100644
--- a/source4/torture/raw/lock.c
+++ b/source4/torture/raw/lock.c
@@ -71,9 +71,10 @@
#define TARGET_IS_W2K8(_tctx) (torture_setting_bool(_tctx, "w2k8", false))
#define TARGET_IS_WIN7(_tctx) (torture_setting_bool(_tctx, "win7", false))
-#define TARGET_IS_WINDOWS(_tctx) ((torture_setting_bool(_tctx, "w2k8", false)) || \
- (torture_setting_bool(_tctx, "win7", false)) || \
- (torture_setting_bool(_tctx, "w2k3", false)))
+#define TARGET_IS_WINDOWS(_tctx) \
+ ((torture_setting_bool(_tctx, "w2k3", false)) || \
+ (torture_setting_bool(_tctx, "w2k8", false)) || \
+ (torture_setting_bool(_tctx, "win7", false)))
#define TARGET_IS_SAMBA3(_tctx) (torture_setting_bool(_tctx, "samba3", false))
#define TARGET_IS_SAMBA4(_tctx) (torture_setting_bool(_tctx, "samba4", false))
diff --git a/source4/torture/smb2/lock.c b/source4/torture/smb2/lock.c
index ba97a54eae..35a08d3d8c 100644
--- a/source4/torture/smb2/lock.c
+++ b/source4/torture/smb2/lock.c
@@ -2626,8 +2626,8 @@ static bool test_overlap(struct torture_context *torture,
NT_STATUS_IS_OK(torture_smb2_testfile(tree, fname, &h)) &&
NT_STATUS_IS_OK(smb2cli_lock(tree, h, 7, 1, true));
EXPECTED(ret, true);
- torture_comment(torture, "the server %s have the NT byte range lock bug\n",
- !ret?"does":"doesn't");
+ torture_comment(torture, "the server %s have the NT byte range lock "
+ "bug\n", !ret?"does":"doesn't");
done:
smb2_util_close(tree2, h3);
@@ -2694,8 +2694,8 @@ static bool test_truncate(struct torture_context *torture,
CHECK_STATUS(status, NT_STATUS_OK);
/* On second handle open the file with OVERWRITE disposition */
- torture_comment(torture, " overwrite disposition is allowed on a locked "
- "file.\n");
+ torture_comment(torture, " overwrite disposition is allowed on a "
+ "locked file.\n");
io.in.create_disposition = NTCREATEX_DISP_OVERWRITE;
status = smb2_create(tree, tree, &io);
@@ -2704,8 +2704,8 @@ static bool test_truncate(struct torture_context *torture,
smb2_util_close(tree, h2);
/* On second handle open the file with SUPERSEDE disposition */
- torture_comment(torture, " supersede disposition is allowed on a locked "
- "file.\n");
+ torture_comment(torture, " supersede disposition is allowed on a "
+ "locked file.\n");
io.in.create_disposition = NTCREATEX_DISP_SUPERSEDE;
status = smb2_create(tree, tree, &io);