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

Add size_of_type field for reading too

Browse Source
This commit is contained in:
Patrick Pelissier committed 2019-05-18 11:17:13 +02:00
1 parent 50cc8689bb
commit ada1b9861f
2 files changed
+7 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

m-core.h
+3 -3
View File
@@ -2595,8 +2595,8 @@ struct string_s;
// Interface exported by the serial read object. // Interface exported by the serial read object.
typedef struct m_serial_read_interface_s { typedef struct m_serial_read_interface_s {
m_serial_return_code_t (*read_boolean)(m_serial_read_t,bool *); m_serial_return_code_t (*read_boolean)(m_serial_read_t,bool *);
m_serial_return_code_t (*read_integer)(m_serial_read_t, long long *); m_serial_return_code_t (*read_integer)(m_serial_read_t, long long *, const size_t size_of_type);
m_serial_return_code_t (*read_float)(m_serial_read_t, long double *); m_serial_return_code_t (*read_float)(m_serial_read_t, long double *, const size_t size_of_type);
m_serial_return_code_t (*read_string)(m_serial_read_t, struct string_s *); m_serial_return_code_t (*read_string)(m_serial_read_t, struct string_s *);
m_serial_return_code_t (*read_array_start)(m_serial_read_t, size_t *); m_serial_return_code_t (*read_array_start)(m_serial_read_t, size_t *);
m_serial_return_code_t (*read_array_next)(m_serial_read_t); // Return M_SERIAL_OK_DONE when array is finished parsing. m_serial_return_code_t (*read_array_next)(m_serial_read_t); // Return M_SERIAL_OK_DONE when array is finished parsing.
@@ -2689,7 +2689,7 @@ typedef struct m_serial_write_interface_s {
{ \ { \
promoted_type i; \ promoted_type i; \
m_serial_return_code_t r; \ m_serial_return_code_t r; \
r = serial->interface->func(serial, &i); \ r = serial->interface->func(serial, &i, sizeof (type)); \
*ptr = i; \ *ptr = i; \
return r; \ return r; \
} }
m-serial-json.h
+4 -2
View File
@@ -165,13 +165,15 @@ m_serial_json_read_boolean(m_serial_read_t serial, bool *b){
} }
static inline m_serial_return_code_t static inline m_serial_return_code_t
m_serial_json_read_integer(m_serial_read_t serial, long long *i){ m_serial_json_read_integer(m_serial_read_t serial, long long *i, const size_t size_of_type){
(void) size_of_type; // Ignored
FILE *f = (FILE*) serial->data[0]; FILE *f = (FILE*) serial->data[0];
return fscanf(f, " %lld", i) == 1 ? M_SERIAL_OK_DONE : M_SERIAL_FAIL; return fscanf(f, " %lld", i) == 1 ? M_SERIAL_OK_DONE : M_SERIAL_FAIL;
} }
static inline m_serial_return_code_t static inline m_serial_return_code_t
m_serial_json_read_float(m_serial_read_t serial, long double *r){ m_serial_json_read_float(m_serial_read_t serial, long double *r, const size_t size_of_type){
(void) size_of_type; // Ignored
FILE *f = (FILE*) serial->data[0]; FILE *f = (FILE*) serial->data[0];
return fscanf(f, " %Lf", r) == 1 ? M_SERIAL_OK_DONE : M_SERIAL_FAIL; return fscanf(f, " %Lf", r) == 1 ? M_SERIAL_OK_DONE : M_SERIAL_FAIL;
} }