json: unicode chars don't need 64-bit ints

jeffpc · jeffpc · commit 5969ba59be16 · 2019-04-02T13:18:45.000+03:00
Signed-off-by: Josef 'Jeff' Sipek &lt;jeffpc@josefsipek.net&gt;
diff --git a/fmt_json.c b/fmt_json.c
@@ -50,15 +50,15 @@ int json_pack_int(struct buffer *buffer, int64_t v)
 	return json_pack_uint(buffer, v);
 }
 
-static int __escape_char(struct buffer *buffer, uint64_t c)
+static int __escape_char(struct buffer *buffer, uint32_t c)
 {
 	char tmp[7];
 
 	/* FIXME: char outside of basic multilingual plane */
 	if (c > 0xffff)
 		return -ENOTSUP;
 
-	snprintf(tmp, sizeof(tmp), "\\u%04"PRIX64, c);
+	snprintf(tmp, sizeof(tmp), "\\u%04X", c);
 
 	return buffer_append_cstr(buffer, tmp);
 }

Original file line number	Diff line number	Diff line change
`@@ -50,15 +50,15 @@ int json_pack_int(struct buffer *buffer, int64_t v)`
`50`	`50`	`return json_pack_uint(buffer, v);`
`51`	`51`	`}`
`52`	`52`
`53`		`-static int __escape_char(struct buffer *buffer, uint64_t c)`
	`53`	`+static int __escape_char(struct buffer *buffer, uint32_t c)`
`54`	`54`	`{`
`55`	`55`	`char tmp[7];`
`56`	`56`
`57`	`57`	`/* FIXME: char outside of basic multilingual plane */`
`58`	`58`	`if (c > 0xffff)`
`59`	`59`	`return -ENOTSUP;`
`60`	`60`
`61`		`- snprintf(tmp, sizeof(tmp), "\\u%04"PRIX64, c);`
	`61`	`+ snprintf(tmp, sizeof(tmp), "\\u%04X", c);`
`62`	`62`
`63`	`63`	`return buffer_append_cstr(buffer, tmp);`
`64`	`64`	`}`