From e33e77595fd5a8c1fad55baa78455fc0d8981a0a Mon Sep 17 00:00:00 2001 From: Patrick Pelissier Date: Fri, 24 Aug 2018 21:03:25 +0200 Subject: [PATCH] Simplify the logic for parsing bool. --- m-core.h | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/m-core.h b/m-core.h index da24f81f..1f0fbb31 100644 --- a/m-core.h +++ b/m-core.h @@ -1315,11 +1315,8 @@ static inline bool m_core_fscan_bool (bool *ptr, FILE *f) { char c = fgetc(f); - if (c == '0' || c == '1') { - *ptr = (c == '1'); - return true; - } - return false; + *ptr = (c == '1'); + return (c == '0' || c == '1'); } #define M_FSCAN_DEFAULT_TYPE_DEF(name, type, format) \ @@ -1386,11 +1383,9 @@ static inline bool m_core_parse_bool (bool *ptr, const char str[], const char **endptr) { char c = *str++; - if (c != '0' && c != '1') - return false; *ptr = (c == '1'); if (endptr != NULL) *endptr = str; - return true; + return (c == '0' || c == '1'); } #define M_PARSE_DEFAULT_TYPE_DEF(name, type, parse_func, extra_arg) \