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/shared/json.c | |
parent | 6d64cb0625691e2b9eda8babe07ac8281f9467ee (diff) | |
download | systemd-995340074e554b4bf4a0fdb0cb7436692c5a4ffd.tar.gz |
tree-wide: use ASSERT_PTR more
Diffstat (limited to 'src/shared/json.c')
-rw-r--r-- | src/shared/json.c | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/src/shared/json.c b/src/shared/json.c index d541eb1036..44a1838a7d 100644 --- a/src/shared/json.c +++ b/src/shared/json.c @@ -4322,10 +4322,9 @@ int json_dispatch(JsonVariant *v, const JsonDispatch table[], JsonDispatchCallba } int json_dispatch_boolean(const char *name, JsonVariant *variant, JsonDispatchFlags flags, void *userdata) { - bool *b = userdata; + bool *b = ASSERT_PTR(userdata); assert(variant); - assert(b); if (!json_variant_is_boolean(variant)) return json_log(variant, flags, SYNTHETIC_ERRNO(EINVAL), "JSON field '%s' is not a boolean.", strna(name)); @@ -4335,10 +4334,9 @@ int json_dispatch_boolean(const char *name, JsonVariant *variant, JsonDispatchFl } int json_dispatch_tristate(const char *name, JsonVariant *variant, JsonDispatchFlags flags, void *userdata) { - int *b = userdata; + int *b = ASSERT_PTR(userdata); assert(variant); - assert(b); if (json_variant_is_null(variant)) { *b = -1; @@ -4353,10 +4351,9 @@ int json_dispatch_tristate(const char *name, JsonVariant *variant, JsonDispatchF } int json_dispatch_int64(const char *name, JsonVariant *variant, JsonDispatchFlags flags, void *userdata) { - int64_t *i = userdata; + int64_t *i = ASSERT_PTR(userdata); assert(variant); - assert(i); if (!json_variant_is_integer(variant)) return json_log(variant, flags, SYNTHETIC_ERRNO(EINVAL), "JSON field '%s' is not an integer.", strna(name)); @@ -4366,10 +4363,9 @@ int json_dispatch_int64(const char *name, JsonVariant *variant, JsonDispatchFlag } int json_dispatch_uint64(const char *name, JsonVariant *variant, JsonDispatchFlags flags, void *userdata) { - uint64_t *u = userdata; + uint64_t *u = ASSERT_PTR(userdata); assert(variant); - assert(u); if (!json_variant_is_unsigned(variant)) return json_log(variant, flags, SYNTHETIC_ERRNO(EINVAL), "JSON field '%s' is not an unsigned integer.", strna(name)); @@ -4379,10 +4375,9 @@ int json_dispatch_uint64(const char *name, JsonVariant *variant, JsonDispatchFla } int json_dispatch_uint32(const char *name, JsonVariant *variant, JsonDispatchFlags flags, void *userdata) { - uint32_t *u = userdata; + uint32_t *u = ASSERT_PTR(userdata); assert(variant); - assert(u); if (!json_variant_is_unsigned(variant)) return json_log(variant, flags, SYNTHETIC_ERRNO(EINVAL), "JSON field '%s' is not an unsigned integer.", strna(name)); @@ -4395,10 +4390,9 @@ int json_dispatch_uint32(const char *name, JsonVariant *variant, JsonDispatchFla } int json_dispatch_int32(const char *name, JsonVariant *variant, JsonDispatchFlags flags, void *userdata) { - int32_t *i = userdata; + int32_t *i = ASSERT_PTR(userdata); assert(variant); - assert(i); if (!json_variant_is_integer(variant)) return json_log(variant, flags, SYNTHETIC_ERRNO(EINVAL), "JSON field '%s' is not an integer.", strna(name)); @@ -4411,11 +4405,10 @@ int json_dispatch_int32(const char *name, JsonVariant *variant, JsonDispatchFlag } int json_dispatch_string(const char *name, JsonVariant *variant, JsonDispatchFlags flags, void *userdata) { - char **s = userdata; + char **s = ASSERT_PTR(userdata); int r; assert(variant); - assert(s); if (json_variant_is_null(variant)) { *s = mfree(*s); @@ -4436,10 +4429,9 @@ int json_dispatch_string(const char *name, JsonVariant *variant, JsonDispatchFla } int json_dispatch_const_string(const char *name, JsonVariant *variant, JsonDispatchFlags flags, void *userdata) { - const char **s = userdata; + const char **s = ASSERT_PTR(userdata); assert(variant); - assert(s); if (json_variant_is_null(variant)) { *s = NULL; @@ -4458,12 +4450,11 @@ int json_dispatch_const_string(const char *name, JsonVariant *variant, JsonDispa int json_dispatch_strv(const char *name, JsonVariant *variant, JsonDispatchFlags flags, void *userdata) { _cleanup_strv_free_ char **l = NULL; - char ***s = userdata; + char ***s = ASSERT_PTR(userdata); JsonVariant *e; int r; assert(variant); - assert(s); if (json_variant_is_null(variant)) { *s = strv_free(*s); |