From 20b99b03a0795b920ac2be9d7e51bc6819f3d24f Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 21 Feb 2020 22:13:49 +0100 Subject: [PATCH] libsmb: Make SMBC_dlist_contains return bool It returned True/False, and is used as boolean only. Modernize formatting a bit. Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison Reviewed-by: Andreas Schneider --- source3/include/libsmb_internal.h | 3 +-- source3/libsmb/libsmb_misc.c | 15 +++++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/source3/include/libsmb_internal.h b/source3/include/libsmb_internal.h index be88e8e300d..13fd46977a0 100644 --- a/source3/include/libsmb_internal.h +++ b/source3/include/libsmb_internal.h @@ -430,8 +430,7 @@ SMBC_ftruncate_ctx(SMBCCTX *context, /* Functions in libsmb_misc.c */ -int -SMBC_dlist_contains(SMBCFILE * list, SMBCFILE *p); +bool SMBC_dlist_contains(SMBCFILE * list, SMBCFILE *p); int SMBC_errno(SMBCCTX *context, diff --git a/source3/libsmb/libsmb_misc.c b/source3/libsmb/libsmb_misc.c index 1d874c74cd8..28e2ca842cf 100644 --- a/source3/libsmb/libsmb_misc.c +++ b/source3/libsmb/libsmb_misc.c @@ -31,15 +31,18 @@ /* * check if an element is part of the list. */ -int -SMBC_dlist_contains(SMBCFILE * list, SMBCFILE *p) +bool SMBC_dlist_contains(SMBCFILE * list, SMBCFILE *p) { - if (!p || !list) return False; + if ((p == NULL) || (list == NULL)) { + return false; + } do { - if (p == list) return True; + if (p == list) { + return true; + } list = list->next; - } while (list); - return False; + } while (list != NULL); + return false; }