michaelh/zephyr
1
0
Fork 0
Code Releases Activity

lib/json: Fix build warnings (-Wpointer-sign) with LLVM/icx

Browse source 
Move all characters to "char" type: no implicit conversions between
"unsigned char", "u8_t", etc.

Tested with ISSM 2016.2.085.

Jira: ZEP-2159
Signed-off-by: Leandro Pereira <leandro.pereira@intel.com>
This commit is contained in:
Leandro Pereira 2017-06-05 17:01:01 -07:00 • committed by Anas Nashif
commit 7763a1dee9
2 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

28
lib/json/json.c
View file

@ -24,9 +24,9 @@ struct token {
struct lexer {
void *(*state)(struct lexer *lexer);
unsigned char *start;
unsigned char *pos;
unsigned char *end;
char *start;
char *pos;
char *end;
struct token token;
};
@ -76,7 +76,7 @@ static void emit(struct lexer *lexer, enum json_tokens token)
lexer->start = lexer->pos;
}
static unsigned char next(struct lexer *lexer)
static char next(struct lexer *lexer)
{
if (lexer->pos >= lexer->end) {
lexer->pos = lexer->end + 1;
@ -97,9 +97,9 @@ static void backup(struct lexer *lexer)
lexer->pos--;
}
static unsigned char peek(struct lexer *lexer)
static char peek(struct lexer *lexer)
{
unsigned char chr = next(lexer);
char chr = next(lexer);
backup(lexer);
@ -111,7 +111,7 @@ static void *lexer_string(struct lexer *lexer)
ignore(lexer);
while (true) {
unsigned char chr = next(lexer);
char chr = next(lexer);
if (chr == '\0') {
emit(lexer, JSON_TOK_ERROR);
@ -216,7 +216,7 @@ static void *lexer_null(struct lexer *lexer)
static void *lexer_number(struct lexer *lexer)
{
while (true) {
unsigned char chr = next(lexer);
char chr = next(lexer);
if (isdigit(chr) || chr == '.') {
continue;
@ -232,7 +232,7 @@ static void *lexer_number(struct lexer *lexer)
static void *lexer_json(struct lexer *lexer)
{
while (true) {
unsigned char chr = next(lexer);
char chr = next(lexer);
switch (chr) {
case '\0':
@ -596,7 +596,7 @@ int json_obj_parse(char *payload, size_t len,
return obj_parse(&obj, descr, descr_len, val);
}
static u8_t escape_as(u8_t chr)
static char escape_as(char chr)
{
switch (chr) {
case '"':
@ -626,10 +626,10 @@ static int json_escape_internal(const char *str,
int ret = 0;
for (cur = str; ret == 0 && *cur; cur++) {
u8_t escaped = escape_as(*cur);
char escaped = escape_as(*cur);
if (escaped) {
u8_t bytes[2] = { '\\', escaped };
char bytes[2] = { '\\', escaped };
ret = append_bytes(bytes, 2, data);
} else {
@ -864,7 +864,7 @@ struct appender {
size_t size;
};
static int append_bytes_to_buf(const u8_t *bytes, size_t len, void *data)
static int append_bytes_to_buf(const char *bytes, size_t len, void *data)
{
struct appender *appender = data;
@ -888,7 +888,7 @@ int json_obj_encode_buf(const struct json_obj_descr *descr, size_t descr_len,
&appender);
}
static int measure_bytes(const u8_t *bytes, size_t len, void *data)
static int measure_bytes(const char *bytes, size_t len, void *data)
{
ssize_t *total = data;

2
lib/json/json.h
View file

@ -64,7 +64,7 @@ struct json_obj_descr {
* error (which will be propagated to the return value of
* json_obj_encode()), or 0 on success.
*/
typedef int (*json_append_bytes_t)(const u8_t *bytes, size_t len,
typedef int (*json_append_bytes_t)(const char *bytes, size_t len,
void *data);