summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2006-04-08 02:55:16 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:00:50 -0500
commitbc9b94a3e5e82c4b101e2972a6dc1382f2880148 (patch)
tree233f80c5adf4671e80ef68c0c9799a446b1e6c10
parenta7ddbbb3f8ebc57ac64f696abf1dd856e9875ad6 (diff)
downloadsamba-bc9b94a3e5e82c4b101e2972a6dc1382f2880148.tar.gz
samba-bc9b94a3e5e82c4b101e2972a6dc1382f2880148.tar.bz2
samba-bc9b94a3e5e82c4b101e2972a6dc1382f2880148.zip
r14980: fixed several IBM checker errors in gentest and masktest
(This used to be commit 98016479a9f61b7a4aef83f7eef2876d84013e57)
-rw-r--r--source4/torture/gentest.c7
-rw-r--r--source4/torture/masktest.c2
2 files changed, 6 insertions, 3 deletions
diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c
index 80b09ee6be..ae3278fa9f 100644
--- a/source4/torture/gentest.c
+++ b/source4/torture/gentest.c
@@ -656,6 +656,8 @@ static struct ea_struct gen_ea_struct(void)
"ASOMEWHATLONGERATTRIBUTEVALUE"};
int i;
+ ZERO_STRUCT(ea);
+
do {
i = gen_int_range(0, ARRAY_SIZE(names)-1);
} while (ignore_pattern(names[i]));
@@ -725,7 +727,6 @@ static void oplock_handler_close_recv(struct smbcli_request *req)
static BOOL oplock_handler(struct smbcli_transport *transport, uint16_t tid, uint16_t fnum, uint8_t level, void *private)
{
union smb_close io;
- NTSTATUS status;
int i, j;
BOOL do_close;
struct smbcli_tree *tree = NULL;
@@ -766,8 +767,7 @@ static BOOL oplock_handler(struct smbcli_transport *transport, uint16_t tid, uin
req = smb_raw_close_send(tree, &io);
if (req == NULL) {
- printf("WARNING: close failed in oplock_handler_close - %s\n",
- nt_errstr(status));
+ printf("WARNING: close failed in oplock_handler_close\n");
return False;
}
@@ -1823,6 +1823,7 @@ static BOOL handler_notify(int instance)
struct smb_notify parm[NSERVERS];
int n;
+ ZERO_STRUCT(parm[0]);
parm[0].in.buffer_size = gen_io_count();
parm[0].in.completion_filter = gen_bits_mask(0xFF);
parm[0].in.file.fnum = gen_fnum(instance);
diff --git a/source4/torture/masktest.c b/source4/torture/masktest.c
index cb88e573e2..c37efc0472 100644
--- a/source4/torture/masktest.c
+++ b/source4/torture/masktest.c
@@ -182,6 +182,8 @@ static void testpair(struct smbcli_state *cli, char *mask, char *file)
smbcli_unlink(cli->tree, file);
if (count % 100 == 0) DEBUG(0,("%d\n", count));
+
+ resultp = NULL;
}
static void test_mask(int argc, char *argv[],