From 4183b2ac3832cdc2055d7eb3ed7121a9ea91085c Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 2 Dec 2004 04:51:56 +0000
Subject: r4037: fixed a bunch of "might be uninitialised" warnings after
 enabling -O1 in my compile (This used to be commit
 0928b1f5b68c858922c3ea6c27ed03b5091c6221)

---
 source4/torture/raw/acls.c    | 8 ++++----
 source4/torture/raw/eas.c     | 2 +-
 source4/torture/raw/rename.c  | 2 +-
 source4/torture/raw/streams.c | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'source4/torture/raw')

diff --git a/source4/torture/raw/acls.c b/source4/torture/raw/acls.c
index 84d2238a9e..24f18e6cce 100644
--- a/source4/torture/raw/acls.c
+++ b/source4/torture/raw/acls.c
@@ -41,7 +41,7 @@ static BOOL test_sd(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
 	union smb_open io;
 	const char *fname = BASEDIR "\\sd.txt";
 	BOOL ret = True;
-	int fnum;
+	int fnum = -1;
 	union smb_fileinfo q;
 	union smb_setfileinfo set;
 	struct security_ace ace;
@@ -249,7 +249,7 @@ static BOOL test_creator_sid(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
 	union smb_open io;
 	const char *fname = BASEDIR "\\creator.txt";
 	BOOL ret = True;
-	int fnum;
+	int fnum = -1;
 	union smb_fileinfo q;
 	union smb_setfileinfo set;
 	struct security_descriptor *sd, *sd_orig, *sd2;
@@ -323,7 +323,7 @@ static BOOL test_creator_sid(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
 
 	printf("set a sec desc allowing no write by owner\n");
 	sd = security_descriptor_create(mem_ctx,
-					NULL, NULL,
+					owner_sid, NULL,
 					owner_sid,
 					SEC_ACE_TYPE_ACCESS_ALLOWED,
 					SEC_RIGHTS_FILE_READ | SEC_STD_ALL,
@@ -440,7 +440,7 @@ static BOOL test_generic_bits(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
 	union smb_open io;
 	const char *fname = BASEDIR "\\generic.txt";
 	BOOL ret = True;
-	int fnum, i;
+	int fnum = -1, i;
 	union smb_fileinfo q;
 	union smb_setfileinfo set;
 	struct security_descriptor *sd, *sd_orig, *sd2;
diff --git a/source4/torture/raw/eas.c b/source4/torture/raw/eas.c
index 13ebea2401..044fe9ebb4 100644
--- a/source4/torture/raw/eas.c
+++ b/source4/torture/raw/eas.c
@@ -99,7 +99,7 @@ static BOOL test_eas(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
 	union smb_open io;
 	const char *fname = BASEDIR "\\ea.txt";
 	BOOL ret = True;
-	int fnum;
+	int fnum = -1;
 
 	printf("TESTING SETFILEINFO EA_SET\n");
 
diff --git a/source4/torture/raw/rename.c b/source4/torture/raw/rename.c
index 6b16612698..c839100e7c 100644
--- a/source4/torture/raw/rename.c
+++ b/source4/torture/raw/rename.c
@@ -46,7 +46,7 @@ static BOOL test_mv(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
 	union smb_rename io;
 	NTSTATUS status;
 	BOOL ret = True;
-	int fnum;
+	int fnum = -1;
 	const char *fname1 = BASEDIR "\\test1.txt";
 	const char *fname2 = BASEDIR "\\test2.txt";
 	union smb_open op;
diff --git a/source4/torture/raw/streams.c b/source4/torture/raw/streams.c
index 83ba08ee0a..7053f6c998 100644
--- a/source4/torture/raw/streams.c
+++ b/source4/torture/raw/streams.c
@@ -99,7 +99,7 @@ static BOOL test_stream_io(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
 	const char *fname = BASEDIR "\\stream.txt";
 	const char *sname1, *sname2;
 	BOOL ret = True;
-	int fnum;
+	int fnum = -1;
 	ssize_t retsize;
 
 	sname1 = talloc_asprintf(mem_ctx, "%s:%s", fname, "Stream One");
-- 
cgit