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/busctl/busctl-introspect.c | 3 +--
 src/busctl/busctl.c            | 7 ++-----
 2 files changed, 3 insertions(+), 7 deletions(-)

(limited to 'src/busctl')

diff --git a/src/busctl/busctl-introspect.c b/src/busctl/busctl-introspect.c
index 9fbe9ebb5e..6002af5b2a 100644
--- a/src/busctl/busctl-introspect.c
+++ b/src/busctl/busctl-introspect.c
@@ -178,11 +178,10 @@ static int parse_xml_node(Context *context, const char *prefix, unsigned n_depth
         } state = STATE_NODE;
 
         _cleanup_free_ char *node_path = NULL, *argument_type = NULL, *argument_direction = NULL;
-        const char *np = prefix;
+        const char *np = ASSERT_PTR(prefix);
         int r;
 
         assert(context);
-        assert(prefix);
 
         if (n_depth > NODE_DEPTH_MAX)
                 return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "<node> depth too high.");
diff --git a/src/busctl/busctl.c b/src/busctl/busctl.c
index a6dbf0ddb5..90e42a21da 100644
--- a/src/busctl/busctl.c
+++ b/src/busctl/busctl.c
@@ -417,11 +417,9 @@ static void print_tree(char **l) {
 }
 
 static int on_path(const char *path, void *userdata) {
-        Set *paths = userdata;
+        Set *paths = ASSERT_PTR(userdata);
         int r;
 
-        assert(paths);
-
         r = set_put_strdup(&paths, path);
         if (r < 0)
                 return log_oom();
@@ -796,11 +794,10 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(Set*, member_set_free);
 
 static int on_interface(const char *interface, uint64_t flags, void *userdata) {
         _cleanup_(member_freep) Member *m = NULL;
-        Set *members = userdata;
+        Set *members = ASSERT_PTR(userdata);
         int r;
 
         assert(interface);
-        assert(members);
 
         m = new(Member, 1);
         if (!m)
-- 
cgit v1.2.1