version 1.35, 2009/07/06 09:21:24 |
version 1.36, 2009/07/06 09:34:29 |
Line 65 struct curparse { |
|
Line 65 struct curparse { |
|
const char *file; /* Current parse. */ |
const char *file; /* Current parse. */ |
int fd; /* Current parse. */ |
int fd; /* Current parse. */ |
int wflags; |
int wflags; |
#define WARN_WALL 0x03 /* All-warnings mask. */ |
#define WARN_WALL (1 << 0) /* All-warnings mask. */ |
#define WARN_WCOMPAT (1 << 0) /* Compatibility warnings. */ |
|
#define WARN_WSYNTAX (1 << 1) /* Syntax warnings. */ |
|
#define WARN_WERR (1 << 2) /* Warnings->errors. */ |
#define WARN_WERR (1 << 2) /* Warnings->errors. */ |
int fflags; |
int fflags; |
#define IGN_SCOPE (1 << 0) /* Ignore scope errors. */ |
#define IGN_SCOPE (1 << 0) /* Ignore scope errors. */ |
|
|
woptions(int *wflags, char *arg) |
woptions(int *wflags, char *arg) |
{ |
{ |
char *v, *o; |
char *v, *o; |
char *toks[5]; |
char *toks[3]; |
|
|
toks[0] = "all"; |
toks[0] = "all"; |
toks[1] = "compat"; |
toks[1] = "error"; |
toks[2] = "syntax"; |
toks[2] = NULL; |
toks[3] = "error"; |
|
toks[4] = NULL; |
|
|
|
while (*arg) { |
while (*arg) { |
o = arg; |
o = arg; |
Line 611 woptions(int *wflags, char *arg) |
|
Line 607 woptions(int *wflags, char *arg) |
|
*wflags |= WARN_WALL; |
*wflags |= WARN_WALL; |
break; |
break; |
case (1): |
case (1): |
*wflags |= WARN_WCOMPAT; |
|
break; |
|
case (2): |
|
*wflags |= WARN_WSYNTAX; |
|
break; |
|
case (3): |
|
*wflags |= WARN_WERR; |
*wflags |= WARN_WERR; |
break; |
break; |
default: |
default: |
Line 636 merr(void *arg, int line, int col, const char *msg) |
|
Line 626 merr(void *arg, int line, int col, const char *msg) |
|
struct curparse *curp; |
struct curparse *curp; |
|
|
curp = (struct curparse *)arg; |
curp = (struct curparse *)arg; |
|
|
warnx("%s:%d: error: %s (column %d)", |
warnx("%s:%d: error: %s (column %d)", |
curp->file, line, msg, col); |
curp->file, line, msg, col); |
|
|
Line 650 mdocwarn(void *arg, int line, int col, const char *msg |
|
Line 641 mdocwarn(void *arg, int line, int col, const char *msg |
|
|
|
curp = (struct curparse *)arg; |
curp = (struct curparse *)arg; |
|
|
warnx("%s:%d: warning: %s (column %d)", |
if ( ! (curp->wflags & WARN_WALL)) |
|
return(1); |
|
|
|
warnx("%s:%d: syntax warning: %s (column %d)", |
curp->file, line, msg, col); |
curp->file, line, msg, col); |
|
|
if ( ! (curp->wflags & WARN_WERR)) |
if ( ! (curp->wflags & WARN_WERR)) |
Line 668 manwarn(void *arg, int line, int col, const char *msg) |
|
Line 662 manwarn(void *arg, int line, int col, const char *msg) |
|
|
|
curp = (struct curparse *)arg; |
curp = (struct curparse *)arg; |
|
|
if ( ! (curp->wflags & WARN_WSYNTAX)) |
if ( ! (curp->wflags & WARN_WALL)) |
return(1); |
return(1); |
|
|
warnx("%s:%d: syntax warning: %s (column %d)", |
warnx("%s:%d: syntax warning: %s (column %d)", |