src/usr.bin/mandoc/main.c - diff

Return to main.c CVS log

Up to [local] / src / usr.bin / mandoc

Diff for /src/usr.bin/mandoc/main.c between version 1.11 and 1.12

version 1.11, 2009/07/07 00:54:46

version 1.12, 2009/07/12 18:28:29

Line 85

static int moptions(enum intt *, char *);

static int woptions(int *, char *);

static int merr(void *, int, int, const char *);

static int manwarn(void *, int, int, const char *);

static int mwarn(void *, int, int, const char *);

static int mdocwarn(void *, int, int,

enum mdoc_warn, const char *);

static int ffile(struct buf *, struct buf *,

const char *, struct curparse *);

static int fdesc(struct buf *, struct buf *,

Line 215

Line 213

struct man_cb mancb;

mancb.man_err = merr;

mancb.man_warn = manwarn;

mancb.man_warn = mwarn;

/* Defaults from mandoc.1. */

Line 243

Line 241

struct mdoc_cb mdoccb;

mdoccb.mdoc_err = merr;

mdoccb.mdoc_warn = mdocwarn;

mdoccb.mdoc_warn = mwarn;

/* Defaults from mandoc.1. */

Line 632

Line 630

static int

mdocwarn(void *arg, int line, int col,

mwarn(void *arg, int line, int col, const char *msg)

enum mdoc_warn type, const char *msg)

{

struct curparse *curp;

char *wtype;

curp = (struct curparse *)arg;

wtype = NULL;

switch (type) {

if ( ! (curp->wflags & WARN_WALL))

case (WARN_COMPAT):

wtype = "compat";

if (curp->wflags & WARN_WCOMPAT)

break;

return(1);

case (WARN_SYNTAX):

wtype = "syntax";

if (curp->wflags & WARN_WSYNTAX)

break;

return(1);

}

assert(wtype);

warnx("%s:%d: warning: %s (column %d)",

warnx("%s:%d: %s warning: %s (column %d)",

curp->file, line, msg, col);

curp->file, line, wtype, msg, col);

if ( ! (curp->wflags & WARN_WERR))

return(1);

Line 665

Line 649

return(0);

}

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("considering warnings as errors");

return(0);

}