summaryrefslogtreecommitdiff
path: root/source4/torture
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2006-09-09 10:05:58 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:18:04 -0500
commit30ee8beb9316a99e8a49993306252591106cb349 (patch)
treea00d384bb7e1e9c09a800f4e3de00b2c9450e17b /source4/torture
parent85e24e54d29ca8a08ad833831052e41a0bb257b6 (diff)
downloadsamba-30ee8beb9316a99e8a49993306252591106cb349.tar.gz
samba-30ee8beb9316a99e8a49993306252591106cb349.tar.bz2
samba-30ee8beb9316a99e8a49993306252591106cb349.zip
r18301: I discovered how to load the warnings from a build farm build into
emacs compile mode (hint, paste to a file, and compile as "cat filename"). This allowed me to fix nearly all the warnings for a IA_64 SuSE build very quickly. (This used to be commit eba6c84efff735bb0ca941ac4b755ce2b0591667)
Diffstat (limited to 'source4/torture')
-rw-r--r--source4/torture/basic/base.c2
-rw-r--r--source4/torture/raw/acls.c10
-rw-r--r--source4/torture/raw/qfileinfo.c4
-rw-r--r--source4/torture/raw/read.c2
-rw-r--r--source4/torture/smb2/util.c4
5 files changed, 11 insertions, 11 deletions
diff --git a/source4/torture/basic/base.c b/source4/torture/basic/base.c
index 1275ab08e3..daeb6ad118 100644
--- a/source4/torture/basic/base.c
+++ b/source4/torture/basic/base.c
@@ -1465,7 +1465,7 @@ static BOOL run_iometer(struct torture_context *torture)
goto done;
}
- printf("size: %d\n", filesize);
+ printf("size: %d\n", (int)filesize);
filesize -= (sizeof(buf) - 1);
diff --git a/source4/torture/raw/acls.c b/source4/torture/raw/acls.c
index ebad7568c4..65d6b62cf7 100644
--- a/source4/torture/raw/acls.c
+++ b/source4/torture/raw/acls.c
@@ -962,10 +962,10 @@ static BOOL test_inheritance(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
const char *fname1 = BASEDIR "\\inheritance\\testfile";
const char *fname2 = BASEDIR "\\inheritance\\testdir";
BOOL ret = True;
- int fnum, fnum2, i;
+ int fnum=0, fnum2, i;
union smb_fileinfo q;
union smb_setfileinfo set;
- struct security_descriptor *sd, *sd2, *sd_orig, *sd_def;
+ struct security_descriptor *sd, *sd2, *sd_orig=NULL, *sd_def;
const char *owner_sid;
const struct dom_sid *creator_owner;
const struct {
@@ -1384,10 +1384,10 @@ static BOOL test_inheritance_dynamic(struct smbcli_state *cli, TALLOC_CTX *mem_c
const char *dname = BASEDIR "\\inheritance";
const char *fname1 = BASEDIR "\\inheritance\\testfile";
BOOL ret = True;
- int fnum, fnum2;
+ int fnum=0, fnum2;
union smb_fileinfo q;
union smb_setfileinfo set;
- struct security_descriptor *sd, *sd_orig;
+ struct security_descriptor *sd, *sd_orig=NULL;
const char *owner_sid;
printf("TESTING DYNAMIC ACL INHERITANCE\n");
@@ -1554,7 +1554,7 @@ static BOOL test_sd_get_set(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
struct security_descriptor *sd_group = NULL;
struct security_descriptor *sd_dacl = NULL;
struct security_descriptor *sd_sacl = NULL;
- int fnum;
+ int fnum=0;
const char *fname = BASEDIR "\\sd_get_set.txt";
uint64_t desired_64;
uint32_t desired = 0, granted;
diff --git a/source4/torture/raw/qfileinfo.c b/source4/torture/raw/qfileinfo.c
index 7998fcf501..d7199972ca 100644
--- a/source4/torture/raw/qfileinfo.c
+++ b/source4/torture/raw/qfileinfo.c
@@ -605,8 +605,8 @@ BOOL torture_raw_qfileinfo(struct torture_context *torture)
if (s2->all_info.out.ea_size !=
ea_list_size(s1->all_eas.out.num_eas, s1->all_eas.out.eas)) {
printf("ERROR: ea_list_size=%d != fnum all_info.out.ea_size=%d\n",
- ea_list_size(s1->all_eas.out.num_eas, s1->all_eas.out.eas),
- s2->all_info.out.ea_size);
+ (int)ea_list_size(s1->all_eas.out.num_eas, s1->all_eas.out.eas),
+ (int)s2->all_info.out.ea_size);
}
}
}
diff --git a/source4/torture/raw/read.c b/source4/torture/raw/read.c
index 1e73259dec..ef99eb0103 100644
--- a/source4/torture/raw/read.c
+++ b/source4/torture/raw/read.c
@@ -725,7 +725,7 @@ static BOOL test_read_for_execute(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
union smb_read rd;
NTSTATUS status;
BOOL ret = True;
- int fnum;
+ int fnum=0;
uint8_t *buf;
const int maxsize = 900;
const char *fname = BASEDIR "\\test.txt";
diff --git a/source4/torture/smb2/util.c b/source4/torture/smb2/util.c
index da74e47c0a..d167f6690e 100644
--- a/source4/torture/smb2/util.c
+++ b/source4/torture/smb2/util.c
@@ -175,9 +175,9 @@ static NTSTATUS smb2_create_complex(struct smb2_tree *tree, const char *fname,
printf("(%s) " #field " not setup correctly: %s(%llu) => %s(%llu)\n", \
__location__, \
nt_time_string(tree, setfile.basic_info.in.field), \
- setfile.basic_info.in.field, \
+ (unsigned long long)setfile.basic_info.in.field, \
nt_time_string(tree, fileinfo.basic_info.out.field), \
- fileinfo.basic_info.out.field); \
+ (unsigned long long)fileinfo.basic_info.out.field); \
status = NT_STATUS_INVALID_PARAMETER; \
} \
} while (0)