diff options
| -rw-r--r-- | src/shared/cgroup-util.c | 1 | ||||
| -rw-r--r-- | src/shared/util.h | 2 | ||||
| -rw-r--r-- | src/test/test-util.c | 11 |
3 files changed, 12 insertions, 2 deletions
diff --git a/src/shared/cgroup-util.c b/src/shared/cgroup-util.c index b79a24a495..46a8128eb4 100644 --- a/src/shared/cgroup-util.c +++ b/src/shared/cgroup-util.c @@ -1208,7 +1208,6 @@ int cg_pid_get_path_shifted(pid_t pid, char **root, char **cgroup) { } int cg_path_decode_unit(const char *cgroup, char **unit){ - _cleanup_free_ char *unescaped = NULL; char *p, *e, *c, *s, *k; assert(cgroup); diff --git a/src/shared/util.h b/src/shared/util.h index 68e87da7cd..e3fc876857 100644 --- a/src/shared/util.h +++ b/src/shared/util.h @@ -644,7 +644,7 @@ static inline void _reset_errno_(int *saved_errno) { errno = *saved_errno; } -#define PROTECT_ERRNO _cleanup_(_reset_errno_) int _saved_errno_ = errno +#define PROTECT_ERRNO _cleanup_(_reset_errno_) __attribute__((unused)) int _saved_errno_ = errno struct _umask_struct_ { mode_t mask; diff --git a/src/test/test-util.c b/src/test/test-util.c index 66a10ead46..4c3a8a6b88 100644 --- a/src/test/test-util.c +++ b/src/test/test-util.c @@ -24,6 +24,7 @@ #include <unistd.h> #include <fcntl.h> #include <locale.h> +#include <errno.h> #include "util.h" @@ -429,6 +430,15 @@ static void test_get_process_comm(void) { log_info("pid1 $PATH: '%s'", strna(i)); } +static void test_protect_errno(void) { + errno = 12; + { + PROTECT_ERRNO; + errno = 11; + } + assert(errno == 12); +} + int main(int argc, char *argv[]) { test_streq_ptr(); test_first_word(); @@ -456,6 +466,7 @@ int main(int argc, char *argv[]) { test_hostname_is_valid(); test_u64log2(); test_get_process_comm(); + test_protect_errno(); return 0; } |