From 6dfd88ab0ac73bc966e7fe0eac0b7b34585c17df Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 19 Mar 2011 00:42:42 +0100
Subject: source4/torture/raw: Fix prototypes for all functions.

---
 source4/torture/raw/acls.c        | 1 +
 source4/torture/raw/chkpath.c     | 1 +
 source4/torture/raw/close.c       | 1 +
 source4/torture/raw/composite.c   | 1 +
 source4/torture/raw/context.c     | 1 +
 source4/torture/raw/eas.c         | 1 +
 source4/torture/raw/ioctl.c       | 1 +
 source4/torture/raw/lock.c        | 1 +
 source4/torture/raw/lockbench.c   | 1 +
 source4/torture/raw/lookuprate.c  | 1 +
 source4/torture/raw/mkdir.c       | 1 +
 source4/torture/raw/mux.c         | 1 +
 source4/torture/raw/notify.c      | 1 +
 source4/torture/raw/offline.c     | 1 +
 source4/torture/raw/open.c        | 1 +
 source4/torture/raw/openbench.c   | 1 +
 source4/torture/raw/oplock.c      | 1 +
 source4/torture/raw/pingpong.c    | 1 +
 source4/torture/raw/qfileinfo.c   | 1 +
 source4/torture/raw/qfsinfo.c     | 2 ++
 source4/torture/raw/read.c        | 1 +
 source4/torture/raw/rename.c      | 1 +
 source4/torture/raw/samba3hide.c  | 1 +
 source4/torture/raw/samba3misc.c  | 1 +
 source4/torture/raw/search.c      | 1 +
 source4/torture/raw/seek.c        | 1 +
 source4/torture/raw/setfileinfo.c | 1 +
 source4/torture/raw/streams.c     | 1 +
 source4/torture/raw/tconrate.c    | 1 +
 source4/torture/raw/unlink.c      | 1 +
 source4/torture/raw/write.c       | 1 +
 31 files changed, 32 insertions(+)

diff --git a/source4/torture/raw/acls.c b/source4/torture/raw/acls.c
index c1d41c6f10..666d164c96 100644
--- a/source4/torture/raw/acls.c
+++ b/source4/torture/raw/acls.c
@@ -28,6 +28,7 @@
 #include "libcli/security/security.h"
 #include "torture/util.h"
 #include "librpc/gen_ndr/ndr_security.h"
+#include "torture/raw/proto.h"
 
 #define BASEDIR "\\testsd"
 
diff --git a/source4/torture/raw/chkpath.c b/source4/torture/raw/chkpath.c
index aaf4446b8e..d000283685 100644
--- a/source4/torture/raw/chkpath.c
+++ b/source4/torture/raw/chkpath.c
@@ -22,6 +22,7 @@
 #include "libcli/raw/libcliraw.h"
 #include "libcli/libcli.h"
 #include "torture/util.h"
+#include "torture/raw/proto.h"
 
 #define BASEDIR "\\rawchkpath"
 
diff --git a/source4/torture/raw/close.c b/source4/torture/raw/close.c
index e1b2b7db61..56b63c6432 100644
--- a/source4/torture/raw/close.c
+++ b/source4/torture/raw/close.c
@@ -24,6 +24,7 @@
 #include "libcli/raw/raw_proto.h"
 #include "libcli/libcli.h"
 #include "torture/util.h"
