Fix various build issues

diff --git a/src/include/build.h b/src/include/build.h
index cc8debcfce547486da003ef2d77d6b94e4b186b1..b45f749f47bc18b9e0250f6e4930f4322cb2d5d4 100644 (file)
--- a/src/include/build.h
+++ b/src/include/build.h
@@ -190,7 +190,7 @@ extern "C" {
        DIAG_OFF(_x) \
        DIAG_ON(pragmas)
 #  define DIAG_ON_OPTIONAL(_x) \
-       DIAG_OFF(pragmas)
+       DIAG_OFF(pragmas) \
        DIAG_ON(_x) \
        DIAG_ON(pragmas)
 #  define DIAG_PUSH() DIAG_PRAGMA(push)

diff --git a/src/lib/util/socket.c b/src/lib/util/socket.c
index 749c4f6dda722e120eab1792fa9f35b35f3dd4f5..1f382177c5f484fb498e1a415137fbb800184ca8 100644 (file)
--- a/src/lib/util/socket.c
+++ b/src/lib/util/socket.c
@@ -841,7 +841,7 @@ int fr_socket_bind(int sockfd, fr_ipaddr_t const *src_ipaddr, uint16_t *src_port
         *      is likely to be the function which returns
         *      the "original" error.
         */
-       (void)fr_strerror();
+       fr_strerror_clear();
 
        if (src_port) my_port = *src_port;
        if (src_ipaddr) {

diff --git a/src/lib/util/strerror.c b/src/lib/util/strerror.c
index 9746ee92fb23a9ec43aacbf77a1ad9cb8683b50f..880759fe0efea032c263ca98ef99ded2644c2026 100644 (file)
--- a/src/lib/util/strerror.c
+++ b/src/lib/util/strerror.c
@@ -380,7 +380,7 @@ void fr_strerror_marker_printf_push_head(char const *subject, size_t offset, cha
  *
  * @hidecallergraph
  */
-static inline CC_HINT(always_inline) CC_HINT(nonnull) fr_log_entry_t *strerror_const(char const *msg)
+static inline CC_HINT(always_inline) fr_log_entry_t *strerror_const(char const *msg)
 {
        fr_log_entry_t  *entry;
        fr_log_buffer_t *buffer;
@@ -430,8 +430,7 @@ void fr_strerror_const(char const *msg)
  *
  * @hidecallergraph
  */
-static CC_HINT(always_inline) CC_HINT(nonnull)
-fr_log_entry_t *strerror_const_push(fr_log_buffer_t *buffer, char const *msg)
+static CC_HINT(always_inline) fr_log_entry_t *strerror_const_push(fr_log_buffer_t *buffer, char const *msg)
 {
        fr_log_entry_t  *entry;
 

diff --git a/src/modules/rlm_pap/rlm_pap.c b/src/modules/rlm_pap/rlm_pap.c
index 5f3047905614dd66c5149a5dc5829544d3a4f9bf..ccaafa1dd889f450631368d7d115577b6f5aba9e 100644 (file)
--- a/src/modules/rlm_pap/rlm_pap.c
+++ b/src/modules/rlm_pap/rlm_pap.c
@@ -534,7 +534,7 @@ static inline CC_HINT(nonnull) unlang_action_t pap_auth_pbkdf2_parse(rlm_rcode_t
         *      base64 encoded and big endian
         */
        } else {
-               (void)fr_strerror();
+               fr_strerror_clear();
                slen = fr_base64_decode((uint8_t *)&iterations, sizeof(iterations), (char const *)p, q - p);
                if (slen < 0) {
                        RPEDEBUG("Failed decoding PBKDF2-Password iterations component (%.*s)", (int)(q - p), p);