From 981ef4d928ede265a358bc0d2528f9a1d6fef689 Mon Sep 17 00:00:00 2001 From: Jacky Wu Date: Wed, 13 Nov 2019 15:32:13 +0800 Subject: [PATCH] Avoid no-match message in case STRIP_FLAG_HELP been set If the workaround in issue #43 is used along with the define of STRIP_FLAG_HELP to 1, there would be a wrong "No modules matched" message been print at end of the usage message. That's because we continue the loop if we see strip flag help value and never set the `found_match` flag to true even if we found a match. By moving the set statement above the continue, we can avoid this wrong message. --- src/gflags_reporting.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gflags_reporting.cc b/src/gflags_reporting.cc index b6cccba..db05303 100644 --- a/src/gflags_reporting.cc +++ b/src/gflags_reporting.cc @@ -275,9 +275,9 @@ static void ShowUsageWithFlagsMatching(const char *argv0, ++flag) { if (substrings.empty() || FileMatchesSubstring(flag->filename, substrings)) { + found_match = true; // this flag passed the match! // If the flag has been stripped, pretend that it doesn't exist. if (flag->description == kStrippedFlagHelp) continue; - found_match = true; // this flag passed the match! if (flag->filename != last_filename) { // new file if (Dirname(flag->filename) != Dirname(last_filename)) { // new dir! if (!first_directory)