libsmb: Simplify callers of SMBC_dlist_contains()

This function already does the NULL check on the file pointer

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source3/libsmb/libsmb_dir.c b/source3/libsmb/libsmb_dir.c
index f159e2a12bec274b93341ba9b9dbfd095d2d8446..eaae38664cfb79f07c228b3cad21d5f8a07ef172 100644 (file)
--- a/source3/libsmb/libsmb_dir.c
+++ b/source3/libsmb/libsmb_dir.c
@@ -1040,7 +1040,7 @@ SMBC_closedir_ctx(SMBCCTX *context,
                return -1;
        }
 
-       if (!dir || !SMBC_dlist_contains(context->internal->files, dir)) {
+       if (!SMBC_dlist_contains(context->internal->files, dir)) {
                errno = EBADF;
                TALLOC_FREE(frame);
                return -1;
@@ -1153,7 +1153,7 @@ SMBC_readdir_ctx(SMBCCTX *context,
 
        }
 
-       if (!dir || !SMBC_dlist_contains(context->internal->files, dir)) {
+       if (!SMBC_dlist_contains(context->internal->files, dir)) {
 
                errno = EBADF;
                 DEBUG(0, ("Invalid dir in SMBC_readdir_ctx()\n"));
@@ -1232,7 +1232,7 @@ SMBC_readdirplus_ctx(SMBCCTX *context,
                return NULL;
        }
 
-       if (dir == NULL || !SMBC_dlist_contains(context->internal->files, dir)) {
+       if (!SMBC_dlist_contains(context->internal->files, dir)) {
                DBG_ERR("Invalid dir in SMBC_readdirplus_ctx()\n");
                TALLOC_FREE(frame);
                errno = EBADF;
@@ -1311,7 +1311,7 @@ const struct libsmb_file_info *SMBC_readdirplus2_ctx(SMBCCTX *context,
                return NULL;
        }
 
-       if (dir == NULL || !SMBC_dlist_contains(context->internal->files, dir)) {
+       if (!SMBC_dlist_contains(context->internal->files, dir)) {
                DBG_ERR("Invalid dir in SMBC_readdirplus2_ctx()\n");
                TALLOC_FREE(frame);
                errno = EBADF;
@@ -1416,7 +1416,7 @@ SMBC_getdents_ctx(SMBCCTX *context,
 
        }
 
-       if (!dir || !SMBC_dlist_contains(context->internal->files, dir)) {
+       if (!SMBC_dlist_contains(context->internal->files, dir)) {
 
                errno = EBADF;
                TALLOC_FREE(frame);
@@ -1783,7 +1783,7 @@ SMBC_telldir_ctx(SMBCCTX *context,
 
        }
 
-       if (!dir || !SMBC_dlist_contains(context->internal->files, dir)) {
+       if (!SMBC_dlist_contains(context->internal->files, dir)) {
 
                errno = EBADF;
                TALLOC_FREE(frame);
@@ -2631,8 +2631,7 @@ SMBC_notify_ctx(SMBCCTX *context, SMBCFILE *dir, smbc_bool recursive,
                errno = EINVAL;
                return -1;
        }
-       if ((dir == NULL) ||
-           !SMBC_dlist_contains(context->internal->files, dir)) {
+       if (!SMBC_dlist_contains(context->internal->files, dir)) {
                TALLOC_FREE(frame);
                errno = EBADF;
                return -1;

diff --git a/source3/libsmb/libsmb_file.c b/source3/libsmb/libsmb_file.c
index 1577010e49018ee290f55eb0cacd92e14472f55b..29801d9fa3ca8fd13cdc5f6d348538a443daade6 100644 (file)
--- a/source3/libsmb/libsmb_file.c
+++ b/source3/libsmb/libsmb_file.c
@@ -258,7 +258,7 @@ SMBC_read_ctx(SMBCCTX *context,
 
        DEBUG(4, ("smbc_read(%p, %d)\n", file, (int)count));
 
-       if (!file || !SMBC_dlist_contains(context->internal->files, file)) {
+       if (!SMBC_dlist_contains(context->internal->files, file)) {
                errno = EBADF;
                TALLOC_FREE(frame);
                return -1;
@@ -308,17 +308,13 @@ SMBC_splice_ctx(SMBCCTX *context,
                return -1;
        }
 
-       if (!srcfile ||
-           !SMBC_dlist_contains(context->internal->files, srcfile))
-       {
+       if (!SMBC_dlist_contains(context->internal->files, srcfile)) {
                errno = EBADF;
                TALLOC_FREE(frame);
                return -1;
        }
 
-       if (!dstfile ||
-           !SMBC_dlist_contains(context->internal->files, dstfile))
-       {
+       if (!SMBC_dlist_contains(context->internal->files, dstfile)) {
                errno = EBADF;
                TALLOC_FREE(frame);
                return -1;
@@ -363,7 +359,7 @@ SMBC_write_ctx(SMBCCTX *context,
                return -1;
        }
 
-       if (!file || !SMBC_dlist_contains(context->internal->files, file)) {
+       if (!SMBC_dlist_contains(context->internal->files, file)) {
                errno = EBADF;
                TALLOC_FREE(frame);
                return -1;
@@ -409,7 +405,7 @@ SMBC_close_ctx(SMBCCTX *context,
                return -1;
        }
 
-       if (!file || !SMBC_dlist_contains(context->internal->files, file)) {
+       if (!SMBC_dlist_contains(context->internal->files, file)) {
                errno = EBADF;
                TALLOC_FREE(frame);
                return -1;
@@ -701,7 +697,7 @@ SMBC_lseek_ctx(SMBCCTX *context,
                return -1;
        }
 
-       if (!file || !SMBC_dlist_contains(context->internal->files, file)) {
+       if (!SMBC_dlist_contains(context->internal->files, file)) {
                errno = EBADF;
                TALLOC_FREE(frame);
                return -1;
@@ -764,7 +760,7 @@ SMBC_ftruncate_ctx(SMBCCTX *context,
                return -1;
        }
 
-       if (!file || !SMBC_dlist_contains(context->internal->files, file)) {
+       if (!SMBC_dlist_contains(context->internal->files, file)) {
                errno = EBADF;
                TALLOC_FREE(frame);
                return -1;

diff --git a/source3/libsmb/libsmb_stat.c b/source3/libsmb/libsmb_stat.c
index f20f79579e2caa4ec2c761c0397936e58837eb31..a4aaf6c327f484b0b7ed147834977f2e2b75b479 100644 (file)
--- a/source3/libsmb/libsmb_stat.c
+++ b/source3/libsmb/libsmb_stat.c
@@ -251,7 +251,7 @@ SMBC_fstat_ctx(SMBCCTX *context,
                return -1;
        }
 
-       if (!file || !SMBC_dlist_contains(context->internal->files, file)) {
+       if (!SMBC_dlist_contains(context->internal->files, file)) {
                errno = EBADF;
                TALLOC_FREE(frame);
                return -1;