diff options
| author |   Luca Boccassi <bluca@debian.org> | 2023-11-15 16:24:48 +0000 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2023-11-15 16:24:48 +0000 |
| commit | 83aa04b998f479ba623b9410e0bfda04c4a77b1f (patch) | |
| tree | 5147e23f629b486a85c7d480cde6fc85f8b7d797 | |
| parent | Merge pull request #30035 from keszybz/buid-sys-cleanups (diff) | |
| parent | sd-bus: don't treat invalid user/machine as a programming error (diff) | |
| download | systemd-83aa04b998f479ba623b9410e0bfda04c4a77b1f.tar.xz systemd-83aa04b998f479ba623b9410e0bfda04c4a77b1f.zip | |
Merge pull request #30033 from mrc0mmand/assert_return-tweaks
Dial back a couple of `assert_return()` uses
| -rw-r--r-- | src/libsystemd/sd-bus/sd-bus.c | 8 | ||||
| -rw-r--r-- | src/libsystemd/sd-journal/sd-journal.c | 3 | ||||
| -rw-r--r-- | src/mount/mount-tool.c | 3 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c index ced4466aa6f..4a0259f8bbd 100644 --- a/src/libsystemd/sd-bus/sd-bus.c +++ b/src/libsystemd/sd-bus/sd-bus.c @@ -1698,8 +1698,8 @@ _public_ int sd_bus_open_system_machine(sd_bus **ret, const char *user_and_machi r = user_and_machine_valid(user_and_machine); if (r < 0) return r; - - assert_return(r > 0, -EINVAL); + if (r == 0) + return -EINVAL; r = sd_bus_new(&b); if (r < 0) @@ -1734,8 +1734,8 @@ _public_ int sd_bus_open_user_machine(sd_bus **ret, const char *user_and_machine r = user_and_machine_valid(user_and_machine); if (r < 0) return r; - - assert_return(r > 0, -EINVAL); + if (r == 0) + return -EINVAL; r = sd_bus_new(&b); if (r < 0) diff --git a/src/libsystemd/sd-journal/sd-journal.c b/src/libsystemd/sd-journal/sd-journal.c index 73a65da7502..eb35b9d9c47 100644 --- a/src/libsystemd/sd-journal/sd-journal.c +++ b/src/libsystemd/sd-journal/sd-journal.c @@ -235,7 +235,8 @@ _public_ int sd_journal_add_match(sd_journal *j, const void *data, size_t size) if (size == 0) size = strlen(data); - assert_return(match_is_valid(data, size), -EINVAL); + if (!match_is_valid(data, size)) + return -EINVAL; /* level 0: AND term * level 1: OR terms diff --git a/src/mount/mount-tool.c b/src/mount/mount-tool.c index 5876e2ddb47..f626f07af63 100644 --- a/src/mount/mount-tool.c +++ b/src/mount/mount-tool.c @@ -975,7 +975,6 @@ static int stop_mounts( } static int umount_by_device(sd_bus *bus, sd_device *dev) { - _cleanup_(sd_device_unrefp) sd_device *d = NULL; _cleanup_strv_free_ char **list = NULL; const char *v; int r, ret = 0; @@ -983,7 +982,7 @@ static int umount_by_device(sd_bus *bus, sd_device *dev) { assert(bus); assert(dev); - if (sd_device_get_property_value(d, "SYSTEMD_MOUNT_WHERE", &v) >= 0) + if (sd_device_get_property_value(dev, "SYSTEMD_MOUNT_WHERE", &v) >= 0) ret = stop_mounts(bus, v); r = sd_device_get_devname(dev, &v); |