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/core/core-varlink.c | |
| parent | 6d64cb0625691e2b9eda8babe07ac8281f9467ee (diff) | |
| download | systemd-995340074e554b4bf4a0fdb0cb7436692c5a4ffd.tar.gz | |
tree-wide: use ASSERT_PTR more
Diffstat (limited to 'src/core/core-varlink.c')
| -rw-r--r-- | src/core/core-varlink.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/core/core-varlink.c b/src/core/core-varlink.c index 40cfd0cc7a..1fdcf885b8 100644 --- a/src/core/core-varlink.c +++ b/src/core/core-varlink.c @@ -202,11 +202,10 @@ static int vl_method_subscribe_managed_oom_cgroups( void *userdata) { _cleanup_(json_variant_unrefp) JsonVariant *v = NULL; - Manager *m = userdata; + Manager *m = ASSERT_PTR(userdata); int r; assert(link); - assert(m); if (json_variant_elements(parameters) > 0) return varlink_error_invalid_parameter(link, parameters); @@ -261,12 +260,11 @@ static int vl_method_get_user_record(Varlink *link, JsonVariant *parameters, Var }; _cleanup_free_ char *found_name = NULL; uid_t found_uid = UID_INVALID, uid; - Manager *m = userdata; + Manager *m = ASSERT_PTR(userdata); const char *un; int r; assert(parameters); - assert(m); r = json_dispatch(parameters, dispatch_table, NULL, 0, &p); if (r < 0) @@ -369,12 +367,11 @@ static int vl_method_get_group_record(Varlink *link, JsonVariant *parameters, Va }; _cleanup_free_ char *found_name = NULL; uid_t found_gid = GID_INVALID, gid; - Manager *m = userdata; + Manager *m = ASSERT_PTR(userdata); const char *gn; int r; assert(parameters); - assert(m); r = json_dispatch(parameters, dispatch_table, NULL, 0, &p); if (r < 0) @@ -464,9 +461,8 @@ static int vl_method_get_memberships(Varlink *link, JsonVariant *parameters, Var } static void vl_disconnect(VarlinkServer *s, Varlink *link, void *userdata) { - Manager *m = userdata; + Manager *m = ASSERT_PTR(userdata); - assert(m); assert(s); assert(link); @@ -526,11 +522,9 @@ static int manager_varlink_init_system(Manager *m) { } static int vl_reply(Varlink *link, JsonVariant *parameters, const char *error_id, VarlinkReplyFlags flags, void *userdata) { - Manager *m = userdata; + Manager *m = ASSERT_PTR(userdata); int r; - assert(m); - if (error_id) log_debug("varlink systemd-oomd client error: %s", error_id); |