From 7e709881881c2663569cd49a93e5c8d9228d868e Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Mon, 15 Oct 2018 01:56:30 -0700 Subject: [PATCH] fix: PVS Studio warnings --- src/gflags.cc | 7 +++---- src/gflags_completions.cc | 3 +-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/gflags.cc b/src/gflags.cc index 976319f..e0171fe 100644 --- a/src/gflags.cc +++ b/src/gflags.cc @@ -1036,16 +1036,15 @@ uint32 CommandLineFlagParser::ParseNewCommandLineFlags(int* argc, char*** argv, char* arg = (*argv)[i]; // Like getopt(), we permute non-option flags to be at the end. - if (arg[0] != '-' || arg[1] == '\0') { // must be a program argument "-" is an argument, not a flag + if (arg[0] != '-' || arg[1] == '\0') { // must be a program argument: "-" is an argument, not a flag memmove((*argv) + i, (*argv) + i+1, (*argc - (i+1)) * sizeof((*argv)[i])); (*argv)[*argc-1] = arg; // we go last first_nonopt--; // we've been pushed onto the stack i--; // to undo the i++ in the loop continue; } - - if (arg[0] == '-') arg++; // allow leading '-' - if (arg[0] == '-') arg++; // or leading '--' + arg++; // skip leading '-' + if (arg[0] == '-') arg++; // or leading '--' // -- alone means what it does for GNU: stop options parsing if (*arg == '\0') { diff --git a/src/gflags_completions.cc b/src/gflags_completions.cc index 4afc521..c53a128 100644 --- a/src/gflags_completions.cc +++ b/src/gflags_completions.cc @@ -550,8 +550,7 @@ static void FinalizeCompletionOutput( vector output_groups; bool perfect_match_found = false; - if (lines_so_far < max_desired_lines && - !notable_flags->perfect_match_flag.empty()) { + if (!notable_flags->perfect_match_flag.empty()) { perfect_match_found = true; DisplayInfoGroup group = { "",