version 1.13, 2009/03/23 21:20:24 |
version 1.14, 2009/03/25 15:17:49 |
Line 87 static int toptions(enum outt *, char *); |
|
Line 87 static int toptions(enum outt *, char *); |
|
static int moptions(enum intt *, char *); |
static int moptions(enum intt *, char *); |
static int woptions(int *, char *); |
static int woptions(int *, char *); |
static int merr(void *, int, int, const char *); |
static int merr(void *, int, int, const char *); |
static int mwarn(void *, int, int, |
static int manwarn(void *, int, int, const char *); |
|
static int mdocwarn(void *, int, int, |
enum mdoc_warn, const char *); |
enum mdoc_warn, const char *); |
static int file(struct buf *, struct buf *, |
static int file(struct buf *, struct buf *, |
const char *, |
const char *, |
|
|
main(int argc, char *argv[]) |
main(int argc, char *argv[]) |
{ |
{ |
int c, rc, fflags; |
int c, rc, fflags; |
struct mdoc_cb cb; |
struct mdoc_cb mdoccb; |
|
struct man_cb mancb; |
struct man *man; |
struct man *man; |
struct mdoc *mdoc; |
struct mdoc *mdoc; |
void *outdata; |
void *outdata; |
Line 191 main(int argc, char *argv[]) |
|
Line 193 main(int argc, char *argv[]) |
|
* screen. XXX - for now, no path for debugging messages. |
* screen. XXX - for now, no path for debugging messages. |
*/ |
*/ |
|
|
cb.mdoc_msg = NULL; |
mdoccb.mdoc_msg = NULL; |
cb.mdoc_err = merr; |
mdoccb.mdoc_err = merr; |
cb.mdoc_warn = mwarn; |
mdoccb.mdoc_warn = mdocwarn; |
|
|
|
mancb.man_err = merr; |
|
mancb.man_warn = manwarn; |
|
|
bzero(&ln, sizeof(struct buf)); |
bzero(&ln, sizeof(struct buf)); |
bzero(&blk, sizeof(struct buf)); |
bzero(&blk, sizeof(struct buf)); |
|
|
Line 203 main(int argc, char *argv[]) |
|
Line 208 main(int argc, char *argv[]) |
|
|
|
switch (inttype) { |
switch (inttype) { |
case (INTT_MAN): |
case (INTT_MAN): |
man = man_alloc(); |
man = man_alloc(&curp, &mancb); |
break; |
break; |
default: |
default: |
mdoc = mdoc_alloc(&curp, fflags, &cb); |
mdoc = mdoc_alloc(&curp, fflags, &mdoccb); |
break; |
break; |
} |
} |
|
|
Line 515 merr(void *arg, int line, int col, const char *msg) |
|
Line 520 merr(void *arg, int line, int col, const char *msg) |
|
|
|
|
|
static int |
static int |
mwarn(void *arg, int line, int col, |
mdocwarn(void *arg, int line, int col, |
enum mdoc_warn type, const char *msg) |
enum mdoc_warn type, const char *msg) |
{ |
{ |
struct curparse *curp; |
struct curparse *curp; |
Line 550 mwarn(void *arg, int line, int col, |
|
Line 555 mwarn(void *arg, int line, int col, |
|
} |
} |
|
|
|
|
|
static int |
|
manwarn(void *arg, int line, int col, const char *msg) |
|
{ |
|
struct curparse *curp; |
|
|
|
curp = (struct curparse *)arg; |
|
|
|
if ( ! (curp->wflags & WARN_WSYNTAX)) |
|
return(1); |
|
|
|
warnx("%s:%d: syntax warning: %s (column %d)", |
|
curp->file, line, msg, col); |
|
|
|
if ( ! (curp->wflags & WARN_WERR)) |
|
return(1); |
|
|
|
warnx("%s: considering warnings as errors", |
|
__progname); |
|
return(0); |
|
} |