diff options
| author |  Kelvin M. Klann <kmk3.code@protonmail.com> | 2024-02-23 03:49:23 +0000 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2024-02-23 03:49:23 +0000 |
| commit | 5c6557753f27a0e35499360bb9f08a545a752664 (patch) | |
| tree | 30c9cb8689c3f22224597eaac4017483bc0e1084 | |
| parent | build(deps): bump github/codeql-action from 3.24.0 to 3.24.3 (diff) | |
| parent | build: move errExit macro into inline function (diff) | |
| download | firejail-5c6557753f27a0e35499360bb9f08a545a752664.tar.gz firejail-5c6557753f27a0e35499360bb9f08a545a752664.tar.zst firejail-5c6557753f27a0e35499360bb9f08a545a752664.zip | |
Merge pull request #6217 from kmk3/build-errexit-func
build: move errExit macro into inline function
| -rw-r--r-- | src/include/common.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/include/common.h b/src/include/common.h index 5f09fe3e2..61a27ded9 100644 --- a/src/include/common.h +++ b/src/include/common.h | |||
| @@ -39,13 +39,15 @@ | |||
| 39 | // dbus proxy path used by firejail and firemon | 39 | // dbus proxy path used by firejail and firemon |
| 40 | #define XDG_DBUS_PROXY_PATH "/usr/bin/xdg-dbus-proxy" | 40 | #define XDG_DBUS_PROXY_PATH "/usr/bin/xdg-dbus-proxy" |
| 41 | 41 | ||
| 42 | #define errExit(msg) do { \ | 42 | #define errExit(msg) _errExit(__FILE__, __LINE__, __func__, msg) |
| 43 | char msgout[500]; \ | 43 | |
| 44 | snprintf(msgout, 500, "Error %s:%d: %s: %s", \ | 44 | static inline void __attribute__((noreturn)) |
| 45 | __FILE__, __LINE__, __func__, msg); \ | 45 | _errExit(const char *fname, int lineno, const char *func, const char *msg) { |
| 46 | perror(msgout); \ | 46 | char msgout[500]; |
| 47 | exit(1); \ | 47 | snprintf(msgout, 500, "Error %s:%d: %s: %s", fname, lineno, func, msg); |
| 48 | } while (0) | 48 | perror(msgout); |
| 49 | exit(1); | ||
| 50 | } | ||
| 49 | 51 | ||
| 50 | // macro to print ip addresses in a printf statement | 52 | // macro to print ip addresses in a printf statement |
| 51 | #define PRINT_IP(A) \ | 53 | #define PRINT_IP(A) \ |