diff options
| author | okan | 2015-01-16 18:28:08 +0000 |
|---|---|---|
| committer | okan | 2015-01-16 18:28:08 +0000 |
| commit | f5fc14375af5a7de2561bf2f8075f106a40dbabb (patch) | |
| tree | 68564c0feea3f2eeecef9c31eb3a96df74ed7479 /parse.y | |
| parent | 00875a40f2f3916f4f0a496da3cdbaef9fab24c8 (diff) | |
| download | cwm-f5fc14375af5a7de2561bf2f8075f106a40dbabb.tar.gz | |
Add gcc format attributes for yyerror(); fix a few yyerror() calls.
Adapted from src parse.y changes by doug@. OK doug@
Diffstat (limited to 'parse.y')
| -rw-r--r-- | parse.y | 16 |
1 files changed, 9 insertions, 7 deletions
@@ -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; } |