diff options
| author | Stefano Brivio <sbrivio@redhat.com> | 2023-02-27 04:06:19 +0100 |
|---|---|---|
| committer | Stefano Brivio <sbrivio@redhat.com> | 2023-02-27 18:55:57 +0100 |
| commit | d2df7632321c473cd57064e2350b219fbc3f6677 (patch) | |
| tree | ec81d4c0e51397e48f95f43d6180fb1bac69e3b6 /log.c | |
| parent | fb05a713789fd9c20d0432f023ce26f3c5b94251 (diff) | |
| download | passt-d2df7632321c473cd57064e2350b219fbc3f6677.tar passt-d2df7632321c473cd57064e2350b219fbc3f6677.tar.gz passt-d2df7632321c473cd57064e2350b219fbc3f6677.tar.bz2 passt-d2df7632321c473cd57064e2350b219fbc3f6677.tar.lz passt-d2df7632321c473cd57064e2350b219fbc3f6677.tar.xz passt-d2df7632321c473cd57064e2350b219fbc3f6677.tar.zst passt-d2df7632321c473cd57064e2350b219fbc3f6677.zip | |
log, conf, tap: Define die() as err() plus exit(), drop cppcheck workarounds
If we define die() as a variadic macro, passing __VA_ARGS__ to err(),
and calling exit() outside err() itself, we can drop the workarounds
introduced in commit 36f0199f6ef4 ("conf, tap: Silence two false
positive invalidFunctionArg from cppcheck").
Suggested-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'log.c')
| -rw-r--r-- | log.c | 14 |
1 files changed, 5 insertions, 9 deletions
@@ -46,7 +46,7 @@ int log_trace; /* --trace mode enabled */ #define BEFORE_DAEMON (setlogmask(0) == LOG_MASK(LOG_EMERG)) -#define logfn(name, level, doexit) \ +#define logfn(name, level) \ void name(const char *format, ...) { \ struct timespec tp; \ va_list args; \ @@ -75,9 +75,6 @@ void name(const char *format, ...) { \ if (format[strlen(format)] != '\n') \ fprintf(stderr, "\n"); \ } \ - \ - if (doexit) \ - exit(EXIT_FAILURE); \ } /* Prefixes for log file messages, indexed by priority */ @@ -90,11 +87,10 @@ const char *logfile_prefix[] = { " ", /* LOG_DEBUG */ }; -logfn(die, LOG_ERR, 1) -logfn(err, LOG_ERR, 0) -logfn(warn, LOG_WARNING, 0) -logfn(info, LOG_INFO, 0) -logfn(debug,LOG_DEBUG, 0) +logfn(err, LOG_ERR) +logfn(warn, LOG_WARNING) +logfn(info, LOG_INFO) +logfn(debug,LOG_DEBUG) /** * trace_init() - Set log_trace depending on trace (debug) mode |