summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--roff.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/roff.c b/roff.c
index 355e5488..45197765 100644
--- a/roff.c
+++ b/roff.c
@@ -448,14 +448,9 @@ roff_free1(struct roff *r)
void
roff_reset(struct roff *r)
{
- int i;
roff_free1(r);
-
r->control = 0;
-
- for (i = 0; i < PREDEFS_MAX; i++)
- roff_setstr(r, predefs[i].name, predefs[i].str, 0);
}
@@ -472,7 +467,6 @@ struct roff *
roff_alloc(enum mparset type, struct mparse *parse, int quick)
{
struct roff *r;
- int i;
r = mandoc_calloc(1, sizeof(struct roff));
r->parsetype = type;
@@ -482,9 +476,6 @@ roff_alloc(enum mparset type, struct mparse *parse, int quick)
roffhash_init();
- for (i = 0; i < PREDEFS_MAX; i++)
- roff_setstr(r, predefs[i].name, predefs[i].str, 0);
-
return(r);
}
@@ -1903,12 +1894,18 @@ static const char *
roff_getstrn(const struct roff *r, const char *name, size_t len)
{
const struct roffkv *n;
+ int i;
for (n = r->strtab; n; n = n->next)
if (0 == strncmp(name, n->key.p, len) &&
'\0' == n->key.p[(int)len])
return(n->val.p);
+ for (i = 0; i < PREDEFS_MAX; i++)
+ if (0 == strncmp(name, predefs[i].name, len) &&
+ '\0' == predefs[i].name[(int)len])
+ return(predefs[i].str);
+
return(NULL);
}