diff options
| author | Bo Yang <teboring@google.com> | 2019-06-14 21:59:49 +0000 |
|---|---|---|
| committer | Bo Yang <teboring@google.com> | 2019-06-14 21:59:49 +0000 |
| commit | a6347ec35e95453c72b05624606e252672bea5ee (patch) | |
| tree | dadc1e912b0957f6a42694130a5fa98e4f04fa03 /upb | |
| parent | 8e5f03f719d923331ad87661a139545cb6660fd5 (diff) | |
Change methods name to specify as number/string
Diffstat (limited to 'upb')
| -rw-r--r-- | upb/json/printer.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/upb/json/printer.c b/upb/json/printer.c index 1bc6498..90705a7 100644 --- a/upb/json/printer.c +++ b/upb/json/printer.c @@ -208,25 +208,27 @@ static size_t fmt_bool(bool val, char* buf, size_t length) { return n; } -static size_t fmt_int32(long long val, char* buf, size_t length) { +static size_t fmt_int64_as_number(long long val, char* buf, size_t length) { size_t n = _upb_snprintf(buf, length, "%lld", val); CHKLENGTH(n > 0 && n < length); return n; } -static size_t fmt_uint32(unsigned long long val, char* buf, size_t length) { +static size_t fmt_uint64_as_number( + unsigned long long val, char* buf, size_t length) { size_t n = _upb_snprintf(buf, length, "%llu", val); CHKLENGTH(n > 0 && n < length); return n; } -static size_t fmt_int64(long long val, char* buf, size_t length) { +static size_t fmt_int64_as_string(long long val, char* buf, size_t length) { size_t n = _upb_snprintf(buf, length, "\"%lld\"", val); CHKLENGTH(n > 0 && n < length); return n; } -static size_t fmt_uint64(unsigned long long val, char* buf, size_t length) { +static size_t fmt_uint64_as_string( + unsigned long long val, char* buf, size_t length) { size_t n = _upb_snprintf(buf, length, "\"%llu\"", val); CHKLENGTH(n > 0 && n < length); return n; @@ -287,17 +289,17 @@ static bool putkey(void *closure, const void *handler_data) { TYPE_HANDLERS(double, fmt_double) TYPE_HANDLERS(float, fmt_float) TYPE_HANDLERS(bool, fmt_bool) -TYPE_HANDLERS(int32_t, fmt_int32) -TYPE_HANDLERS(uint32_t, fmt_int32) -TYPE_HANDLERS(int64_t, fmt_int64) -TYPE_HANDLERS(uint64_t, fmt_uint64) +TYPE_HANDLERS(int32_t, fmt_int64_as_number) +TYPE_HANDLERS(uint32_t, fmt_int64_as_number) +TYPE_HANDLERS(int64_t, fmt_int64_as_string) +TYPE_HANDLERS(uint64_t, fmt_uint64_as_string) /* double and float are not allowed to be map keys. */ TYPE_HANDLERS_MAPKEY(bool, fmt_bool) -TYPE_HANDLERS_MAPKEY(int32_t, fmt_int32) -TYPE_HANDLERS_MAPKEY(uint32_t, fmt_int32) -TYPE_HANDLERS_MAPKEY(int64_t, fmt_int32) -TYPE_HANDLERS_MAPKEY(uint64_t, fmt_uint32) +TYPE_HANDLERS_MAPKEY(int32_t, fmt_int64_as_number) +TYPE_HANDLERS_MAPKEY(uint32_t, fmt_int64_as_number) +TYPE_HANDLERS_MAPKEY(int64_t, fmt_int64_as_number) +TYPE_HANDLERS_MAPKEY(uint64_t, fmt_uint64_as_number) #undef TYPE_HANDLERS #undef TYPE_HANDLERS_MAPKEY |