From: Volker Lendecke <vl@samba.org>
Date: Fri, 21 Feb 2020 21:13:49 +0000 (+0100)
Subject: libsmb: Make SMBC_dlist_contains return bool
X-Git-Tag: ldb-2.2.0~1606
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=427e10e8e3250d791134efcbbc34e07714d8eebf;p=thirdparty%2Fsamba.git

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 <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/source3/include/libsmb_internal.h b/source3/include/libsmb_internal.h
index 21a11c1a024..27eaeb5fd89 100644
--- a/source3/include/libsmb_internal.h
+++ b/source3/include/libsmb_internal.h
@@ -431,8 +431,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;
 }