diff options
| author | okan <okan> | 2015-01-16 18:28:08 +0000 |
|---|---|---|
| committer | okan <okan> | 2015-01-16 18:28:08 +0000 |
| commit | 8d1eb202bf13dbe23d8379b095f64a10c0204676 (patch) | |
| tree | 8c9293eee00d52b2c9dae3fdd847d2578e8cfa1c | |
| parent | 9cada703b9772c5d9738c9bfa632e57678174025 (diff) | |
| download | cwm-8d1eb202bf13dbe23d8379b095f64a10c0204676.tar.gz cwm-8d1eb202bf13dbe23d8379b095f64a10c0204676.tar.xz cwm-8d1eb202bf13dbe23d8379b095f64a10c0204676.zip | |
Add gcc format attributes for yyerror(); fix a few yyerror() calls.
Adapted from src parse.y changes by doug@. OK doug@
| -rw-r--r-- | parse.y | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/parse.y b/parse.y index 7df4f98..590bd44 100644 --- a/parse.y +++ b/parse.y @@ -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; } |