Fix implicit fallthrough

cxong · Feb 29, 2024 · b2e7c32 · b2e7c32
1 parent 8e2ed3f
commit b2e7c32
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -122,7 +122,7 @@ else()
 		endif()
 		if (CMAKE_C_COMPILER_VERSION VERSION_GREATER 7)
 			add_definitions(
-				-Wimplicit-fallthrough=0 # TODO: is everything caught by implicit-fallthrough intended?
+				-C
 				-Wno-error=format-overflow # TODO: should probably just make sure buffer sizes are appropriate
 				-Wno-error=stringop-overflow # TODO: update nuklear
 			)

diff --git a/src/cdogs/yajl/yajl_parser.c b/src/cdogs/yajl/yajl_parser.c
@@ -342,8 +342,8 @@ yajl_do_parse(yajl_handle hand, const unsigned char * jsonText,
                         yajl_bs_pop(hand->stateStack);
                         goto around_again;
                     }
-                    /* intentional fall-through */
                 }
+                // fall through
                 case yajl_tok_colon:
                 case yajl_tok_comma:
                 case yajl_tok_right_bracket:
@@ -393,7 +393,7 @@ yajl_do_parse(yajl_handle hand, const unsigned char * jsonText,
                         buf = yajl_buf_data(hand->decodeBuf);
                         bufLen = yajl_buf_len(hand->decodeBuf);
                     }
-                    /* intentional fall-through */
+                    // fall through
                 case yajl_tok_string:
                     if (hand->callbacks && hand->callbacks->yajl_map_key) {
                         _CC_CHK(hand->callbacks->yajl_map_key(hand->ctx, buf,
@@ -411,6 +411,7 @@ yajl_do_parse(yajl_handle hand, const unsigned char * jsonText,
                         yajl_bs_pop(hand->stateStack);
                         goto around_again;
                     }
+                    // fall through
                 default:
                     yajl_bs_set(hand->stateStack, yajl_state_parse_error);
                     hand->parseError =

diff --git a/src/command_line.c b/src/command_line.c
@@ -1,7 +1,7 @@
 /*
 	C-Dogs SDL
 	A port of the legendary (and fun) action/arcade cdogs.
-	Copyright (c) 2013-2016, 2019-2021 Cong Xu
+	Copyright (c) 2013-2016, 2019-2021, 2024 Cong Xu
 	All rights reserved.
 
 	Redistribution and use in source and binary forms, with or without
@@ -234,6 +234,7 @@ bool ParseArgs(
 					return false;
 				}
 			}
+			break;
 		default:
 			PrintHelp();
 			// Ignore unknown arguments