Mark required arguments as nonnull

diff --git a/src/lib/ldap/base.h b/src/lib/ldap/base.h
index 7fb136a89cf3fe3e3248b080c323517a106c3e1c..941c1cf9030cf61e642b8d84d24f8de4fe4c0472 100644 (file)
--- 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 1f16b141c989693829feb908c69a0461420ca9f1..17e43704ef8571afb63917edfb5a236487b6ea4b 100644 (file)
--- 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) {
                /*