From 38a983a5214497b50bdee03371f647410fc37f45 Mon Sep 17 00:00:00 2001
From: Andrew Gasparovic <55992101+agasparovic-sabre@users.noreply.github.com>
Date: Tue, 12 May 2020 06:55:08 -0700
Subject: [PATCH] Remove fallthrough switch case

GCC gives an implicit-fallthrough warning (included in -Wextra). C++17 has the [[fallthrough]] attribute, and GCC7+ has __attribute__ ((fallthrough)), but I didn't want to require either so I refactored the switch into if statements.
---
 src/gflags_completions.cc | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/gflags_completions.cc b/src/gflags_completions.cc
index c0ba325..b301fbe 100644
--- a/src/gflags_completions.cc
+++ b/src/gflags_completions.cc
@@ -325,12 +325,21 @@ static void CanonicalizeCursorWordAndSearchOptions(
     }
     break;
   }
-
-  switch (found_question_marks) {  // all fallthroughs
-    case 3: options->flag_description_substring_search = true;
-    case 2: options->flag_location_substring_search = true;
-    case 1: options->flag_name_substring_search = true;
-  };
+  
+  if (found_question_marks == 3) {
+    options->flag_description_substring_search = true;
+    options->flag_location_substring_search = true;
+    options->flag_name_substring_search = true;
+  }
+  
+  if (found_question_marks == 2) {
+    options->flag_location_substring_search = true;
+    options->flag_name_substring_search = true;
+  }
+  
+  if (found_question_marks == 1) {
+    options->flag_name_substring_search = true;
+  }
 
   options->return_all_matching_flags = (found_plusses > 0);
 }