version 1.85, 2009/06/17 10:53:32 |
version 1.87, 2009/07/06 09:21:24 |
Line 264 mdoc_verr(struct mdoc *mdoc, int ln, int pos, |
|
Line 264 mdoc_verr(struct mdoc *mdoc, int ln, int pos, |
|
|
|
|
|
int |
int |
mdoc_vwarn(struct mdoc *mdoc, int ln, int pos, |
mdoc_vwarn(struct mdoc *mdoc, int ln, int pos, const char *fmt, ...) |
enum mdoc_warn type, const char *fmt, ...) |
|
{ |
{ |
char buf[256]; |
char buf[256]; |
va_list ap; |
va_list ap; |
Line 276 mdoc_vwarn(struct mdoc *mdoc, int ln, int pos, |
|
Line 275 mdoc_vwarn(struct mdoc *mdoc, int ln, int pos, |
|
va_start(ap, fmt); |
va_start(ap, fmt); |
(void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap); |
(void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap); |
va_end(ap); |
va_end(ap); |
return((*mdoc->cb.mdoc_warn)(mdoc->data, ln, pos, type, buf)); |
return((*mdoc->cb.mdoc_warn)(mdoc->data, ln, pos, buf)); |
} |
} |
|
|
|
|
Line 299 mdoc_nerr(struct mdoc *mdoc, const struct mdoc_node *n |
|
Line 298 mdoc_nerr(struct mdoc *mdoc, const struct mdoc_node *n |
|
|
|
|
|
int |
int |
mdoc_warn(struct mdoc *mdoc, enum mdoc_warn type, |
mdoc_warn(struct mdoc *mdoc, const char *fmt, ...) |
const char *fmt, ...) |
|
{ |
{ |
char buf[256]; |
char buf[256]; |
va_list ap; |
va_list ap; |
Line 311 mdoc_warn(struct mdoc *mdoc, enum mdoc_warn type, |
|
Line 309 mdoc_warn(struct mdoc *mdoc, enum mdoc_warn type, |
|
va_start(ap, fmt); |
va_start(ap, fmt); |
(void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap); |
(void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap); |
va_end(ap); |
va_end(ap); |
return((*mdoc->cb.mdoc_warn)(mdoc->data, mdoc->last->line, |
return((*mdoc->cb.mdoc_warn)(mdoc->data, mdoc->last->line, |
mdoc->last->pos, type, buf)); |
mdoc->last->pos, buf)); |
} |
} |
|
|
|
|
Line 334 mdoc_err(struct mdoc *mdoc, const char *fmt, ...) |
|
Line 332 mdoc_err(struct mdoc *mdoc, const char *fmt, ...) |
|
|
|
|
|
int |
int |
mdoc_pwarn(struct mdoc *mdoc, int line, int pos, enum mdoc_warn type, |
mdoc_pwarn(struct mdoc *mdoc, int line, int pos, const char *fmt, ...) |
const char *fmt, ...) |
|
{ |
{ |
char buf[256]; |
char buf[256]; |
va_list ap; |
va_list ap; |
Line 346 mdoc_pwarn(struct mdoc *mdoc, int line, int pos, enum |
|
Line 343 mdoc_pwarn(struct mdoc *mdoc, int line, int pos, enum |
|
va_start(ap, fmt); |
va_start(ap, fmt); |
(void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap); |
(void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap); |
va_end(ap); |
va_end(ap); |
return((*mdoc->cb.mdoc_warn)(mdoc->data, |
return((*mdoc->cb.mdoc_warn)(mdoc->data, line, pos, buf)); |
line, pos, type, buf)); |
|
} |
} |
|
|
int |
int |
Line 442 node_append(struct mdoc *mdoc, struct mdoc_node *p) |
|
Line 438 node_append(struct mdoc *mdoc, struct mdoc_node *p) |
|
/* NOTREACHED */ |
/* NOTREACHED */ |
} |
} |
|
|
|
p->parent->nchild++; |
|
|
if ( ! mdoc_valid_pre(mdoc, p)) |
if ( ! mdoc_valid_pre(mdoc, p)) |
return(0); |
return(0); |
if ( ! mdoc_action_pre(mdoc, p)) |
if ( ! mdoc_action_pre(mdoc, p)) |
|
|
mdoc_node_free(struct mdoc_node *p) |
mdoc_node_free(struct mdoc_node *p) |
{ |
{ |
|
|
|
if (p->parent) |
|
p->parent->nchild--; |
if (p->string) |
if (p->string) |
free(p->string); |
free(p->string); |
if (p->args) |
if (p->args) |
Line 614 mdoc_node_freelist(struct mdoc_node *p) |
|
Line 614 mdoc_node_freelist(struct mdoc_node *p) |
|
if (p->next) |
if (p->next) |
mdoc_node_freelist(p->next); |
mdoc_node_freelist(p->next); |
|
|
|
assert(0 == p->nchild); |
mdoc_node_free(p); |
mdoc_node_free(p); |
} |
} |
|
|
Line 647 macrowarn(struct mdoc *m, int ln, const char *buf) |
|
Line 648 macrowarn(struct mdoc *m, int ln, const char *buf) |
|
return(mdoc_perr(m, ln, 1, |
return(mdoc_perr(m, ln, 1, |
"unknown macro: %s%s", |
"unknown macro: %s%s", |
buf, strlen(buf) > 3 ? "..." : "")); |
buf, strlen(buf) > 3 ? "..." : "")); |
return(mdoc_pwarn(m, ln, 1, WARN_SYNTAX, |
return(mdoc_pwarn(m, ln, 1, "unknown macro: %s%s", |
"unknown macro: %s%s", |
|
buf, strlen(buf) > 3 ? "..." : "")); |
buf, strlen(buf) > 3 ? "..." : "")); |
} |
} |
|
|