Commit 569defae4050cc338976824e2d428714f0c23f45
2020-12-14T01:25:26
Silence -Wimplicit-fallthrough warnings Use a macro that dispatches to the compiler-specific magic to silence implicit fallthrough warnings when the fallthrough was actually intended. The code already featured comments, so these are actually safe to place. (Unfortunately, Clang does not recognize any comment as "fall through" comment, and GCC only recognizes some variations of "fall through", not "pass through". Moreover, one of the comments replaced here had a typo...)
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72
diff --git a/src/md4c.c b/src/md4c.c
index f2af228..830c9e1 100644
--- a/src/md4c.c
+++ b/src/md4c.c
@@ -72,6 +72,23 @@
#define FALSE 0
#endif
+/* For falling through case labels in switch statements. */
+#if defined __clang__
+ #if __clang_major__ >= 12
+ #define MD4C_FALLTHROUGH() __attribute__((fallthrough))
+ #else
+ #define MD4C_FALLTHROUGH() ((void)0)
+ #endif
+#elif defined __GNUC__
+ #if __GNUC__ >= 7
+ #define MD4C_FALLTHROUGH() __attribute__((fallthrough))
+ #else
+ #define MD4C_FALLTHROUGH() ((void)0)
+ #endif
+#else
+ #define MD4C_FALLTHROUGH() ((void)0)
+#endif
+
/************************
*** Internal Types ***
@@ -2671,7 +2688,7 @@ md_rollback(MD_CTX* ctx, int opener_index, int closer_index, int how)
mark_index = mark->prev;
break;
}
- /* Pass through. */
+ MD4C_FALLTHROUGH();
default:
mark_index--;
break;
@@ -4152,7 +4169,7 @@ md_process_inlines(MD_CTX* ctx, const MD_LINE* lines, int n_lines)
}
break;
}
- /* Fall though. */
+ MD4C_FALLTHROUGH();
case '*': /* Emphasis, strong emphasis. */
if(mark->flags & MD_MARK_OPENER) {
@@ -4251,6 +4268,7 @@ md_process_inlines(MD_CTX* ctx, const MD_LINE* lines, int n_lines)
break;
}
/* Pass through, if auto-link. */
+ MD4C_FALLTHROUGH();
case '@': /* Permissive e-mail autolink. */
case ':': /* Permissive URL autolink. */
@@ -5529,7 +5547,7 @@ md_enter_child_containers(MD_CTX* ctx, int n_children, unsigned data)
case _T(')'):
case _T('.'):
is_ordered_list = TRUE;
- /* Pass through */
+ MD4C_FALLTHROUGH();
case _T('-'):
case _T('+'):
@@ -5575,7 +5593,7 @@ md_leave_child_containers(MD_CTX* ctx, int n_keep)
case _T(')'):
case _T('.'):
is_ordered_list = TRUE;
- /* Pass through */
+ MD4C_FALLTHROUGH();
case _T('-'):
case _T('+'):