Always return instead of calling fr_cond_assert so stupid static analysers don't...

diff --git a/src/lib/server/cf_parse.c b/src/lib/server/cf_parse.c
index 70e047b3ea6704758e51feca84715672bd7a3a1d..5c35f8a9ac59e5fecb19047184edfb4f3fae229c 100644 (file)
--- a/src/lib/server/cf_parse.c
+++ b/src/lib/server/cf_parse.c
@@ -673,7 +673,8 @@ static int CC_HINT(nonnull(4,5)) cf_pair_parse_internal(TALLOC_CTX *ctx, void *o
 
                default:
                        cf_log_err(cp, "Unsupported type %i (%i)", type, FR_BASE_TYPE(type));
-                       if (!fr_cond_assert(0)) return -1;      /* Unsupported type */
+                       fr_assert_fail(NULL);
+                       return -1;      /* Unsupported type */
                }
 
                for (i = 0; i < count; i++, cp = cf_pair_find_next(cs, cp, rule->name)) {

diff --git a/src/lib/server/cf_util.c b/src/lib/server/cf_util.c
index 596ebb2e475b5cf6512b32617cb60d0a140b7977..b96f63b5bdb0d93aa4ed195b13a0164292990184 100644 (file)
--- a/src/lib/server/cf_util.c
+++ b/src/lib/server/cf_util.c
@@ -114,7 +114,8 @@ static CONF_ITEM *cf_find(CONF_ITEM const *parent, CONF_ITEM_TYPE type, char con
                break;
 
        default:
-               if (!fr_cond_assert(0)) return NULL;
+               fr_assert_fail(NULL);
+               return NULL;
        }
 
        /*
@@ -204,7 +205,8 @@ static CONF_ITEM *cf_find_next(CONF_ITEM const *parent, CONF_ITEM const *prev,
                break;
 
        default:
-               if (!fr_cond_assert(0)) return NULL;
+               fr_assert_fail(NULL);
+               return NULL;
        }
 
        if (IS_WILDCARD(ident1)) {
@@ -285,7 +287,7 @@ static inline int _cf_ident1_cmp(void const *a, void const *b)
        }
 
        default:
-               if (!fr_cond_assert(0)) return 0;
+               fr_assert_fail(NULL);
                return 0;
        }
 }
@@ -335,7 +337,7 @@ static inline int cf_ident2_cmp(void const *a, void const *b)
        }
 
        default:
-               if (!fr_cond_assert(0)) return 0;
+               fr_assert_fail(NULL);
                return 0;
        }
 }

diff --git a/src/lib/server/password.c b/src/lib/server/password.c
index 57e3631f69e92565c2bbc62623bf3e4ee742ad34..0f35116e0f70bd84559e1256d47d857f690adad8 100644 (file)
--- a/src/lib/server/password.c
+++ b/src/lib/server/password.c
@@ -690,7 +690,8 @@ do_header:
                        break;
 
                default:
-                       if (!fr_cond_assert(0)) return NULL;
+                       fr_assert_fail(NULL);
+                       return NULL;
                }
                return new;
        }

diff --git a/src/lib/server/tmpl.c b/src/lib/server/tmpl.c
index bdbdda7373e0fbc3105856e11a702a119f67ec34..17e8c322bf432ec3e12902ce91592b4eacb36fcd 100644 (file)
--- a/src/lib/server/tmpl.c
+++ b/src/lib/server/tmpl.c
@@ -2192,7 +2192,8 @@ size_t tmpl_snprint_attr_str(size_t *need, char *out, size_t outlen, vp_tmpl_t c
                break;
 
        default:
-               if (!fr_cond_assert(0)) return 0;
+               fr_assert_fail(NULL);
+               return 0;
        }
 
        *out_p = '\0';

diff --git a/src/lib/server/xlat_tokenize.c b/src/lib/server/xlat_tokenize.c
index dcfd84ef188662da370cac96b02f294b686e6fa7..3248730a4874531e89703b9e45c5cf8ee2ea5178 100644 (file)
--- a/src/lib/server/xlat_tokenize.c
+++ b/src/lib/server/xlat_tokenize.c
@@ -855,7 +855,8 @@ size_t xlat_snprint(char *out, size_t outlen, xlat_exp_t const *node)
                        break;
 
                default:
-                       if (!fr_cond_assert(0)) break;
+                       fr_assert_fail(NULL);
+                       break;
                }
 
                *(p++) = '}';

diff --git a/src/lib/sim/base.c b/src/lib/sim/base.c
index 94eaa1ca4fa91e3facb38a44fa35a0e545f7885a..08e9dbd63b6fa90308851535d2f2eaa4346c590f 100644 (file)
--- a/src/lib/sim/base.c
+++ b/src/lib/sim/base.c
@@ -172,7 +172,7 @@ size_t fr_sim_attr_len(VALUE_PAIR const *vp)
                return fr_sim_attr_sizes[vp->vp_type][0];
 
        case FR_TYPE_STRUCTURAL:
-               if (!fr_cond_assert(0)) return 0;
+               fr_assert_fail(NULL);
                return 0;
        }
 }

diff --git a/src/lib/unlang/module.c b/src/lib/unlang/module.c
index 6eadbba6c5f2b7dac0d144d43ae84f3df5f14651..5a5bcbdb9ffb7ecf3d068fa3ae16df05c243fa94 100644 (file)
--- a/src/lib/unlang/module.c
+++ b/src/lib/unlang/module.c
@@ -496,7 +496,8 @@ rlm_rcode_t unlang_module_yield_to_section(REQUEST *request, CONF_SECTION *subcs
                }
 
                default:
-                       if (!fr_cond_assert(0)) return RLM_MODULE_FAIL;
+                       fr_assert_fail(NULL);
+                       return RLM_MODULE_FAIL;
                }
        }
 

diff --git a/src/lib/util/debug.h b/src/lib/util/debug.h
index 5944c0dc304fe97468b6a205228177f72372a584..5a489f31bf5897724e2485f8f352842cb5254350 100644 (file)
--- a/src/lib/util/debug.h
+++ b/src/lib/util/debug.h
@@ -96,6 +96,13 @@ bool         fr_cond_assert_fail(char const *file, int line, char const *expr, char con
  */
 #define                fr_cond_assert(_x) likely((bool)((_x) ? true : (fr_cond_assert_fail(__FILE__, __LINE__, #_x, NULL) && false)))
 
+/** Calls panic_action ifndef NDEBUG, else logs error
+ *
+ * @param[in] _msg     to log.
+ * @param[in] ...      args.
+ */
+#define                fr_assert_fail(_msg, ...) fr_cond_assert_fail(__FILE__, __LINE__, "false", _msg,  ## __VA_ARGS__)
+
 /** Calls panic_action ifndef NDEBUG, else logs error and evaluates to value of _x
  *
  * Should be wrapped in a condition, and if false, should cause function to return

diff --git a/src/lib/util/value.c b/src/lib/util/value.c
index eadeb749c219402cafabca3c63b5e233919ca3bf..1421f710875de1d3699b3c52cfb84479755e91ca 100644 (file)
--- a/src/lib/util/value.c
+++ b/src/lib/util/value.c
@@ -297,7 +297,8 @@ inline void fr_value_box_clear(fr_value_box_t *data)
                break;
 
        case FR_TYPE_STRUCTURAL:
-               if (!fr_cond_assert(0)) return;
+               fr_assert_fail(NULL);
+               return;
 
        case FR_TYPE_INVALID:
                return;
@@ -955,7 +956,8 @@ int fr_value_box_hton(fr_value_box_t *dst, fr_value_box_t const *src)
        case FR_TYPE_OCTETS:
        case FR_TYPE_STRING:
        case FR_TYPE_NON_VALUES:
-               if (!fr_cond_assert(0)) return -1; /* shouldn't happen */
+               fr_assert_fail(NULL);
+               return -1; /* shouldn't happen */
        }
 
        if (dst != src) fr_value_box_copy_meta(dst, src);
