emo/thin-provisioning-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

thin_check.cc: reenable --quiet option

Browse Source
This commit is contained in:
Heinz Mauelshagen 2013-06-19 13:38:14 +02:00
parent 0938d24ea1
commit c83e33d1a7
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
thin-provisioning/thin_check.cc
View File

@ -234,6 +234,8 @@ namespace {
bool check_mapping_tree_level2; bool check_mapping_tree_level2;
bool ignore_non_fatal_errors; bool ignore_non_fatal_errors;
bool quiet;
}; };
error_state metadata_check(string const &path, flags fs) { error_state metadata_check(string const &path, flags fs) {
@ -296,7 +298,9 @@ namespace {
err = metadata_check(path, fs); err = metadata_check(path, fs);
} catch (std::exception &e) { } catch (std::exception &e) {
if (!fs.quiet)
cerr << e.what() << endl; cerr << e.what() << endl;
return 1; return 1;
} }
@ -322,7 +326,6 @@ int main(int argc, char **argv)
{ {
int c; int c;
flags fs; flags fs;
bool quiet = false;
char const shortopts[] = "qhV"; char const shortopts[] = "qhV";
option const longopts[] = { option const longopts[] = {
{ "quiet", no_argument, NULL, 'q'}, { "quiet", no_argument, NULL, 'q'},
@ -338,6 +341,7 @@ int main(int argc, char **argv)
fs.check_mapping_tree_level1 = true; fs.check_mapping_tree_level1 = true;
fs.check_mapping_tree_level2 = true; fs.check_mapping_tree_level2 = true;
fs.ignore_non_fatal_errors = false; fs.ignore_non_fatal_errors = false;
fs.quiet = false;
while ((c = getopt_long(argc, argv, shortopts, longopts, NULL)) != -1) { while ((c = getopt_long(argc, argv, shortopts, longopts, NULL)) != -1) {
switch(c) { switch(c) {
@ -346,7 +350,7 @@ int main(int argc, char **argv)
return 0; return 0;
case 'q': case 'q':
quiet = true; fs.quiet = true;
break; break;
case 'V': case 'V':
@ -377,8 +381,11 @@ int main(int argc, char **argv)
} }
if (argc == optind) { if (argc == optind) {
if (!fs.quiet) {
cerr << "No input file provided." << endl; cerr << "No input file provided." << endl;
usage(cerr, basename(argv[0])); usage(cerr, basename(argv[0]));
}
exit(1); exit(1);
} }