qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add gcc format attributes for yyerror(); fix a few yyerror() calls.

Browse Source 
Adapted from src parse.y changes by doug@. OK doug@
This commit is contained in:
okan 2015-01-16 18:28:08 +00:00
parent 56b31a08cf
commit 7832f8c64d
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/cwm/parse.y
View File

@ -1,4 +1,4 @@
/* $OpenBSD: parse.y,v 1.58 2014/01/30 22:41:16 okan Exp $ */
/* $OpenBSD: parse.y,v 1.59 2015/01/16 18:28:08 okan Exp $ */
/*
* Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org>
@ -47,7 +47,9 @@ struct file *pushfile(const char *);
int popfile(void);
int yyparse(void);
int yylex(void);
int yyerror(const char *, ...);
int yyerror(const char *, ...)
__attribute__((__format__ (printf, 1, 2)))
__attribute__((__nonnull__ (1)));
int kw_cmp(const void *, const void *);
int lookup(char *);
int lgetc(int);
@ -117,21 +119,21 @@ main : FONTNAME STRING {
}
| BORDERWIDTH NUMBER {
if ($2 < 0 || $2 > UINT_MAX) {
yyerror("invalid borderwidth: %d", $2);
yyerror("invalid borderwidth: %lld", $2);
YYERROR;
}
conf->bwidth = $2;
}
| MOVEAMOUNT NUMBER {
if ($2 < 0 || $2 > INT_MAX) {
yyerror("invalid movemount: %d", $2);
yyerror("invalid movemount: %lld", $2);
YYERROR;
}
conf->mamount = $2;
}
| SNAPDIST NUMBER {
if ($2 < 0 || $2 > INT_MAX) {
yyerror("invalid snapdist: %d", $2);
yyerror("invalid snapdist: %lld", $2);
YYERROR;
}
conf->snapdist = $2;
@ -149,7 +151,7 @@ main : FONTNAME STRING {
| AUTOGROUP NUMBER STRING {
if ($2 < 0 || $2 > 9) {
free($3);
yyerror("invalid autogroup: %d", $2);
yyerror("invalid autogroup: %lld", $2);
YYERROR;
}
conf_autogroup(conf, $2, $3);
@ -174,7 +176,7 @@ main : FONTNAME STRING {
$3 < 0 || $3 > INT_MAX ||
$4 < 0 || $4 > INT_MAX ||
$5 < 0 || $5 > INT_MAX) {
yyerror("invalid gap: %d %d %d %d",
yyerror("invalid gap: %lld %lld %lld %lld",
$2, $3, $4, $5);
YYERROR;
}