diff options
| author | Anita Zhang <the.anitazha@gmail.com> | 2021-02-25 18:38:54 -0800 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@gmail.com> | 2021-02-26 10:14:03 +0000 |
| commit | 7c382f0b7d706606b1b306f4776c7236fbda089d (patch) | |
| tree | 9af7126ff04b267b7f2123918ecb8f7e9b2b50e6 /src/shared/json.h | |
| parent | fa1ca5f4094c6461122fd5c8b7a820f538c92543 (diff) | |
| download | systemd-7c382f0b7d706606b1b306f4776c7236fbda089d.tar.gz | |
json: rename json_dispatch_{integer,unsigned} -> json_dispatch_{intmax,uintmax}
Prompted by https://bugzilla.redhat.com/show_bug.cgi?id=1930875 in which
I had previously used json_dispatch_unsigned and passed a return variable of
type unsigned when json_dispatch_unsigned writes a uintmax_t.
Diffstat (limited to 'src/shared/json.h')
| -rw-r--r-- | src/shared/json.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/shared/json.h b/src/shared/json.h index d429066761..d14740db88 100644 --- a/src/shared/json.h +++ b/src/shared/json.h @@ -293,8 +293,8 @@ int json_dispatch_strv(const char *name, JsonVariant *variant, JsonDispatchFlags int json_dispatch_boolean(const char *name, JsonVariant *variant, JsonDispatchFlags flags, void *userdata); int json_dispatch_tristate(const char *name, JsonVariant *variant, JsonDispatchFlags flags, void *userdata); int json_dispatch_variant(const char *name, JsonVariant *variant, JsonDispatchFlags flags, void *userdata); -int json_dispatch_integer(const char *name, JsonVariant *variant, JsonDispatchFlags flags, void *userdata); -int json_dispatch_unsigned(const char *name, JsonVariant *variant, JsonDispatchFlags flags, void *userdata); +int json_dispatch_intmax(const char *name, JsonVariant *variant, JsonDispatchFlags flags, void *userdata); +int json_dispatch_uintmax(const char *name, JsonVariant *variant, JsonDispatchFlags flags, void *userdata); int json_dispatch_uint32(const char *name, JsonVariant *variant, JsonDispatchFlags flags, void *userdata); int json_dispatch_int32(const char *name, JsonVariant *variant, JsonDispatchFlags flags, void *userdata); int json_dispatch_uid_gid(const char *name, JsonVariant *variant, JsonDispatchFlags flags, void *userdata); @@ -303,10 +303,10 @@ int json_dispatch_id128(const char *name, JsonVariant *variant, JsonDispatchFlag int json_dispatch_unsupported(const char *name, JsonVariant *variant, JsonDispatchFlags flags, void *userdata); assert_cc(sizeof(uintmax_t) == sizeof(uint64_t)); -#define json_dispatch_uint64 json_dispatch_unsigned +#define json_dispatch_uint64 json_dispatch_uintmax assert_cc(sizeof(intmax_t) == sizeof(int64_t)); -#define json_dispatch_int64 json_dispatch_integer +#define json_dispatch_int64 json_dispatch_intmax assert_cc(sizeof(uint32_t) == sizeof(unsigned)); #define json_dispatch_uint json_dispatch_uint32 |