diff options
Diffstat (limited to 'src/bin/pg_amcheck/pg_amcheck.c')
| -rw-r--r-- | src/bin/pg_amcheck/pg_amcheck.c | 38 |
1 files changed, 13 insertions, 25 deletions
diff --git a/src/bin/pg_amcheck/pg_amcheck.c b/src/bin/pg_amcheck/pg_amcheck.c index 07d7dd005e7..9f7ffb6210f 100644 --- a/src/bin/pg_amcheck/pg_amcheck.c +++ b/src/bin/pg_amcheck/pg_amcheck.c @@ -55,7 +55,6 @@ typedef struct AmcheckOptions bool dbpattern; bool alldb; bool echo; - bool quiet; bool verbose; bool strict_names; bool show_progress; @@ -111,7 +110,6 @@ static AmcheckOptions opts = { .dbpattern = false, .alldb = false, .echo = false, - .quiet = false, .verbose = false, .strict_names = true, .show_progress = false, @@ -249,7 +247,6 @@ main(int argc, char *argv[]) {"exclude-index", required_argument, NULL, 'I'}, {"jobs", required_argument, NULL, 'j'}, {"progress", no_argument, NULL, 'P'}, - {"quiet", no_argument, NULL, 'q'}, {"relation", required_argument, NULL, 'r'}, {"exclude-relation", required_argument, NULL, 'R'}, {"schema", required_argument, NULL, 's'}, @@ -293,7 +290,7 @@ main(int argc, char *argv[]) handle_help_version_opts(argc, argv, progname, help); /* process command-line options */ - while ((c = getopt_long(argc, argv, "ad:D:eh:Hi:I:j:p:Pqr:R:s:S:t:T:U:wWv", + while ((c = getopt_long(argc, argv, "ad:D:eh:Hi:I:j:p:Pr:R:s:S:t:T:U:wWv", long_options, &optindex)) != -1) { char *endptr; @@ -340,9 +337,6 @@ main(int argc, char *argv[]) case 'P': opts.show_progress = true; break; - case 'q': - opts.quiet = true; - break; case 'r': opts.allrel = false; append_relation_pattern(&opts.include, optarg, encoding); @@ -639,21 +633,18 @@ main(int argc, char *argv[]) { failed = opts.strict_names; - if (!opts.quiet || failed) - { - if (pat->heap_only) - log_no_match("no heap tables to check matching \"%s\"", - pat->pattern); - else if (pat->btree_only) - log_no_match("no btree indexes to check matching \"%s\"", - pat->pattern); - else if (pat->rel_regex == NULL) - log_no_match("no relations to check in schemas matching \"%s\"", - pat->pattern); - else - log_no_match("no relations to check matching \"%s\"", - pat->pattern); - } + if (pat->heap_only) + log_no_match("no heap tables to check matching \"%s\"", + pat->pattern); + else if (pat->btree_only) + log_no_match("no btree indexes to check matching \"%s\"", + pat->pattern); + else if (pat->rel_regex == NULL) + log_no_match("no relations to check in schemas matching \"%s\"", + pat->pattern); + else + log_no_match("no relations to check matching \"%s\"", + pat->pattern); } } @@ -751,8 +742,6 @@ main(int argc, char *argv[]) if (opts.verbose) PQsetErrorVerbosity(free_slot->connection, PQERRORS_VERBOSE); - else if (opts.quiet) - PQsetErrorVerbosity(free_slot->connection, PQERRORS_TERSE); /* * Execute the appropriate amcheck command for this relation using our @@ -1194,7 +1183,6 @@ help(const char *progname) printf(_("\nOther options:\n")); printf(_(" -e, --echo show the commands being sent to the server\n")); printf(_(" -j, --jobs=NUM use this many concurrent connections to the server\n")); - printf(_(" -q, --quiet don't write any messages\n")); printf(_(" -P, --progress show progress information\n")); printf(_(" -v, --verbose write a lot of output\n")); printf(_(" -V, --version output version information, then exit\n")); |