mirror/cwm
1
0
Fork 0
mirror of https://github.com/leahneukirchen/cwm.git synced 2023-08-10 21:13:12 +03:00
Code Issues Projects Releases Wiki Activity

simplify error messages; discussed with doug@

Browse Source
This commit is contained in:
okan 2015-02-14 18:24:12 +00:00
parent 7e0c2e7728
commit ac42dff6c1
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
parse.y
View File

@ -119,21 +119,21 @@ main : FONTNAME STRING {
} }
| BORDERWIDTH NUMBER { | BORDERWIDTH NUMBER {
if ($2 < 0 || $2 > UINT_MAX) { if ($2 < 0 || $2 > UINT_MAX) {
yyerror("invalid borderwidth: %lld", $2); yyerror("invalid borderwidth");
YYERROR; YYERROR;
} }
conf->bwidth = $2; conf->bwidth = $2;
} }
| MOVEAMOUNT NUMBER { | MOVEAMOUNT NUMBER {
if ($2 < 0 || $2 > INT_MAX) { if ($2 < 0 || $2 > INT_MAX) {
yyerror("invalid movemount: %lld", $2); yyerror("invalid movemount");
YYERROR; YYERROR;
} }
conf->mamount = $2; conf->mamount = $2;
} }
| SNAPDIST NUMBER { | SNAPDIST NUMBER {
if ($2 < 0 || $2 > INT_MAX) { if ($2 < 0 || $2 > INT_MAX) {
yyerror("invalid snapdist: %lld", $2); yyerror("invalid snapdist");
YYERROR; YYERROR;
} }
conf->snapdist = $2; conf->snapdist = $2;
@ -150,8 +150,8 @@ main : FONTNAME STRING {
} }
| AUTOGROUP NUMBER STRING { | AUTOGROUP NUMBER STRING {
if ($2 < 0 || $2 > 9) { if ($2 < 0 || $2 > 9) {
yyerror("invalid autogroup");
free($3); free($3);
yyerror("invalid autogroup: %lld", $2);
YYERROR; YYERROR;
} }
conf_autogroup(conf, $2, $3); conf_autogroup(conf, $2, $3);
@ -176,8 +176,7 @@ main : FONTNAME STRING {
$3 < 0 || $3 > INT_MAX || $3 < 0 || $3 > INT_MAX ||
$4 < 0 || $4 > INT_MAX || $4 < 0 || $4 > INT_MAX ||
$5 < 0 || $5 > INT_MAX) { $5 < 0 || $5 > INT_MAX) {
yyerror("invalid gap: %lld %lld %lld %lld", yyerror("invalid gap");
$2, $3, $4, $5);
YYERROR; YYERROR;
} }
conf->gap.top = $2; conf->gap.top = $2;