admin/mlib
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify code by using more fscanf possibility

Browse Source
This commit is contained in:
Patrick Pelissier committed 2019-05-18 11:17:13 +02:00
1 parent 1cb1d16e77
commit 83da861a9c
1 file changed
+13 -20
Download Patch File Download Diff File Expand all files Collapse all files
m-serial-json.h
+13 -20
View File
@@ -186,8 +186,7 @@ static inline m_serial_return_code_t m_serial_json_read_map_next(m_serial_read_
static inline m_serial_return_code_t static inline m_serial_return_code_t
m_serial_json_read_tuple_start(m_serial_read_t serial){ m_serial_json_read_tuple_start(m_serial_read_t serial){
FILE *f = (FILE*) serial->data[0]; FILE *f = (FILE*) serial->data[0];
int c = m_serial_json_read_skip(f); return fscanf(f, " {") == 0 ? M_SERIAL_OK_CONTINUE : M_SERIAL_FAIL;
return (c != '{') ? M_SERIAL_FAIL : M_SERIAL_OK_CONTINUE;
} }
static inline m_serial_return_code_t static inline m_serial_return_code_t
@@ -198,28 +197,22 @@ m_serial_json_read_tuple_id(m_serial_read_t serial, const char *const field_name
if (c == ',') { if (c == ',') {
// If first call of read_tuple_id, it is a failure // If first call of read_tuple_id, it is a failure
if (*id == -1) return M_SERIAL_FAIL; if (*id == -1) return M_SERIAL_FAIL;
c = m_serial_json_read_skip(f); } else {
// c should be \" but let fscanf parse it.
ungetc(c, f);
} }
if (c != '"') return M_SERIAL_FAIL;
/* Read the field in the JSON */ /* Read the field in the JSON */
char field[M_MAX_IDENTIFIER_LENGTH]; char field[M_MAX_IDENTIFIER_LENGTH+1];
int n = 0; if (fscanf(f, " \"%" M_APPLY(M_AS_STR, M_MAX_IDENTIFIER_LENGTH) "[^ \t\n\"]\":", field) != 1)
do { return M_SERIAL_FAIL;
c =fgetc(f);
field[n++] = c;
} while (n < M_MAX_IDENTIFIER_LENGTH && c != EOF && c != '\"');
field[--n] = 0;
if (c != '"') return M_SERIAL_FAIL;
c =fgetc(f);
if (c != ':') return M_SERIAL_FAIL;
/* Search for field in field_name */ /* Search for field in field_name */
for(n = 0; n < max; n++) { for(int n = 0; n < max; n++) {
if (strcmp(field, field_name[n]) == 0) if (strcmp(field, field_name[n]) == 0) {
break; *id = n;
return M_SERIAL_OK_CONTINUE;
}
} }
if (n == max) return M_SERIAL_FAIL; return M_SERIAL_FAIL;
*id = n;
return M_SERIAL_OK_CONTINUE;
} }
static inline m_serial_return_code_t m_serial_json_read_variant_start(m_serial_read_t serial, const char *const field_name[], const int max, int*id){ return M_SERIAL_FAIL; } static inline m_serial_return_code_t m_serial_json_read_variant_start(m_serial_read_t serial, const char *const field_name[], const int max, int*id){ return M_SERIAL_FAIL; }