simplify error messages; discussed with doug@

This commit is contained in:
okan 2015-02-14 18:24:12 +00:00
parent a3e13143bb
commit 99ed76e391

View File

@ -1,4 +1,4 @@
/* $OpenBSD: parse.y,v 1.61 2015/01/19 14:54:16 okan Exp $ */
/* $OpenBSD: parse.y,v 1.62 2015/02/14 18:24:12 okan Exp $ */
/*
* Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org>
@ -119,21 +119,21 @@ main : FONTNAME STRING {
}
| BORDERWIDTH NUMBER {
if ($2 < 0 || $2 > UINT_MAX) {
yyerror("invalid borderwidth: %lld", $2);
yyerror("invalid borderwidth");
YYERROR;
}
conf->bwidth = $2;
}
| MOVEAMOUNT NUMBER {
if ($2 < 0 || $2 > INT_MAX) {
yyerror("invalid movemount: %lld", $2);
yyerror("invalid movemount");
YYERROR;
}
conf->mamount = $2;
}
| SNAPDIST NUMBER {
if ($2 < 0 || $2 > INT_MAX) {
yyerror("invalid snapdist: %lld", $2);
yyerror("invalid snapdist");
YYERROR;
}
conf->snapdist = $2;
@ -150,8 +150,8 @@ main : FONTNAME STRING {
}
| AUTOGROUP NUMBER STRING {
if ($2 < 0 || $2 > 9) {
yyerror("invalid autogroup");
free($3);
yyerror("invalid autogroup: %lld", $2);
YYERROR;
}
conf_autogroup(conf, $2, $3);
@ -176,8 +176,7 @@ main : FONTNAME STRING {
$3 < 0 || $3 > INT_MAX ||
$4 < 0 || $4 > INT_MAX ||
$5 < 0 || $5 > INT_MAX) {
yyerror("invalid gap: %lld %lld %lld %lld",
$2, $3, $4, $5);
yyerror("invalid gap");
YYERROR;
}
conf->gap.top = $2;