Rename user customizable macros

to be compliant with other
and clearer that they can be customized.
This commit is contained in:
Patrick Pelissier committed 2021-02-20 00:10:26 +01:00
1 parent 6cc972bab2
commit 165ec09061
6 files changed
+36 -36

No files matched your search

+6 -6
View File
@@ -473,9 +473,9 @@ m_serial_json_read_tuple_id(m_serial_local_t local, m_serial_read_t serial, cons
}
/* Read the field in the JSON */
c = -1;
char field[M_MAX_IDENTIFIER_LENGTH+1];
int nn = m_core_fscanf(f, " \"%" M_AS_STR(M_MAX_IDENTIFIER_LENGTH) "[^ \t\n\"]\":%n",
m_core_arg_size(field, M_MAX_IDENTIFIER_LENGTH+1), &c);
char field[M_USE_IDENTIFIER_ALLOC+1];
int nn = m_core_fscanf(f, " \"%" M_AS_STR(M_USE_IDENTIFIER_ALLOC) "[^ \t\n\"]\":%n",
m_core_arg_size(field, M_USE_IDENTIFIER_ALLOC+1), &c);
(void) nn ; // Unused. Check is done through 'c' (more robust).
if (c <= 0)
return m_core_serial_fail();
@@ -509,9 +509,9 @@ m_serial_json_read_variant_start(m_serial_local_t local, m_serial_read_t serial,
if (final2 > 0) return M_SERIAL_OK_DONE;
/* Read the field in the JSON */
char field[M_MAX_IDENTIFIER_LENGTH+1];
nn = m_core_fscanf(f, " \"%" M_AS_STR(M_MAX_IDENTIFIER_LENGTH) "[^ \t\n\"]\":%n",
m_core_arg_size(field, M_MAX_IDENTIFIER_LENGTH+1), &final2);
char field[M_USE_IDENTIFIER_ALLOC+1];
nn = m_core_fscanf(f, " \"%" M_AS_STR(M_USE_IDENTIFIER_ALLOC) "[^ \t\n\"]\":%n",
m_core_arg_size(field, M_USE_IDENTIFIER_ALLOC+1), &final2);
(void) nn ; // Unused. Check is done through final (more robust).
if (final2 <= 0) return m_core_serial_fail();