tree-wide: use nested ASSERT_PTR

diff --git a/src/core/job.c b/src/core/job.c
index 33ac89dd57de0b1327a667495a9feccf80e13d94..419fe54bf0c84b8f1a15462805e9e94bb6844d3b 100644 (file)
--- a/src/core/job.c
+++ b/src/core/job.c
@@ -1373,13 +1373,9 @@ void job_shutdown_magic(Job *j) {
 
 int job_get_timeout(Job *j, usec_t *timeout) {
         usec_t x = USEC_INFINITY, y = USEC_INFINITY;
-        Unit *u;
+        Unit *u = ASSERT_PTR(ASSERT_PTR(j)->unit);
         int r;
 
-        assert(j);
-
-        u = ASSERT_PTR(j->unit);
-
         if (j->timer_event_source) {
                 r = sd_event_source_get_time(j->timer_event_source, &x);
                 if (r < 0)

diff --git a/src/core/unit.c b/src/core/unit.c
index 89cbb7d69363485b5b753ccf8c4878e0d802d979..d181d03b7a0a7dd434be92a1a7e3b686221b0546 100644 (file)
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -1448,11 +1448,7 @@ int unit_load_fragment_and_dropin(Unit *u, bool fragment_required) {
 }
 
 void unit_add_to_target_deps_queue(Unit *u) {
-        Manager *m;
-
-        assert(u);
-
-        m = ASSERT_PTR(u->manager);
+        Manager *m = ASSERT_PTR(ASSERT_PTR(u)->manager);
 
         if (u->in_target_deps_queue)
                 return;

diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c
index 68d13b795a7283cd9bf0ea167296d51fc10a7ac5..c740b22057b96682e822c998d7e3a49d8c361931 100644 (file)
--- a/src/socket-proxy/socket-proxyd.c
+++ b/src/socket-proxy/socket-proxyd.c
@@ -95,13 +95,9 @@ static int idle_time_cb(sd_event_source *s, uint64_t usec, void *userdata) {
 }
 
 static int connection_release(Connection *c) {
-        Context *context;
+        Context *context = ASSERT_PTR(ASSERT_PTR(c)->context);
         int r;
 
-        assert(c);
-
-        context = ASSERT_PTR(c->context);
-
         connection_free(c);
 
         if (arg_exit_idle_time < USEC_INFINITY && set_isempty(context->connections)) {

diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
index 2bba5f52299b43ee90331ae4a49d498ebd7939dc..7bff3115439a1706a45b9428610d5139b0f6b193 100644 (file)
--- a/src/udev/udev-event.c
+++ b/src/udev/udev-event.c
@@ -241,16 +241,12 @@ static ssize_t udev_event_subst_format(
                 size_t l,
                 bool *ret_truncated) {
 
-        sd_device *parent, *dev;
+        sd_device *parent, *dev = ASSERT_PTR(ASSERT_PTR(event)->dev);
         const char *val = NULL;
         bool truncated = false;
         char *s = dest;
         int r;
 
-        assert(event);
-
-        dev = ASSERT_PTR(event->dev);
-
         switch (type) {
         case FORMAT_SUBST_DEVPATH:
                 r = sd_device_get_devpath(dev, &val);
@@ -942,13 +938,9 @@ static int rename_netif(UdevEvent *event) {
 }
 
 static int update_devnode(UdevEvent *event) {
-        sd_device *dev;
+        sd_device *dev = ASSERT_PTR(ASSERT_PTR(event)->dev);
         int r;
 
-        assert(event);
-
-        dev = ASSERT_PTR(event->dev);
-
         r = sd_device_get_devnum(dev, NULL);
         if (r == -ENOENT)
                 return 0;
@@ -990,13 +982,9 @@ static int event_execute_rules_on_remove(
                 Hashmap *properties_list,
                 UdevRules *rules) {
 
-        sd_device *dev;
+        sd_device *dev = ASSERT_PTR(ASSERT_PTR(event)->dev);
         int r;
 
-        assert(event);
-
-        dev = ASSERT_PTR(event->dev);
-
         r = device_read_db_internal(dev, true);
         if (r < 0)
                 log_device_debug_errno(dev, r, "Failed to read database under /run/udev/data/: %m");