diff options
| author | plunky <plunky@NetBSD.org> | 2015-04-07 17:47:10 +0000 |
|---|---|---|
| committer | plunky <plunky@NetBSD.org> | 2015-04-07 17:47:10 +0000 |
| commit | b1769e00d3fea108471aa89fa2ccdde90e8fa8f7 (patch) | |
| tree | 4fd82ce84cb2be48e8980359f5508a01792de797 /usr.sbin/makemandb | |
| parent | 30cf89233ae7f1fee3c5f704effc6f9eb37a36c4 (diff) | |
largely apply patch from PR bin/47392 by Abhinav Upadhyay
change some comments to reflect reality, a variable name to enhance
readability, and adds an assert for safety.
Diffstat (limited to 'usr.sbin/makemandb')
| -rw-r--r-- | usr.sbin/makemandb/makemandb.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/usr.sbin/makemandb/makemandb.c b/usr.sbin/makemandb/makemandb.c index ddd327d9d17..863b3d682f5 100644 --- a/usr.sbin/makemandb/makemandb.c +++ b/usr.sbin/makemandb/makemandb.c @@ -1,4 +1,4 @@ -/* $NetBSD: makemandb.c,v 1.28 2015/03/12 14:57:18 joerg Exp $ */ +/* $NetBSD: makemandb.c,v 1.29 2015/04/07 17:47:10 plunky Exp $ */ /* * Copyright (c) 2011 Abhinav Upadhyay <er.abhinav.upadhyay@gmail.com> * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv> @@ -17,7 +17,7 @@ */ #include <sys/cdefs.h> -__RCSID("$NetBSD: makemandb.c,v 1.28 2015/03/12 14:57:18 joerg Exp $"); +__RCSID("$NetBSD: makemandb.c,v 1.29 2015/04/07 17:47:10 plunky Exp $"); #include <sys/stat.h> #include <sys/types.h> @@ -75,7 +75,7 @@ typedef struct mandb_rec { secbuff errors; // ERRORS char section[2]; - int xr_found; + int xr_found; // To track whether a .Xr was seen when parsing a section /* Fields for mandb_meta table */ char *md5_hash; @@ -973,12 +973,8 @@ pmdoc_Nm(const struct mdoc_node *n, mandb_rec *rec) static void pmdoc_Nd(const struct mdoc_node *n, mandb_rec *rec) { - /* - * A static variable for keeping track of whether a Xr macro was seen - * previously. - */ char *buf = NULL; - char *temp; + char *name; char *nd_text; if (n == NULL || (n->type != MDOC_TEXT && n->tok == MDOC_MAX)) @@ -988,11 +984,12 @@ pmdoc_Nd(const struct mdoc_node *n, mandb_rec *rec) if (rec->xr_found && n->next) { /* * An Xr macro was seen previously, so parse this - * and the next node. + * and the next node, as "Name(Section)". */ - temp = n->string; + name = n->string; n = n->next; - easprintf(&buf, "%s(%s)", temp, n->string); + assert(n->type == MDOC_TEXT); + easprintf(&buf, "%s(%s)", name, n->string); concat(&rec->name_desc, buf); free(buf); } else { |
