summaryrefslogtreecommitdiff
path: root/src/oom
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/oom
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/oom')
-rw-r--r--src/oom/oomd-manager.c2
-rw-r--r--src/oom/oomd.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/oom/oomd-manager.c b/src/oom/oomd-manager.c
index 4d7c28fe8e..1f38f7eac1 100644
--- a/src/oom/oomd-manager.c
+++ b/src/oom/oomd-manager.c
@@ -387,7 +387,7 @@ static void clear_candidate_hashmapp(Manager **m) {
static int monitor_memory_pressure_contexts_handler(sd_event_source *s, uint64_t usec, void *userdata) {
/* Don't want to use stale candidate data. Setting this will clear the candidate hashmap on return unless we
* update the candidate data (in which case clear_candidates will be NULL). */
- _cleanup_(clear_candidate_hashmapp) Manager *clear_candidates = userdata;
+ _unused_ _cleanup_(clear_candidate_hashmapp) Manager *clear_candidates = userdata;
_cleanup_set_free_ Set *targets = NULL;
bool in_post_action_delay = false;
Manager *m = userdata;
diff --git a/src/oom/oomd.c b/src/oom/oomd.c
index 5b50833df7..abc96a0587 100644
--- a/src/oom/oomd.c
+++ b/src/oom/oomd.c
@@ -116,7 +116,7 @@ static int parse_argv(int argc, char *argv[]) {
}
static int run(int argc, char *argv[]) {
- _cleanup_(notify_on_cleanup) const char *notify_msg = NULL;
+ _unused_ _cleanup_(notify_on_cleanup) const char *notify_msg = NULL;
_cleanup_(manager_freep) Manager *m = NULL;
_cleanup_free_ char *swap = NULL;
unsigned long long s = 0;