+#include "torture/raw/proto.h"
 
 /**
  * basic testing of all RAW_CLOSE_* calls 
diff --git a/source4/torture/raw/composite.c b/source4/torture/raw/composite.c
index 3a828d868a..fd1f6aaf97 100644
--- a/source4/torture/raw/composite.c
+++ b/source4/torture/raw/composite.c
@@ -32,6 +32,7 @@
 #include "torture/util.h"
 #include "param/param.h"
 #include "libcli/resolve/resolve.h"
+#include "torture/raw/proto.h"
 
 #define BASEDIR "\\composite"
 
diff --git a/source4/torture/raw/context.c b/source4/torture/raw/context.c
index cda8b15d8d..45e7482057 100644
--- a/source4/torture/raw/context.c
+++ b/source4/torture/raw/context.c
@@ -26,6 +26,7 @@
 #include "torture/util.h"
 #include "auth/credentials/credentials.h"
 #include "param/param.h"
+#include "torture/raw/proto.h"
 
 #define BASEDIR "\\rawcontext"
 
diff --git a/source4/torture/raw/eas.c b/source4/torture/raw/eas.c
index aeda20232b..d173cf7ea5 100644
--- a/source4/torture/raw/eas.c
+++ b/source4/torture/raw/eas.c
@@ -25,6 +25,7 @@
 #include "libcli/raw/libcliraw.h"
 #include "libcli/libcli.h"
 #include "torture/util.h"
+#include "torture/raw/proto.h"
 
 #define BASEDIR "\\testeas"
 
diff --git a/source4/torture/raw/ioctl.c b/source4/torture/raw/ioctl.c
index 7692af9ca9..80a3db6294 100644
--- a/source4/torture/raw/ioctl.c
+++ b/source4/torture/raw/ioctl.c
@@ -24,6 +24,7 @@
 #include "libcli/raw/raw_proto.h"
 #include "libcli/libcli.h"
 #include "torture/util.h"
+#include "torture/raw/proto.h"
 
 #define BASEDIR "\\rawioctl"
 
diff --git a/source4/torture/raw/lock.c b/source4/torture/raw/lock.c
index df44dd3fa2..127745e38e 100644
--- a/source4/torture/raw/lock.c
+++ b/source4/torture/raw/lock.c
@@ -29,6 +29,7 @@
 #include "libcli/smb_composite/smb_composite.h"
 #include "lib/cmdline/popt_common.h"
 #include "param/param.h"
+#include "torture/raw/proto.h"
 
 #define CHECK_STATUS(status, correct) do { \
 	if (!NT_STATUS_EQUAL(status, correct)) { \
diff --git a/source4/torture/raw/lockbench.c b/source4/torture/raw/lockbench.c
index 91ce67dbd3..58e709dd2b 100644
--- a/source4/torture/raw/lockbench.c
+++ b/source4/torture/raw/lockbench.c
@@ -32,6 +32,7 @@
 #include "libcli/smb_composite/smb_composite.h"
 #include "libcli/resolve/resolve.h"
 #include "param/param.h"
+#include "torture/raw/proto.h"
 
 #define BASEDIR "\\benchlock"
 #define FNAME BASEDIR "\\lock.dat"
diff --git a/source4/torture/raw/lookuprate.c b/source4/torture/raw/lookuprate.c
index 96ae92f1e8..3b9fbe1cdb 100644
--- a/source4/torture/raw/lookuprate.c
+++ b/source4/torture/raw/lookuprate.c
@@ -22,6 +22,7 @@
 #include "torture/smbtorture.h"
 #include "libcli/libcli.h"
 #include "torture/util.h"
+#include "torture/raw/proto.h"
 
 #define BASEDIR "\\lookuprate"
 #define MISSINGNAME BASEDIR "\\foo"
diff --git a/source4/torture/raw/mkdir.c b/source4/torture/raw/mkdir.c
index 9c744b2db8..40952e0d99 100644
--- a/source4/torture/raw/mkdir.c
+++ b/source4/torture/raw/mkdir.c
@@ -21,6 +21,7 @@
 #include "libcli/raw/libcliraw.h"
 #include "libcli/libcli.h"
 #include "torture/util.h"
+#include "torture/raw/proto.h"
 
 #define BASEDIR "\\mkdirtest"
 
diff --git a/source4/torture/raw/mux.c b/source4/torture/raw/mux.c
index e8418f892c..1b11c29573 100644
--- a/source4/torture/raw/mux.c
+++ b/source4/torture/raw/mux.c
@@ -23,6 +23,7 @@
 #include "libcli/raw/raw_proto.h"
 #include "libcli/libcli.h"
 #include "torture/util.h"
+#include "torture/raw/proto.h"
 
 #define BASEDIR "\\test_mux"
 
diff --git a/source4/torture/raw/notify.c b/source4/torture/raw/notify.c
index d96ec93ea2..6c4ca82668 100644
--- a/source4/torture/raw/notify.c
+++ b/source4/torture/raw/notify.c
@@ -23,6 +23,7 @@
 #include "libcli/libcli.h"
 #include "system/filesys.h"
 #include "torture/util.h"
+#include "torture/raw/proto.h"
 
 #define BASEDIR "\\test_notify"
 
diff --git a/source4/torture/raw/offline.c b/source4/torture/raw/offline.c
index 3b8bbdd53a..a8259e2d42 100644
--- a/source4/torture/raw/offline.c
+++ b/source4/torture/raw/offline.c
@@ -29,6 +29,7 @@
 #include "lib/events/events.h"
 #include "libcli/composite/composite.h"
 #include "libcli/smb_composite/smb_composite.h"
+#include "torture/raw/proto.h"
 
 #define BASEDIR "\\testoffline"
 
diff --git a/source4/torture/raw/open.c b/source4/torture/raw/open.c
index 5661c2f6f6..89042d77dc 100644
--- a/source4/torture/raw/open.c
+++ b/source4/torture/raw/open.c
@@ -24,6 +24,7 @@
 #include "lib/events/events.h"
 #include "libcli/libcli.h"
 #include "torture/util.h"
+#include "torture/raw/proto.h"
 
 /* enum for whether reads/writes are possible on a file */
 enum rdwr_mode {RDWR_NONE, RDWR_RDONLY, RDWR_WRONLY, RDWR_RDWR};
