summaryrefslogtreecommitdiff
path: root/source4/torture/smb2/notify.c
diff options
context:
space:
mode:
authorBjörn Jacke <bj@sernet.de>2010-09-16 21:36:37 +0200
committerBjörn Jacke <bj@sernet.de>2010-09-16 21:38:20 +0200
commit2b254c814b139f93997f61525d77b934596c53a3 (patch)
tree945897a1c52a9d6d8f5958f47b6c8b4a877d7164 /source4/torture/smb2/notify.c
parent0fd16018a1c993166eae72390433398347538a81 (diff)
downloadsamba-2b254c814b139f93997f61525d77b934596c53a3.tar.gz
samba-2b254c814b139f93997f61525d77b934596c53a3.tar.bz2
samba-2b254c814b139f93997f61525d77b934596c53a3.zip
s3/s4: merge msleep and smb_msleep
the merged variant is renamed to smb_msleep as some platforms already have a msleep function.
Diffstat (limited to 'source4/torture/smb2/notify.c')
-rw-r--r--source4/torture/smb2/notify.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/torture/smb2/notify.c b/source4/torture/smb2/notify.c
index 313ef6848f..0115cd0478 100644
--- a/source4/torture/smb2/notify.c
+++ b/source4/torture/smb2/notify.c
@@ -308,7 +308,7 @@ static bool torture_smb2_notify_dir(struct torture_context *torture,
smb2_util_rmdir(tree2, fname);
smb2_util_mkdir(tree2, fname);
smb2_util_rmdir(tree2, fname);
- msleep(200);
+ smb_msleep(200);
req = smb2_notify_send(tree1, &(notify.smb2));
status = smb2_notify_recv(req, torture, &(notify.smb2));
CHECK_STATUS(status, NT_STATUS_OK);
@@ -603,7 +603,7 @@ static bool torture_smb2_notify_recursive(struct torture_context *torture,
notify.smb2.in.completion_filter = 0;
notify.smb2.in.recursive = true;
- msleep(200);
+ smb_msleep(200);
req1 = smb2_notify_send(tree1, &(notify.smb2));
status = smb2_util_rmdir(tree2, BASEDIR "\\subdir-name\\subname1-r");
@@ -898,7 +898,7 @@ static bool torture_smb2_notify_mask(struct torture_context *torture,
/* send the change notify request */ \
req = smb2_notify_send(tree1, &(notify.smb2)); \
op \
- msleep(200); smb2_cancel(req); \
+ smb_msleep(200); smb2_cancel(req); \
status = smb2_notify_recv(req, torture, &(notify.smb2)); \
cleanup \
smb2_util_close(tree1, h1); \
@@ -1775,7 +1775,7 @@ static bool torture_smb2_notify_basedir(struct torture_context *torture,
/* set attribute on a file to assure we receive a notification */
smb2_util_setatr(tree2, BASEDIR "\\tname1", FILE_ATTRIBUTE_HIDDEN);
- msleep(200);
+ smb_msleep(200);
/* check how many responses were given, expect only 1 for the file */
status = smb2_notify_recv(req1, torture, &(notify.smb2));