summaryrefslogtreecommitdiff
path: root/src/basic
diff options
context:
space:
mode:
authorFrantisek Sumsal <frantisek@sumsal.cz>2021-09-15 10:56:21 +0200
committerFrantisek Sumsal <frantisek@sumsal.cz>2021-09-15 13:09:45 +0200
commitd7ac09520be8f0d3d94df3dd4fd8a6e7404c0174 (patch)
tree834a60f9b7b22957ff572bcd979737992a0e7ae7 /src/basic
parentbd8ea741a424cc730ce88cf62af0046cc33d5249 (diff)
downloadsystemd-d7ac09520be8f0d3d94df3dd4fd8a6e7404c0174.tar.gz
tree-wide: mark set-but-not-used variables as unused to make LLVM happy
LLVM 13 introduced `-Wunused-but-set-variable` diagnostic flag, which trips over some intentionally set-but-not-used variables or variables attached to cleanup handlers with side effects (`_cleanup_umask_`, `_cleanup_(notify_on_cleanup)`, `_cleanup_(restore_sigsetp)`, etc.): ``` ../src/basic/process-util.c:1257:46: error: variable 'saved_ssp' set but not used [-Werror,-Wunused-but-set-variable] _cleanup_(restore_sigsetp) sigset_t *saved_ssp = NULL; ^ 1 error generated. ```
Diffstat (limited to 'src/basic')
-rw-r--r--src/basic/process-util.c2
-rw-r--r--src/basic/unit-file.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/basic/process-util.c b/src/basic/process-util.c
index ecb14306f8..5855ac3d57 100644
--- a/src/basic/process-util.c
+++ b/src/basic/process-util.c
@@ -1254,7 +1254,7 @@ int safe_fork_full(
pid_t original_pid, pid;
sigset_t saved_ss, ss;
- _cleanup_(restore_sigsetp) sigset_t *saved_ssp = NULL;
+ _unused_ _cleanup_(restore_sigsetp) sigset_t *saved_ssp = NULL;
bool block_signals = false, block_all = false;
int prio, r;
diff --git a/src/basic/unit-file.c b/src/basic/unit-file.c
index 884a0674a9..618cf8b489 100644
--- a/src/basic/unit-file.c
+++ b/src/basic/unit-file.c
@@ -286,7 +286,8 @@ int unit_file_build_name_map(
FOREACH_DIRENT(de, d, log_warning_errno(errno, "Failed to read \"%s\", ignoring: %m", *dir)) {
char *filename;
- _cleanup_free_ char *_filename_free = NULL, *simplified = NULL;
+ _unused_ _cleanup_free_ char *_filename_free = NULL;
+ _cleanup_free_ char *simplified = NULL;
const char *suffix, *dst = NULL;
bool valid_unit_name;