diff options
| author | Bo Yang <teboring@google.com> | 2019-06-13 00:24:46 +0000 |
|---|---|---|
| committer | root <Bo Yang> | 2019-06-13 00:28:19 +0000 |
| commit | c50e849ac256c9f0f1921b626a41769a0d194bfe (patch) | |
| tree | f54c0b95fcf5e4e5f03fbbf2b8f0830b6023586d /upb | |
| parent | 312c6b421a3c749e4f7c0e2193d4775cb997cff7 (diff) | |
Change int64 json encoding to be string
Diffstat (limited to 'upb')
| -rw-r--r-- | upb/json/printer.c | 33 |
1 files changed, 24 insertions, 9 deletions
diff --git a/upb/json/printer.c b/upb/json/printer.c index 37482a8..bf70d04 100644 --- a/upb/json/printer.c +++ b/upb/json/printer.c @@ -208,18 +208,30 @@ static size_t fmt_bool(bool val, char* buf, size_t length) { return n; } -static size_t fmt_int64(long val, char* buf, size_t length) { +static size_t fmt_int32(long val, char* buf, size_t length) { size_t n = _upb_snprintf(buf, length, "%ld", 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_uint32(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 val, char* buf, size_t length) { + size_t n = _upb_snprintf(buf, length, "\"%ld\"", val); + CHKLENGTH(n > 0 && n < length); + return n; +} + +static size_t fmt_uint64(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; +} + /* Print a map key given a field name. Called by scalar field handlers and by * startseq for repeated fields. */ static bool putkey(void *closure, const void *handler_data) { @@ -263,8 +275,11 @@ static bool putkey(void *closure, const void *handler_data) { static bool putmapkey_##type(void *closure, const void *handler_data, \ type val) { \ upb_json_printer *p = closure; \ + char data[64]; \ + size_t length = fmt_func(val, data, sizeof(data)); \ + UPB_UNUSED(handler_data); \ print_data(p, "\"", 1); \ - CHK(put##type(closure, handler_data, val)); \ + print_data(p, data, length); \ print_data(p, "\":", 2); \ return true; \ } @@ -272,17 +287,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_int64) -TYPE_HANDLERS(uint32_t, fmt_int64) +TYPE_HANDLERS(int32_t, fmt_int32) +TYPE_HANDLERS(uint32_t, fmt_int32) TYPE_HANDLERS(int64_t, fmt_int64) TYPE_HANDLERS(uint64_t, fmt_uint64) /* double and float are not allowed to be map keys. */ TYPE_HANDLERS_MAPKEY(bool, fmt_bool) -TYPE_HANDLERS_MAPKEY(int32_t, fmt_int64) -TYPE_HANDLERS_MAPKEY(uint32_t, fmt_int64) -TYPE_HANDLERS_MAPKEY(int64_t, fmt_int64) -TYPE_HANDLERS_MAPKEY(uint64_t, fmt_uint64) +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) #undef TYPE_HANDLERS #undef TYPE_HANDLERS_MAPKEY |