fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

args.c: Reword error messages

Browse Source 
Use the same error message if option arguments have the same data type
and always add the violating value.

Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2014-08-06 16:26:17 +02:00
parent 8ead883c32
commit 9f24adfded
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/args.c
View File

@ -529,55 +529,55 @@ int parse_args(int argc, char **argv)
case 'S': case 'S':
case OPT_FILTER_PATTERN: case OPT_FILTER_PATTERN:
EXIT_IF(filter.regex, EXIT_IF(filter.regex,
_("Can not handle more than one regular expression.")); _("cannot handle more than one regular expression"));
if (regcomp(&reg, optarg, REG_EXTENDED)) if (regcomp(&reg, optarg, REG_EXTENDED))
EXIT(_("Could not compile regular expression.")); EXIT(_("could not compile regular expression: %s"), optarg);
filter.regex = &reg; filter.regex = &reg;
break; break;
case OPT_FILTER_START_FROM: case OPT_FILTER_START_FROM:
filter.start_from = parse_datearg(optarg); filter.start_from = parse_datearg(optarg);
EXIT_IF(filter.start_from == -1, EXIT_IF(filter.start_from == -1,
_("invalid filter start date")); _("invalid date: %s"), optarg);
break; break;
case OPT_FILTER_START_TO: case OPT_FILTER_START_TO:
filter.start_to = parse_datearg(optarg); filter.start_to = parse_datearg(optarg);
EXIT_IF(filter.start_to == -1, EXIT_IF(filter.start_to == -1,
_("invalid filter end date")); _("invalid date: %s"), optarg);
break; break;
case OPT_FILTER_START_AFTER: case OPT_FILTER_START_AFTER:
filter.start_from = parse_datearg(optarg) + 1; filter.start_from = parse_datearg(optarg) + 1;
EXIT_IF(filter.start_from == -1, EXIT_IF(filter.start_from == -1,
_("invalid filter start date")); _("invalid date: %s"), optarg);
break; break;
case OPT_FILTER_START_BEFORE: case OPT_FILTER_START_BEFORE:
filter.start_to = parse_datearg(optarg) - 1; filter.start_to = parse_datearg(optarg) - 1;
EXIT_IF(filter.start_to == -1, EXIT_IF(filter.start_to == -1,
_("invalid filter end date")); _("invalid date: %s"), optarg);
break; break;
case OPT_FILTER_END_FROM: case OPT_FILTER_END_FROM:
filter.end_from = parse_datearg(optarg); filter.end_from = parse_datearg(optarg);
EXIT_IF(filter.end_from == -1, EXIT_IF(filter.end_from == -1,
_("invalid filter start date")); _("invalid date: %s"), optarg);
break; break;
case OPT_FILTER_END_TO: case OPT_FILTER_END_TO:
filter.end_to = parse_datearg(optarg); filter.end_to = parse_datearg(optarg);
EXIT_IF(filter.end_to == -1, EXIT_IF(filter.end_to == -1,
_("invalid filter end date")); _("invalid date: %s"), optarg);
break; break;
case OPT_FILTER_END_AFTER: case OPT_FILTER_END_AFTER:
filter.end_from = parse_datearg(optarg) + 1; filter.end_from = parse_datearg(optarg) + 1;
EXIT_IF(filter.end_from == -1, EXIT_IF(filter.end_from == -1,
_("invalid filter start date")); _("invalid date: %s"), optarg);
break; break;
case OPT_FILTER_END_BEFORE: case OPT_FILTER_END_BEFORE:
filter.end_to = parse_datearg(optarg) - 1; filter.end_to = parse_datearg(optarg) - 1;
EXIT_IF(filter.end_to == -1, EXIT_IF(filter.end_to == -1,
_("invalid filter end date")); _("invalid date: %s"), optarg);
break; break;
case OPT_FILTER_PRIORITY: case OPT_FILTER_PRIORITY:
filter.priority = atoi(optarg); filter.priority = atoi(optarg);
EXIT_IF(filter.priority < 1 || filter.priority > 9, EXIT_IF(filter.priority < 1 || filter.priority > 9,
_("invalid priority")); _("invalid priority: %s"), optarg);
break; break;
case OPT_FILTER_COMPLETED: case OPT_FILTER_COMPLETED:
filter.completed = 1; filter.completed = 1;
@ -587,15 +587,15 @@ int parse_args(int argc, char **argv)
break; break;
case OPT_FROM: case OPT_FROM:
from = parse_datearg(optarg); from = parse_datearg(optarg);
EXIT_IF(from == -1, _("invalid start date")); EXIT_IF(from == -1, _("invalid date: %s"), optarg);
break; break;
case OPT_TO: case OPT_TO:
to = parse_datearg(optarg); to = parse_datearg(optarg);
EXIT_IF(to == -1, _("invalid end date")); EXIT_IF(to == -1, _("invalid date: %s"), optarg);
break; break;
case OPT_DAYS: case OPT_DAYS:
range = atoi(optarg); range = atoi(optarg);
EXIT_IF(range == 0, _("invalid range")); EXIT_IF(range == 0, _("invalid range: %s"), optarg);
break; break;
case OPT_FMT_APT: case OPT_FMT_APT:
fmt_apt = optarg; fmt_apt = optarg;