diff options
| author | Sri Mohana Singamsetty <srimohans@gmail.com> | 2020-03-20 14:55:49 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-20 14:55:49 -0700 |
| commit | c133ddca171985ff301ba84f1793a5e77ae9befc (patch) | |
| tree | fa700136d46b786d657054c20b979a2f5356f7d3 | |
| parent | 95c0125dd240327072cbc2c91ba407b7fc188491 (diff) | |
| parent | b25b292538d4eb92bbc2d4b73863a9c745db2f8c (diff) | |
Merge pull request #5977 from rubenk/treewide-add-noreturn
treewide: add attribute to functions that do not return
| -rw-r--r-- | lib/libfrr.h | 3 | ||||
| -rw-r--r-- | lib/memory.h | 3 | ||||
| -rw-r--r-- | zebra/zserv.h | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/lib/libfrr.h b/lib/libfrr.h index f964c9e2a1..9d91ea9154 100644 --- a/lib/libfrr.h +++ b/lib/libfrr.h @@ -128,7 +128,8 @@ extern void frr_preinit(struct frr_daemon_info *daemon, int argc, char **argv); extern void frr_opt_add(const char *optstr, const struct option *longopts, const char *helpstr); extern int frr_getopt(int argc, char *const argv[], int *longindex); -extern void frr_help_exit(int status); + +extern __attribute__((__noreturn__)) void frr_help_exit(int status); extern struct thread_master *frr_init(void); extern const char *frr_get_progname(void); diff --git a/lib/memory.h b/lib/memory.h index 44ea19b557..e4e05faa4f 100644 --- a/lib/memory.h +++ b/lib/memory.h @@ -179,7 +179,8 @@ extern int qmem_walk(qmem_walk_fn *func, void *arg); extern int log_memstats(FILE *fp, const char *); #define log_memstats_stderr(prefix) log_memstats(stderr, prefix) -extern void memory_oom(size_t size, const char *name); +extern __attribute__((__noreturn__)) void memory_oom(size_t size, + const char *name); #ifdef __cplusplus } diff --git a/zebra/zserv.h b/zebra/zserv.h index 6a075cc9a7..6ab7fbd918 100644 --- a/zebra/zserv.h +++ b/zebra/zserv.h @@ -314,7 +314,7 @@ extern void zserv_read_file(char *input); #endif /* TODO */ -int zebra_finalize(struct thread *event); +__attribute__((__noreturn__)) int zebra_finalize(struct thread *event); /* * Graceful restart functions. |