commit a1b77fd589dbe7284c17b029f251426a724abd47
author Kumar Gala <kumar.gala@linaro.org> Wed May 27 11:26:57 2020 -0500
committer Kumar Gala <kumar.gala@gmail.com> Mon Jun 08 08:23:57 2020 -0500
tree c38eb4434f8eeb6273e82edd13a3271e85dcab76
parent ee6fa31af67f8a45d59e31a72017f297e142bd54

zephyr: replace zephyr integer types with C99 types

	git grep -l 'u\(8\|16\|32\|64\)_t' | \
		xargs sed -i "s/u\(8\|16\|32\|64\)_t/uint\1_t/g"
	git grep -l 's\(8\|16\|32\|64\)_t' | \
		xargs sed -i "s/s\(8\|16\|32\|64\)_t/int\1_t/g"

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>

lib/os/json.c

diff --git a/lib/os/json.c b/lib/os/json.c
index 8e03a00..22808ca 100644
--- a/lib/os/json.c
+++ b/lib/os/json.c
@@ -388,7 +388,7 @@
 	return element_token(value->type);
 }
 
-static int decode_num(const struct token *token, s32_t *num)
+static int decode_num(const struct token *token, int32_t *num)
 {
 	/* FIXME: strtod() is not available in newlib/minimal libc,
 	 * so using strtol() here.
@@ -457,7 +457,7 @@
 		return 0;
 	}
 	case JSON_TOK_NUMBER: {
-		s32_t *num = field;
+		int32_t *num = field;
 
 		return decode_num(value, num);
 	}
@@ -478,7 +478,7 @@
 {
 	switch (descr->type) {
 	case JSON_TOK_NUMBER:
-		return sizeof(s32_t);
+		return sizeof(int32_t);
 	case JSON_TOK_STRING:
 		return sizeof(char *);
 	case JSON_TOK_TRUE:
@@ -540,7 +540,7 @@
 		     size_t descr_len, void *val)
 {
 	struct json_obj_key_value kv;
-	s32_t decoded_fields = 0;
+	int32_t decoded_fields = 0;
 	size_t i;
 	int ret;
 
@@ -773,10 +773,10 @@
 	return ret;
 }
 
-static int num_encode(const s32_t *num, json_append_bytes_t append_bytes,
+static int num_encode(const int32_t *num, json_append_bytes_t append_bytes,
 		      void *data)
 {
-	char buf[3 * sizeof(s32_t)];
+	char buf[3 * sizeof(int32_t)];
 	int ret;
 
 	ret = snprintk(buf, sizeof(buf), "%d", *num);