From d093b7e7771c3f143546889c95f97dd0be16998f Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 19 Jul 2004 10:35:05 +0000
Subject: r1547: rename 'enum <bla>_level' -> 'enum smb_<bla>_level'

e.g. we now have 'union smb_mkdir' and 'enum smb_mkdir_level' in sync

we may should also rename 'RAW_MKDIR_*' -> 'SMB_MKDIR_*'

metze
(This used to be commit 0bb50dcf1ccb9797000fcbea4d8a73f2d2a3db77)
---
 source4/torture/gentest.c       | 4 ++--
 source4/torture/raw/qfileinfo.c | 2 +-
 source4/torture/raw/qfsinfo.c   | 2 +-
 source4/torture/raw/search.c    | 8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'source4/torture')

diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c
index 2bc5274f36..016c19fd5b 100644
--- a/source4/torture/gentest.c
+++ b/source4/torture/gentest.c
@@ -1422,7 +1422,7 @@ static void gen_fileinfo(int instance, union smb_fileinfo *info)
 	int i;
 	#define LVL(v) {RAW_FILEINFO_ ## v, "RAW_FILEINFO_" #v}
 	struct {
-		enum fileinfo_level level;
+		enum smb_fileinfo_level level;
 		const char *name;
 	}  levels[] = {
 		LVL(GETATTR), LVL(GETATTRE), LVL(STANDARD),
@@ -1656,7 +1656,7 @@ static void gen_setfileinfo(int instance, union smb_setfileinfo *info)
 	#undef LVL
 	#define LVL(v) {RAW_SFILEINFO_ ## v, "RAW_SFILEINFO_" #v}
 	struct {
-		enum setfileinfo_level level;
+		enum smb_setfileinfo_level level;
 		const char *name;
 	}  levels[] = {
 #if 0
diff --git a/source4/torture/raw/qfileinfo.c b/source4/torture/raw/qfileinfo.c
index 07fb81e6d9..4bade0f6e2 100644
--- a/source4/torture/raw/qfileinfo.c
+++ b/source4/torture/raw/qfileinfo.c
@@ -22,7 +22,7 @@
 
 static struct {
 	const char *name;
-	enum fileinfo_level level;
+	enum smb_fileinfo_level level;
 	uint_t only_paths:1;
 	uint_t only_handles:1;
 	uint32_t capability_mask;
diff --git a/source4/torture/raw/qfsinfo.c b/source4/torture/raw/qfsinfo.c
index caa47b43f8..775755ddcb 100644
--- a/source4/torture/raw/qfsinfo.c
+++ b/source4/torture/raw/qfsinfo.c
@@ -23,7 +23,7 @@
 
 static struct {
 	const char *name;
-	enum fsinfo_level level;
+	enum smb_fsinfo_level level;
 	uint32_t capability_mask;
 	NTSTATUS status;
 	union smb_fsinfo fsinfo;
diff --git a/source4/torture/raw/search.c b/source4/torture/raw/search.c
index 4f4c453bc8..698f405fb4 100644
--- a/source4/torture/raw/search.c
+++ b/source4/torture/raw/search.c
@@ -41,7 +41,7 @@ static BOOL single_search_callback(void *private, union smb_search_data *file)
 static NTSTATUS single_search(struct cli_state *cli, 
 			      TALLOC_CTX *mem_ctx,
 			      const char *pattern,
-			      enum search_level level,
+			      enum smb_search_level level,
 			      union smb_search_data *data)
 {
 	union smb_search_first io;
@@ -69,7 +69,7 @@ static NTSTATUS single_search(struct cli_state *cli,
 
 static struct {
 	const char *name;
-	enum search_level level;
+	enum smb_search_level level;
 	uint32_t capability_mask;
 	NTSTATUS status;
 	union smb_search_data data;
@@ -394,7 +394,7 @@ enum continue_type {CONT_FLAGS, CONT_NAME, CONT_RESUME_KEY};
 static NTSTATUS multiple_search(struct cli_state *cli, 
 				TALLOC_CTX *mem_ctx,
 				const char *pattern,
-				enum search_level level,
+				enum smb_search_level level,
 				enum continue_type cont_type,
 				void *data)
 {
@@ -550,7 +550,7 @@ static BOOL test_many_files(struct cli_state *cli, TALLOC_CTX *mem_ctx)
 	struct {
 		const char *name;
 		const char *cont_name;
-		enum search_level level;
+		enum smb_search_level level;
 		enum continue_type cont_type;
 	} search_types[] = {
 		{"BOTH_DIRECTORY_INFO", "NAME",  RAW_SEARCH_BOTH_DIRECTORY_INFO, CONT_NAME},
-- 
cgit