sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-22 05:57:43 +03:00
Code

torture: Fix clang errors

Browse Source 
h1.data is an array and as such always is != NULL, so it's always true

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Wed Oct 19 05:11:25 CEST 2016 on sn-devel-144
This commit is contained in:
Volker Lendecke 2016-10-18 13:27:00 +02:00 committed by Jeremy Allison
parent 46fac3b796
commit 7d9f18f3f3
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
source4/torture/smb2/rename.c
View File

@ -120,7 +120,7 @@ done:
torture_comment(torture, "Cleaning up\n");
if (h1.data) {
if (h1.data[0] || h1.data[1]) {
ZERO_STRUCT(cl.smb2);
cl.smb2.level = RAW_CLOSE_SMB2;
cl.smb2.in.file.handle = h1;
@ -199,7 +199,7 @@ done:
torture_comment(torture, "Cleaning up\n");
if (h1.data) {
if (h1.data[0] || h1.data[1]) {
ZERO_STRUCT(cl.smb2);
cl.smb2.level = RAW_CLOSE_SMB2;
cl.smb2.in.file.handle = h1;
@ -288,7 +288,7 @@ done:
torture_comment(torture, "Cleaning up\n");
if (h1.data) {
if (h1.data[0] || h1.data[1]) {
ZERO_STRUCT(cl.smb2);
cl.smb2.level = RAW_CLOSE_SMB2;
cl.smb2.in.file.handle = h1;
@ -405,13 +405,13 @@ done:
torture_comment(torture, "Cleaning up\n");
if (fh.data) {
if (fh.data[0] || fh.data[1]) {
ZERO_STRUCT(cl.smb2);
cl.smb2.level = RAW_CLOSE_SMB2;
cl.smb2.in.file.handle = fh;
status = smb2_close(tree1, &(cl.smb2));
}
if (dh.data) {
if (dh.data[0] || dh.data[1]) {
ZERO_STRUCT(cl.smb2);
cl.smb2.level = RAW_CLOSE_SMB2;
cl.smb2.in.file.handle = dh;
@ -529,13 +529,13 @@ done:
torture_comment(torture, "Cleaning up\n");
if (fh.data) {
if (fh.data[0] || fh.data[1]) {
ZERO_STRUCT(cl.smb2);
cl.smb2.level = RAW_CLOSE_SMB2;
cl.smb2.in.file.handle = fh;
status = smb2_close(tree1, &(cl.smb2));
}
if (dh.data) {
if (dh.data[0] || dh.data[1]) {
ZERO_STRUCT(cl.smb2);
cl.smb2.level = RAW_CLOSE_SMB2;
cl.smb2.in.file.handle = dh;
@ -663,13 +663,13 @@ done:
torture_comment(torture, "Cleaning up\n");
if (fh.data) {
if (fh.data[0] || fh.data[1]) {
ZERO_STRUCT(cl.smb2);
cl.smb2.level = RAW_CLOSE_SMB2;
cl.smb2.in.file.handle = fh;
status = smb2_close(tree1, &(cl.smb2));
}
if (dh.data) {
if (dh.data[0] || dh.data[1]) {
ZERO_STRUCT(cl.smb2);
cl.smb2.level = RAW_CLOSE_SMB2;
cl.smb2.in.file.handle = dh;
@ -787,13 +787,13 @@ done:
torture_comment(torture, "Cleaning up\n");
if (fh.data) {
if (fh.data[0] || fh.data[1]) {
ZERO_STRUCT(cl.smb2);
cl.smb2.level = RAW_CLOSE_SMB2;
cl.smb2.in.file.handle = fh;
status = smb2_close(tree1, &(cl.smb2));
}
if (dh.data) {
if (dh.data[0] || dh.data[1]) {
ZERO_STRUCT(cl.smb2);
cl.smb2.level = RAW_CLOSE_SMB2;
cl.smb2.in.file.handle = dh;
@ -911,13 +911,13 @@ done:
torture_comment(torture, "Cleaning up\n");
if (fh.data) {
if (fh.data[0] || fh.data[1]) {
ZERO_STRUCT(cl.smb2);
cl.smb2.level = RAW_CLOSE_SMB2;
cl.smb2.in.file.handle = fh;
status = smb2_close(tree1, &(cl.smb2));
}
if (dh.data) {
if (dh.data[0] || dh.data[1]) {
ZERO_STRUCT(cl.smb2);
cl.smb2.level = RAW_CLOSE_SMB2;
cl.smb2.in.file.handle = dh;
@ -1011,7 +1011,7 @@ done:
torture_comment(torture, "Cleaning up\n");
if (h1.data) {
if (h1.data[0] || h1.data[1]) {
ZERO_STRUCT(cl.smb2);
cl.smb2.level = RAW_CLOSE_SMB2;
cl.smb2.in.file.handle = h1;

2
source4/torture/vfs/fruit.c
View File

@ -2841,7 +2841,7 @@ static bool test_rename_dir_openfile(struct torture_context *torture,
torture_comment(torture, "Cleaning up\n");
if (h1.data) {
if (h1.data[0] || h1.data[1]) {
ZERO_STRUCT(cl.smb2);
cl.smb2.level = RAW_CLOSE_SMB2;
cl.smb2.in.file.handle = h1;