lib/json: Fix build warnings (-Wpointer-sign) with LLVM/icx
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:
parent
08a2c6019c
commit
7763a1dee9
2 changed files with 15 additions and 15 deletions
|
@ -24,9 +24,9 @@ struct token {
|
||||||
|
|
||||||
struct lexer {
|
struct lexer {
|
||||||
void *(*state)(struct lexer *lexer);
|
void *(*state)(struct lexer *lexer);
|
||||||
unsigned char *start;
|
char *start;
|
||||||
unsigned char *pos;
|
char *pos;
|
||||||
unsigned char *end;
|
char *end;
|
||||||
struct token token;
|
struct token token;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -76,7 +76,7 @@ static void emit(struct lexer *lexer, enum json_tokens token)
|
||||||
lexer->start = lexer->pos;
|
lexer->start = lexer->pos;
|
||||||
}
|
}
|
||||||
|
|
||||||
static unsigned char next(struct lexer *lexer)
|
static char next(struct lexer *lexer)
|
||||||
{
|
{
|
||||||
if (lexer->pos >= lexer->end) {
|
if (lexer->pos >= lexer->end) {
|
||||||
lexer->pos = lexer->end + 1;
|
lexer->pos = lexer->end + 1;
|
||||||
|
@ -97,9 +97,9 @@ static void backup(struct lexer *lexer)
|
||||||
lexer->pos--;
|
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);
|
backup(lexer);
|
||||||
|
|
||||||
|
@ -111,7 +111,7 @@ static void *lexer_string(struct lexer *lexer)
|
||||||
ignore(lexer);
|
ignore(lexer);
|
||||||
|
|
||||||
while (true) {
|
while (true) {
|
||||||
unsigned char chr = next(lexer);
|
char chr = next(lexer);
|
||||||
|
|
||||||
if (chr == '\0') {
|
if (chr == '\0') {
|
||||||
emit(lexer, JSON_TOK_ERROR);
|
emit(lexer, JSON_TOK_ERROR);
|
||||||
|
@ -216,7 +216,7 @@ static void *lexer_null(struct lexer *lexer)
|
||||||
static void *lexer_number(struct lexer *lexer)
|
static void *lexer_number(struct lexer *lexer)
|
||||||
{
|
{
|
||||||
while (true) {
|
while (true) {
|
||||||
unsigned char chr = next(lexer);
|
char chr = next(lexer);
|
||||||
|
|
||||||
if (isdigit(chr) || chr == '.') {
|
if (isdigit(chr) || chr == '.') {
|
||||||
continue;
|
continue;
|
||||||
|
@ -232,7 +232,7 @@ static void *lexer_number(struct lexer *lexer)
|
||||||
static void *lexer_json(struct lexer *lexer)
|
static void *lexer_json(struct lexer *lexer)
|
||||||
{
|
{
|
||||||
while (true) {
|
while (true) {
|
||||||
unsigned char chr = next(lexer);
|
char chr = next(lexer);
|
||||||
|
|
||||||
switch (chr) {
|
switch (chr) {
|
||||||
case '\0':
|
case '\0':
|
||||||
|
@ -596,7 +596,7 @@ int json_obj_parse(char *payload, size_t len,
|
||||||
return obj_parse(&obj, descr, descr_len, val);
|
return obj_parse(&obj, descr, descr_len, val);
|
||||||
}
|
}
|
||||||
|
|
||||||
static u8_t escape_as(u8_t chr)
|
static char escape_as(char chr)
|
||||||
{
|
{
|
||||||
switch (chr) {
|
switch (chr) {
|
||||||
case '"':
|
case '"':
|
||||||
|
@ -626,10 +626,10 @@ static int json_escape_internal(const char *str,
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
for (cur = str; ret == 0 && *cur; cur++) {
|
for (cur = str; ret == 0 && *cur; cur++) {
|
||||||
u8_t escaped = escape_as(*cur);
|
char escaped = escape_as(*cur);
|
||||||
|
|
||||||
if (escaped) {
|
if (escaped) {
|
||||||
u8_t bytes[2] = { '\\', escaped };
|
char bytes[2] = { '\\', escaped };
|
||||||
|
|
||||||
ret = append_bytes(bytes, 2, data);
|
ret = append_bytes(bytes, 2, data);
|
||||||
} else {
|
} else {
|
||||||
|
@ -864,7 +864,7 @@ struct appender {
|
||||||
size_t size;
|
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;
|
struct appender *appender = data;
|
||||||
|
|
||||||
|
@ -888,7 +888,7 @@ int json_obj_encode_buf(const struct json_obj_descr *descr, size_t descr_len,
|
||||||
&appender);
|
&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;
|
ssize_t *total = data;
|
||||||
|
|
||||||
|
|
|
@ -64,7 +64,7 @@ struct json_obj_descr {
|
||||||
* error (which will be propagated to the return value of
|
* error (which will be propagated to the return value of
|
||||||
* json_obj_encode()), or 0 on success.
|
* 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);
|
void *data);
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue