From 1cb1d16e7742e12de178666c2ba7de6b2a391226 Mon Sep 17 00:00:00 2001 From: Patrick Pelissier Date: Fri, 10 May 2019 10:33:09 +0200 Subject: [PATCH] Simplify code by using fscanf behvior on white space --- m-serial-json.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/m-serial-json.h b/m-serial-json.h index 2803c96b..e0de2944 100644 --- a/m-serial-json.h +++ b/m-serial-json.h @@ -167,17 +167,13 @@ m_serial_json_read_boolean(m_serial_read_t serial, bool *b){ static inline m_serial_return_code_t m_serial_json_read_integer(m_serial_read_t serial, long long *i){ FILE *f = (FILE*) serial->data[0]; - int c = m_serial_json_read_skip(f); - ungetc(c, f); - 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 m_serial_json_read_float(m_serial_read_t serial, long double *r){ FILE *f = (FILE*) serial->data[0]; - int c = m_serial_json_read_skip(f); - ungetc(c, f); - 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; } static inline m_serial_return_code_t m_serial_json_read_string(m_serial_read_t serial, struct string_s *s){ return M_SERIAL_FAIL; }