diff options
| author |   David Tardon <dtardon@redhat.com> | 2022-08-09 14:35:15 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2022-09-13 08:13:27 +0200 |
| commit | 995340074e554b4bf4a0fdb0cb7436692c5a4ffd (patch) | |
| tree | ca3ee001db3e608ee80478f42fea9c3b409f1b7b /src/xdg-autostart-generator/xdg-autostart-service.c | |
| parent | Merge pull request #23087 from yuwata/udev-watch (diff) | |
| download | systemd-995340074e554b4bf4a0fdb0cb7436692c5a4ffd.tar.xz systemd-995340074e554b4bf4a0fdb0cb7436692c5a4ffd.zip | |
tree-wide: use ASSERT_PTR more
Diffstat (limited to 'src/xdg-autostart-generator/xdg-autostart-service.c')
| -rw-r--r-- | src/xdg-autostart-generator/xdg-autostart-service.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/xdg-autostart-generator/xdg-autostart-service.c b/src/xdg-autostart-generator/xdg-autostart-service.c index 0c14b6ea655..75b6a62a975 100644 --- a/src/xdg-autostart-generator/xdg-autostart-service.c +++ b/src/xdg-autostart-generator/xdg-autostart-service.c @@ -73,12 +73,11 @@ static int xdg_config_parse_bool( void *data, void *userdata) { - bool *b = data; + bool *b = ASSERT_PTR(data); assert(filename); assert(lvalue); assert(rvalue); - assert(data); if (streq(rvalue, "true")) *b = true; @@ -157,13 +156,12 @@ static int xdg_config_parse_string( void *userdata) { _cleanup_free_ char *res = NULL; - char **out = data; + char **out = ASSERT_PTR(data); int r; assert(filename); assert(lvalue); assert(rvalue); - assert(data); /* XDG does not allow duplicate definitions. */ if (*out) { @@ -228,13 +226,12 @@ static int xdg_config_parse_strv( void *data, void *userdata) { - char ***ret_sv = data; + char ***ret_sv = ASSERT_PTR(data); int r; assert(filename); assert(lvalue); assert(rvalue); - assert(data); /* XDG does not allow duplicate definitions. */ if (*ret_sv) { |