sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-11-11 00:23:51 +03:00
Code Activity

libsmb: Simplify callers of SMBC_dlist_contains()

Browse Source 
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>
This commit is contained in:
Volker Lendecke
2020-02-21 22:35:44 +01:00
committed by Jeremy Allison
parent 427e10e8e3
commit d7281e3210
3 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source3/libsmb/libsmb_file.c
View File

@@ -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;