diff options
author | Ingo Schwarze <schwarze@openbsd.org> | 2015-04-18 17:53:21 +0000 |
---|---|---|
committer | Ingo Schwarze <schwarze@openbsd.org> | 2015-04-18 17:53:21 +0000 |
commit | d4d5d006d52687c2882e89b913c70967626da0e1 (patch) | |
tree | bc16a6725a85bb2b430e2ac2de6f2a83721bb6a8 /mandocdb.c | |
parent | afd3f3a3f381e6bd5e6803a730f57302dd9234d2 (diff) | |
download | mandoc-d4d5d006d52687c2882e89b913c70967626da0e1.tar.gz |
Delete the wrapper functions mdoc_meta(), man_meta(), mdoc_node(),
man_node() from the mandoc(3) semi-public interface and the internal
wrapper functions print_mdoc() and print_man() from the HTML formatters.
Minus 60 lines of code, no functional change.
Diffstat (limited to 'mandocdb.c')
-rw-r--r-- | mandocdb.c | 15 |
1 files changed, 7 insertions, 8 deletions
@@ -1195,19 +1195,18 @@ mpages_merge(struct mparse *mp) goto nextpage; } else if (man != NULL && man->macroset == MACROSET_MDOC) { mpage->form = FORM_SRC; - mpage->sec = mdoc_meta(man)->msec; + mpage->sec = man->meta.msec; mpage->sec = mandoc_strdup( mpage->sec == NULL ? "" : mpage->sec); - mpage->arch = mdoc_meta(man)->arch; + mpage->arch = man->meta.arch; mpage->arch = mandoc_strdup( mpage->arch == NULL ? "" : mpage->arch); - mpage->title = - mandoc_strdup(mdoc_meta(man)->title); + mpage->title = mandoc_strdup(man->meta.title); } else if (man != NULL && man->macroset == MACROSET_MAN) { mpage->form = FORM_SRC; - mpage->sec = mandoc_strdup(man_meta(man)->msec); + mpage->sec = mandoc_strdup(man->meta.msec); mpage->arch = mandoc_strdup(mlink->arch); - mpage->title = mandoc_strdup(man_meta(man)->title); + mpage->title = mandoc_strdup(man->meta.title); } else { mpage->form = FORM_CAT; mpage->sec = mandoc_strdup(mlink->dsec); @@ -1230,9 +1229,9 @@ mpages_merge(struct mparse *mp) assert(mpage->desc == NULL); if (man != NULL && man->macroset == MACROSET_MDOC) - parse_mdoc(mpage, mdoc_meta(man), mdoc_node(man)); + parse_mdoc(mpage, &man->meta, man->first); else if (man != NULL) - parse_man(mpage, man_meta(man), man_node(man)); + parse_man(mpage, &man->meta, man->first); else parse_cat(mpage, fd); if (mpage->desc == NULL) |