@@ -2554,7 +2556,8 @@ int fr_value_box_cast(TALLOC_CTX *ctx, fr_value_box_t *dst,
        case FR_TYPE_GROUP:
        case FR_TYPE_INVALID:
        case FR_TYPE_MAX:
-               if (!fr_cond_assert(0)) return -1;
+               fr_assert_fail(NULL);
+               return -1;
        }
 
        /*
@@ -3626,7 +3629,8 @@ static int fr_value_box_from_integer_str(fr_value_box_t *dst, fr_type_t dst_type
                break;
 
        default:
-               if (!fr_cond_assert(0)) return -1;
+               fr_assert_fail(NULL);
+               return -1;
        }
 
 #define IN_RANGE_UNSIGNED(_type) \
@@ -3693,7 +3697,8 @@ static int fr_value_box_from_integer_str(fr_value_box_t *dst, fr_type_t dst_type
                break;
 
        default:
-               if (!fr_cond_assert(0)) return -1;
+               fr_assert_fail(NULL);
+               return -1;
        }
 
        return 0;

diff --git a/src/modules/rlm_sigtran/sccp.c b/src/modules/rlm_sigtran/sccp.c
index 2d3fd41311ee06588624134cbbdce193dc61ae18..a1b38b2c06162e7dc384fb6c966065c0df9b9326 100644 (file)
--- a/src/modules/rlm_sigtran/sccp.c
+++ b/src/modules/rlm_sigtran/sccp.c
@@ -172,7 +172,8 @@ int sigtran_tcap_outgoing(UNUSED struct msgb *msg_in, void *ctx, sigtran_transac
                break;
 
        default:
-               if (!fr_cond_assert(0)) return -1;
+               fr_assert_fail(NULL);
+               return -1;
        }
 
        /*

diff --git a/src/protocols/dhcpv6/base.c b/src/protocols/dhcpv6/base.c
index 370013072723bfd88aaec0c3ee1501b8bab7ecca..9b67da1eb954a1452a0c9fca7370740929382b93 100644 (file)
--- a/src/protocols/dhcpv6/base.c
+++ b/src/protocols/dhcpv6/base.c
@@ -86,7 +86,7 @@ size_t fr_dhcpv6_option_len(VALUE_PAIR const *vp)
                return fr_dhcpv6_attr_sizes[vp->vp_type][0];
 
        case FR_TYPE_STRUCTURAL:
-               if (!fr_cond_assert(0)) return 0;
+               fr_assert_fail(NULL);
                return 0;
        }
 }

diff --git a/src/protocols/radius/base.c b/src/protocols/radius/base.c
index 15e4d7b4174d4bb0b130b39b9c0a785548cacf5b..488a939d04bade7a01a705e780afbf7cae6a7d66 100644 (file)
--- a/src/protocols/radius/base.c
+++ b/src/protocols/radius/base.c
@@ -218,7 +218,7 @@ size_t fr_radius_attr_len(VALUE_PAIR const *vp)
                return fr_radius_attr_sizes[vp->vp_type][0];
 
        case FR_TYPE_STRUCTURAL:
-               if (!fr_cond_assert(0)) return 0;
+               fr_assert_fail(NULL);
                return 0;
        }
 }