From 995340074e554b4bf4a0fdb0cb7436692c5a4ffd Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Tue, 9 Aug 2022 14:35:15 +0200
Subject: tree-wide: use ASSERT_PTR more

---
 src/oom/oomd-manager-bus.c |  3 +--
 src/oom/oomd-manager.c     | 14 ++++----------
 2 files changed, 5 insertions(+), 12 deletions(-)

(limited to 'src/oom')

diff --git a/src/oom/oomd-manager-bus.c b/src/oom/oomd-manager-bus.c
index f4c196ee10..3a3308f0c4 100644
--- a/src/oom/oomd-manager-bus.c
+++ b/src/oom/oomd-manager-bus.c
@@ -13,11 +13,10 @@
 static int bus_method_dump_by_fd(sd_bus_message *message, void *userdata, sd_bus_error *error) {
         _cleanup_free_ char *dump = NULL;
         _cleanup_close_ int fd = -1;
-        Manager *m = userdata;
+        Manager *m = ASSERT_PTR(userdata);
         int r;
 
         assert(message);
-        assert(m);
 
         r = manager_get_dump_string(m, &dump);
         if (r < 0)
diff --git a/src/oom/oomd-manager.c b/src/oom/oomd-manager.c
index d9574fa97b..51bec79ba8 100644
--- a/src/oom/oomd-manager.c
+++ b/src/oom/oomd-manager.c
@@ -134,12 +134,10 @@ static int process_managed_oom_request(
                 JsonVariant *parameters,
                 VarlinkMethodFlags flags,
                 void *userdata) {
-        Manager *m = userdata;
+        Manager *m = ASSERT_PTR(userdata);
         uid_t uid;
         int r;
 
-        assert(m);
-
         r = varlink_get_peer_uid(link, &uid);
         if (r < 0)
                 return log_error_errno(r, "Failed to get varlink peer uid: %m");
@@ -153,12 +151,10 @@ static int process_managed_oom_reply(
                 const char *error_id,
                 VarlinkReplyFlags flags,
                 void *userdata) {
-        Manager *m = userdata;
+        Manager *m = ASSERT_PTR(userdata);
         uid_t uid;
         int r;
 
-        assert(m);
-
         if (error_id) {
                 r = -EIO;
                 log_debug("Error getting ManagedOOM cgroups: %s", error_id);
@@ -346,12 +342,11 @@ static int acquire_managed_oom_connect(Manager *m) {
 }
 
 static int monitor_swap_contexts_handler(sd_event_source *s, uint64_t usec, void *userdata) {
-        Manager *m = userdata;
+        Manager *m = ASSERT_PTR(userdata);
         usec_t usec_now;
         int r;
 
         assert(s);
-        assert(userdata);
 
         /* Reset timer */
         r = sd_event_now(sd_event_source_get_event(s), CLOCK_MONOTONIC, &usec_now);
@@ -446,12 +441,11 @@ static int monitor_memory_pressure_contexts_handler(sd_event_source *s, uint64_t
         _unused_ _cleanup_(clear_candidate_hashmapp) Manager *clear_candidates = userdata;
         _cleanup_set_free_ Set *targets = NULL;
         bool in_post_action_delay = false;
-        Manager *m = userdata;
+        Manager *m = ASSERT_PTR(userdata);
         usec_t usec_now;
         int r;
 
         assert(s);
-        assert(userdata);
 
         /* Reset timer */
         r = sd_event_now(sd_event_source_get_event(s), CLOCK_MONOTONIC, &usec_now);
-- 
cgit v1.2.1