From: Nick Porter <nick@portercomputing.co.uk>
Date: Thu, 19 Oct 2023 17:11:56 +0000 (+0100)
Subject: Mark required arguments as nonnull
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7dfff6f9d5e8998aa994ca6935ec3b1869c394ef;p=thirdparty%2Ffreeradius-server.git

Mark required arguments as nonnull
---

diff --git a/src/lib/ldap/base.h b/src/lib/ldap/base.h
index 7fb136a89cf..941c1cf9030 100644
--- a/src/lib/ldap/base.h
+++ b/src/lib/ldap/base.h
@@ -754,9 +754,11 @@ unlang_action_t fr_ldap_trunk_extended(TALLOC_CTX *ctx,
 void		fr_ldap_timeout_debug(request_t *request, fr_ldap_connection_t const *conn,
 				      fr_time_delta_t timeout, char const *prefix);
 
-size_t		fr_ldap_escape_func(UNUSED request_t *request, char *out, size_t outlen, char const *in, UNUSED void *arg);
+size_t		fr_ldap_escape_func(UNUSED request_t *request, char *out, size_t outlen, char const *in, UNUSED void *arg)
+		CC_HINT(nonnull(2,4));
 
-size_t		fr_ldap_unescape_func(UNUSED request_t *request, char *out, size_t outlen, char const *in, UNUSED void *arg);
+size_t		fr_ldap_unescape_func(UNUSED request_t *request, char *out, size_t outlen, char const *in, UNUSED void *arg)
+		CC_HINT(nonnull(2,4));
 
 ssize_t		fr_ldap_xlat_filter(request_t *request, char const **sub, size_t sublen, char *out, size_t outlen);
 
diff --git a/src/lib/ldap/util.c b/src/lib/ldap/util.c
index 1f16b141c98..17e43704ef8 100644
--- a/src/lib/ldap/util.c
+++ b/src/lib/ldap/util.c
@@ -71,7 +71,7 @@ size_t fr_ldap_escape_func(UNUSED request_t *request, char *out, size_t outlen,
 {
 	size_t left = outlen;
 
-	if (*in && ((*in == ' ') || (*in == '#'))) goto encode;
+	if ((*in == ' ') || (*in == '#')) goto encode;
 
 	while (*in) {
 		/*