diff options
| author | Mark Stapp <mjs.ietf@gmail.com> | 2022-12-16 18:42:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-16 18:42:14 +0100 |
| commit | 17cb0eaa0919a01c5edb62c5e205279ac1122c24 (patch) | |
| tree | 8220cbc666a468dd7f0dc1c71dc705a831766775 | |
| parent | Merge pull request #12522 from donaldsharp/some_various_stuff (diff) | |
| parent | lib, staticd: return values even after an assert (diff) | |
| download | frr-17cb0eaa0919a01c5edb62c5e205279ac1122c24.tar.xz frr-17cb0eaa0919a01c5edb62c5e205279ac1122c24.zip | |
Merge pull request #12533 from donaldsharp/returns_are_needed
lib, staticd: return values even after an assert
| -rw-r--r-- | lib/zlog_targets.c | 4 | ||||
| -rw-r--r-- | staticd/static_zebra.c | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/lib/zlog_targets.c b/lib/zlog_targets.c index 31bd8e16e..f7ea48bf9 100644 --- a/lib/zlog_targets.c +++ b/lib/zlog_targets.c @@ -257,6 +257,7 @@ bool zlog_file_set_filename(struct zlog_cfg_file *zcf, const char *filename) return zlog_file_cycle(zcf); } assert(0); + return false; } bool zlog_file_set_fd(struct zlog_cfg_file *zcf, int fd) @@ -271,6 +272,7 @@ bool zlog_file_set_fd(struct zlog_cfg_file *zcf, int fd) return zlog_file_cycle(zcf); } assert(0); + return false; } struct rcu_close_rotate { @@ -544,6 +546,7 @@ int zlog_syslog_get_facility(void) return syslog_facility; } assert(0); + return 0; } void zlog_syslog_set_prio_min(int prio_min) @@ -581,4 +584,5 @@ int zlog_syslog_get_prio_min(void) return syslog_prio_min; } assert(0); + return 0; } diff --git a/staticd/static_zebra.c b/staticd/static_zebra.c index de07ad8ef..cb3630447 100644 --- a/staticd/static_zebra.c +++ b/staticd/static_zebra.c @@ -313,6 +313,7 @@ static bool static_zebra_nht_get_prefix(const struct static_nexthop *nh, } assertf(0, "BUG: someone forgot to add nexthop type %u", nh->type); + return false; } void static_zebra_nht_register(struct static_nexthop *nh, bool reg) |