thelilfrog/cpufetch
1
0
Fork 0
mirror of https://github.com/Dr-Noob/cpufetch.git synced 2026-03-25 07:50:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

[v0.99] Always print warning messages in parse_args function

Browse Source
This commit is contained in:
Dr-Noob
2021-08-21 10:48:06 +02:00
parent 9d8372fcb4
commit e63ef6008d
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/args.c
View File

@@ -246,6 +246,9 @@ bool parse_args(int argc, char* argv[]) {
args.style = STYLE_EMPTY; args.style = STYLE_EMPTY;
args.colors = NULL; args.colors = NULL;
// Temporary enable verbose level to allow printing warnings inside parse_args
set_log_level(true);
const struct option long_options[] = { const struct option long_options[] = {
{args_str[ARG_STYLE], required_argument, 0, args_chr[ARG_STYLE] }, {args_str[ARG_STYLE], required_argument, 0, args_chr[ARG_STYLE] },
{args_str[ARG_COLOR], required_argument, 0, args_chr[ARG_COLOR] }, {args_str[ARG_COLOR], required_argument, 0, args_chr[ARG_COLOR] },
@@ -334,11 +337,6 @@ bool parse_args(int argc, char* argv[]) {
args.help_flag = true; args.help_flag = true;
} }
if((args.help_flag + args.version_flag + color_flag) > 1) {
printWarn("You should specify just one option");
args.help_flag = true;
}
if(args.logo_intel_new && args.logo_intel_old) { if(args.logo_intel_new && args.logo_intel_old) {
printWarn("%s and %s cannot be specified together", args_str[ARG_LOGO_INTEL_NEW], args_str[ARG_LOGO_INTEL_OLD]); printWarn("%s and %s cannot be specified together", args_str[ARG_LOGO_INTEL_NEW], args_str[ARG_LOGO_INTEL_OLD]);
args.logo_intel_new = false; args.logo_intel_new = false;
@@ -351,5 +349,8 @@ bool parse_args(int argc, char* argv[]) {
args.logo_long = false; args.logo_long = false;
} }
// Leave log level untouched after returning
set_log_level(false);
return true; return true;
} }