diff --git a/source4/torture/raw/openbench.c b/source4/torture/raw/openbench.c
index 749d157c31..d0c785d460 100644
--- a/source4/torture/raw/openbench.c
+++ b/source4/torture/raw/openbench.c
@@ -33,6 +33,7 @@
 #include "libcli/smb_composite/smb_composite.h"
 #include "libcli/resolve/resolve.h"
 #include "param/param.h"
+#include "torture/raw/proto.h"
 
 #define BASEDIR "\\benchopen"
 
diff --git a/source4/torture/raw/oplock.c b/source4/torture/raw/oplock.c
index b120dad85b..01b1dd2b93 100644
--- a/source4/torture/raw/oplock.c
+++ b/source4/torture/raw/oplock.c
@@ -26,6 +26,7 @@
 #include "param/param.h"
 #include "lib/cmdline/popt_common.h"
 #include "libcli/resolve/resolve.h"
+#include "torture/raw/proto.h"
 
 #define CHECK_VAL(v, correct) do { \
 	if ((v) != (correct)) { \
diff --git a/source4/torture/raw/pingpong.c b/source4/torture/raw/pingpong.c
index f9c551e9b9..2cb3187916 100644
--- a/source4/torture/raw/pingpong.c
+++ b/source4/torture/raw/pingpong.c
@@ -48,6 +48,7 @@
 #include "system/filesys.h"
 #include "libcli/libcli.h"
 #include "torture/util.h"
+#include "torture/raw/proto.h"
 
 static void lock_byte(struct smbcli_state *cli, int fd, int offset, int lock_timeout)
 {
diff --git a/source4/torture/raw/qfileinfo.c b/source4/torture/raw/qfileinfo.c
index 2a5a2e77ef..414084080b 100644
--- a/source4/torture/raw/qfileinfo.c
+++ b/source4/torture/raw/qfileinfo.c
@@ -25,6 +25,7 @@
 #include "torture/util.h"
 #include "torture/rpc/torture_rpc.h"
 #include "param/param.h"
+#include "torture/raw/proto.h"
 
 static struct {
 	const char *name;
diff --git a/source4/torture/raw/qfsinfo.c b/source4/torture/raw/qfsinfo.c
index 111eac14d5..259aee0e0e 100644
--- a/source4/torture/raw/qfsinfo.c
+++ b/source4/torture/raw/qfsinfo.c
@@ -20,6 +20,8 @@
 #include "includes.h"
 #include "libcli/libcli.h"
 #include "torture/util.h"
+#include "torture/basic/proto.h"
+#include "torture/raw/proto.h"
 
 
 static struct {
diff --git a/source4/torture/raw/read.c b/source4/torture/raw/read.c
index 3b315afe8d..9bb626f3cd 100644
--- a/source4/torture/raw/read.c
+++ b/source4/torture/raw/read.c
@@ -23,6 +23,7 @@
 #include "system/filesys.h"
 #include "libcli/libcli.h"
 #include "torture/util.h"
+#include "torture/raw/proto.h"
 
 #define CHECK_STATUS(status, correct) do { \
 	if (!NT_STATUS_EQUAL(status, correct)) { \
diff --git a/source4/torture/raw/rename.c b/source4/torture/raw/rename.c
index ca4207119b..b9f2039ff2 100644
--- a/source4/torture/raw/rename.c
+++ b/source4/torture/raw/rename.c
@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "libcli/libcli.h"
 #include "torture/util.h"
+#include "torture/raw/proto.h"
 
 #define CHECK_STATUS(status, correct) do { \
 	if (!NT_STATUS_EQUAL(status, correct)) { \
diff --git a/source4/torture/raw/samba3hide.c b/source4/torture/raw/samba3hide.c
index 120bd836a8..5ecf4f682d 100644
--- a/source4/torture/raw/samba3hide.c
+++ b/source4/torture/raw/samba3hide.c
@@ -22,6 +22,7 @@
 #include "system/filesys.h"
 #include "libcli/libcli.h"
 #include "torture/util.h"
+#include "torture/raw/proto.h"
 
 static void init_unixinfo_nochange(union smb_setfileinfo *info)
 {
diff --git a/source4/torture/raw/samba3misc.c b/source4/torture/raw/samba3misc.c
index a603111fa2..0125d1f3d7 100644
--- a/source4/torture/raw/samba3misc.c
+++ b/source4/torture/raw/samba3misc.c
@@ -27,6 +27,7 @@
 #include "torture/util.h"
 #include "lib/events/events.h"
 #include "param/param.h"
+#include "torture/raw/proto.h"
 
 #define CHECK_STATUS(status, correct) do { \
 	if (!NT_STATUS_EQUAL(status, correct)) { \
diff --git a/source4/torture/raw/search.c b/source4/torture/raw/search.c
index 60c9ad0bb3..e93d2a10f7 100644
--- a/source4/torture/raw/search.c
+++ b/source4/torture/raw/search.c
@@ -24,6 +24,7 @@
 #include "libcli/libcli.h"
 #include "torture/util.h"
 #include "lib/util/tsort.h"
+#include "torture/raw/proto.h"
 
 
 #define BASEDIR "\\testsearch"
diff --git a/source4/torture/raw/seek.c b/source4/torture/raw/seek.c
index 458a45308f..6bac828942 100644
--- a/source4/torture/raw/seek.c
+++ b/source4/torture/raw/seek.c
@@ -21,6 +21,7 @@
 #include "system/filesys.h"
 #include "libcli/libcli.h"
 #include "torture/util.h"
+#include "torture/raw/proto.h"
 
 #define CHECK_STATUS(status, correct) do { \
 	if (!NT_STATUS_EQUAL(status, correct)) { \
diff --git a/source4/torture/raw/setfileinfo.c b/source4/torture/raw/setfileinfo.c
index f3abf5b3de..45414cbf94 100644
--- a/source4/torture/raw/setfileinfo.c
+++ b/source4/torture/raw/setfileinfo.c
@@ -22,6 +22,7 @@
 #include "libcli/raw/libcliraw.h"
 #include "libcli/libcli.h"
 #include "torture/util.h"
+#include "torture/raw/proto.h"
 
 #define BASEDIR "\\testsfileinfo"
 
diff --git a/source4/torture/raw/streams.c b/source4/torture/raw/streams.c
index 1542e93422..5ce9b756ef 100644
--- a/source4/torture/raw/streams.c
+++ b/source4/torture/raw/streams.c
@@ -27,6 +27,7 @@
 #include "libcli/libcli.h"
 #include "torture/util.h"
 #include "lib/util/tsort.h"
+#include "torture/raw/proto.h"
 
 #define BASEDIR "\\teststreams"
 
diff --git a/source4/torture/raw/tconrate.c b/source4/torture/raw/tconrate.c
index 329cdd4383..6673f11eb5 100644
--- a/source4/torture/raw/tconrate.c
+++ b/source4/torture/raw/tconrate.c
@@ -26,6 +26,7 @@
 
 #include "system/filesys.h"
 #include "system/shmem.h"
+#include "torture/raw/proto.h"
 
 #define TIME_LIMIT_SECS 30
 #define usec_to_sec(s) ((s) / 1000000)
diff --git a/source4/torture/raw/unlink.c b/source4/torture/raw/unlink.c
index d1ad78508f..59e127bf15 100644
--- a/source4/torture/raw/unlink.c
+++ b/source4/torture/raw/unlink.c
@@ -24,6 +24,7 @@
 #include "libcli/raw/raw_proto.h"
 #include "libcli/libcli.h"
 #include "torture/util.h"
+#include "torture/raw/proto.h"
 
 #define CHECK_STATUS(status, correct) do { \
 	if (!NT_STATUS_EQUAL(status, correct)) { \
diff --git a/source4/torture/raw/write.c b/source4/torture/raw/write.c
index 8e564d7563..0a2f50f425 100644
--- a/source4/torture/raw/write.c
+++ b/source4/torture/raw/write.c
@@ -24,6 +24,7 @@
 #include "system/filesys.h"
 #include "libcli/libcli.h"
 #include "torture/util.h"
+#include "torture/raw/proto.h"
 
 #define CHECK_STATUS(status, correct) do { \
 	if (!NT_STATUS_EQUAL(status, correct)) { \
-- 
cgit