mandoc/roff.c - diff

Return to roff.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/roff.c between version 1.46 and 1.47

version 1.46, 2008/12/06 19:41:41

version 1.47, 2008/12/06 21:10:31

Line 92 static int roffparse(struct rofftree *, char *);

static int textparse(struct rofftree *, char *);

static int roffdata(struct rofftree *, int, char *);

static int roffspecial(struct rofftree *, int,

const char *, size_t, char **);

const char *, const int *,

const char **, size_t, char **);

static int roffsetname(struct rofftree *, char **);

#ifdef __linux__

Line 618 roffnode_free(struct rofftree *tree)

Line 619 roffnode_free(struct rofftree *tree)

static int

roffspecial(struct rofftree *tree, int tok,

roffspecial(struct rofftree *tree, int tok, const char *start,

const char *start, size_t sz, char **ordp)

const int *argc, const char **argv,

size_t sz, char **ordp)

{

switch (tok) {

Line 689 roffspecial(struct rofftree *tree, int tok,

Line 691 roffspecial(struct rofftree *tree, int tok,

break;

}

return((*tree->cb.roffspecial)

return((*tree->cb.roffspecial)(tree->arg, tok,

(tree->arg, tok, tree->cur, ordp));

tree->cur, argc, argv, ordp));

}

Line 987 roff_Ns(ROFFCALL_ARGS)

Line 989 roff_Ns(ROFFCALL_ARGS)

first = (*argv++ == tree->cur);

morep[0] = NULL;

if ( ! roffspecial(tree, tok, *argv, 0, morep))

if ( ! roffspecial(tree, tok, *argv, NULL, NULL, 0, morep))

return(0);

while (*argv) {

Line 1199 roff_ordered(ROFFCALL_ARGS)

Line 1201 roff_ordered(ROFFCALL_ARGS)

return(0);

if (NULL == *argv)

return(roffspecial(tree, tok, p, 0, ordp));

return(roffspecial(tree, tok, p, argcp,

(const char **)argvp, 0, ordp));

i = 0;

while (*argv && i < ROFF_MAXLINEARG) {

Line 1215 roff_ordered(ROFFCALL_ARGS)

Line 1218 roff_ordered(ROFFCALL_ARGS)

if (ROFF_MAX == c)

break;

if ( ! roffspecial(tree, tok, p, (size_t)i, ordp))

if ( ! roffspecial(tree, tok, p, argcp,

(const char **)argvp,

(size_t)i, ordp))

return(0);

return(roffcall(tree, c, argv));

Line 1224 roff_ordered(ROFFCALL_ARGS)

Line 1229 roff_ordered(ROFFCALL_ARGS)

assert(i != ROFF_MAXLINEARG);

ordp[i] = NULL;

if ( ! roffspecial(tree, tok, p, (size_t)i, ordp))

if ( ! roffspecial(tree, tok, p, argcp,

(const char**)argvp,

(size_t)i, ordp))

return(0);

/* FIXME: error if there's stuff after the punctuation. */

CVSweb