diff options
author | David Tardon <dtardon@redhat.com> | 2022-09-09 10:19:29 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2022-09-14 08:21:42 +0200 |
commit | fbd747a46f66f2eb312d099ba23692659cc051ab (patch) | |
tree | 6bb136f88a4e948c8d1457af5849a2535edfbd56 /src | |
parent | 23cd0025621c17d9007c2e912bd5745a8986d260 (diff) | |
download | systemd-fbd747a46f66f2eb312d099ba23692659cc051ab.tar.gz |
tree-wide: use nested ASSERT_PTR
Diffstat (limited to 'src')
-rw-r--r-- | src/core/job.c | 6 | ||||
-rw-r--r-- | src/core/unit.c | 6 | ||||
-rw-r--r-- | src/socket-proxy/socket-proxyd.c | 6 | ||||
-rw-r--r-- | src/udev/udev-event.c | 18 |
4 files changed, 6 insertions, 30 deletions
diff --git a/src/core/job.c b/src/core/job.c index 33ac89dd57..419fe54bf0 100644 --- 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 89cbb7d693..d181d03b7a 100644 --- 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 68d13b795a..c740b22057 100644 --- 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 2bba5f5229..7bff311543 100644 --- 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"); |