Improve macros

MaJerle · Aug 24, 2023 · 73862cb · 73862cb
1 parent c3761f6
commit 73862cb
Showing 1 changed file with 9 additions and 14 deletions.
diff --git a/lwdtc/src/lwdtc/lwdtc.c b/lwdtc/src/lwdtc/lwdtc.c
@@ -43,24 +43,19 @@
 #endif /* defined(LWDTC_DEV) */
 
 /* Internal defines */
-#define ASSERT_PARAM(c)                                                                                                \
+#define ASSERT_WITH_RETURN(c, retval)                                                                                  \
     if (!(c)) {                                                                                                        \
-        return lwdtcERRPAR;                                                                                            \
-    }
-#define ASSERT_TOKEN_VALID(c)                                                                                          \
-    if (!(c)) {                                                                                                        \
-        return lwdtcERRTOKEN;                                                                                          \
-    }
-#define ASSERT_ACTION(c)                                                                                               \
-    if (!(c)) {                                                                                                        \
-        return lwdtcERR;                                                                                               \
+        return retval;                                                                                                 \
     }
+#define ASSERT_PARAM(c)       ASSERT_WITH_RETURN(c, lwdtcERRPAR)
+#define ASSERT_TOKEN_VALID(c) ASSERT_WITH_RETURN(c, lwdtcERRTOKEN)
+#define ASSERT_ACTION(c)      ASSERT_WITH_RETURN(c, lwdtcERR)
 
-#define CHAR_IS_NUM(c)       ((c) >= '0' && (c) <= '9')
-#define CHAR_TO_NUM(c)       ((c) - '0')
+#define CHAR_IS_NUM(c)        ((c) >= '0' && (c) <= '9')
+#define CHAR_TO_NUM(c)        ((c) - '0')
 
-#define BIT_IS_SET(map, pos) ((map)[(pos) >> 3] & (1 << ((pos)&0x07)))
-#define BIT_SET(map, pos)    (map)[(pos) >> 3] |= (1 << ((pos)&0x07))
+#define BIT_IS_SET(map, pos)  ((map)[(pos) >> 3] & (1 << ((pos)&0x07)))
+#define BIT_SET(map, pos)     (map)[(pos) >> 3] |= (1 << ((pos)&0x07))
 
 /**
  * \brief           Private structure to parse cron input