version 1.182, 2011/03/07 01:35:51 |
version 1.185, 2011/03/20 16:02:05 |
Line 138 mdoc_free1(struct mdoc *mdoc) |
|
Line 138 mdoc_free1(struct mdoc *mdoc) |
|
free(mdoc->meta.vol); |
free(mdoc->meta.vol); |
if (mdoc->meta.msec) |
if (mdoc->meta.msec) |
free(mdoc->meta.msec); |
free(mdoc->meta.msec); |
|
if (mdoc->meta.date) |
|
free(mdoc->meta.date); |
} |
} |
|
|
|
|
Line 190 mdoc_free(struct mdoc *mdoc) |
|
Line 192 mdoc_free(struct mdoc *mdoc) |
|
* Allocate volatile and non-volatile parse resources. |
* Allocate volatile and non-volatile parse resources. |
*/ |
*/ |
struct mdoc * |
struct mdoc * |
mdoc_alloc(struct regset *regs, void *data, mandocmsg msg) |
mdoc_alloc(struct regset *regs, struct mparse *parse) |
{ |
{ |
struct mdoc *p; |
struct mdoc *p; |
|
|
p = mandoc_calloc(1, sizeof(struct mdoc)); |
p = mandoc_calloc(1, sizeof(struct mdoc)); |
|
|
p->msg = msg; |
p->parse = parse; |
p->data = data; |
|
p->regs = regs; |
p->regs = regs; |
|
|
mdoc_hash_init(); |
mdoc_hash_init(); |
Line 300 mdoc_parseln(struct mdoc *m, int ln, char *buf, int of |
|
Line 301 mdoc_parseln(struct mdoc *m, int ln, char *buf, int of |
|
mdoc_ptext(m, ln, buf, offs)); |
mdoc_ptext(m, ln, buf, offs)); |
} |
} |
|
|
|
|
int |
int |
mdoc_vmsg(struct mdoc *mdoc, enum mandocerr t, |
|
int ln, int pos, const char *fmt, ...) |
|
{ |
|
char buf[256]; |
|
va_list ap; |
|
|
|
va_start(ap, fmt); |
|
vsnprintf(buf, sizeof(buf) - 1, fmt, ap); |
|
va_end(ap); |
|
|
|
return((*mdoc->msg)(t, mdoc->data, ln, pos, buf)); |
|
} |
|
|
|
|
|
int |
|
mdoc_macro(MACRO_PROT_ARGS) |
mdoc_macro(MACRO_PROT_ARGS) |
{ |
{ |
assert(tok < MDOC_MAX); |
assert(tok < MDOC_MAX); |
Line 343 mdoc_macro(MACRO_PROT_ARGS) |
|
Line 328 mdoc_macro(MACRO_PROT_ARGS) |
|
if (NULL == m->meta.os) |
if (NULL == m->meta.os) |
m->meta.os = mandoc_strdup("LOCAL"); |
m->meta.os = mandoc_strdup("LOCAL"); |
if (NULL == m->meta.date) |
if (NULL == m->meta.date) |
m->meta.date = mandoc_normdate(NULL, |
m->meta.date = mandoc_normdate |
m->msg, m->data, line, ppos); |
(m->parse, NULL, line, ppos); |
m->flags |= MDOC_PBODY; |
m->flags |= MDOC_PBODY; |
} |
} |
|
|
Line 847 mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off |
|
Line 832 mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off |
|
|
|
tok = (j > 1 || j < 4) ? mdoc_hash_find(mac) : MDOC_MAX; |
tok = (j > 1 || j < 4) ? mdoc_hash_find(mac) : MDOC_MAX; |
if (MDOC_MAX == tok) { |
if (MDOC_MAX == tok) { |
mdoc_vmsg(m, MANDOCERR_MACRO, ln, sv, "%s", buf + sv - 1); |
mandoc_vmsg(MANDOCERR_MACRO, m->parse, |
|
ln, sv, "%s", buf + sv - 1); |
return(1); |
return(1); |
} |
} |
|
|