From 1ac47583c44066590d7952c4e31d4b736ae27fca Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Thu, 22 Nov 2018 12:01:46 +0000 Subject: In apropos(1) output, stop sorting .Nm search results by name priorities (bits). The obscure feature wasn't documented and merely confused people - for example Edward Tomasz Napierala , see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=227408. Smaller patch provided by Yuri Pankov , but i'm also retiring the now unused "bits" member from struct manpage. Simplification is good. --- mansearch.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'mansearch.c') diff --git a/mansearch.c b/mansearch.c index 7ac8bcd2..d1552dc4 100644 --- a/mansearch.c +++ b/mansearch.c @@ -201,7 +201,6 @@ mansearch(const struct mansearch *search, mpage->names = buildnames(page); mpage->output = buildoutput(outkey, page); mpage->ipath = i; - mpage->bits = rp->bits; mpage->sec = *page->sect - '0'; if (mpage->sec < 0 || mpage->sec > 9) mpage->sec = 10; @@ -296,10 +295,8 @@ manmerge_term(struct expr *e, struct ohash *htab) break; slot = ohash_lookup_memory(htab, (char *)&res, sizeof(res.page), res.page); - if ((rp = ohash_find(htab, slot)) != NULL) { - rp->bits |= res.bits; + if ((rp = ohash_find(htab, slot)) != NULL) continue; - } rp = mandoc_malloc(sizeof(*rp)); *rp = res; ohash_insert(htab, slot, rp); @@ -412,8 +409,7 @@ manpage_compare(const void *vp1, const void *vp2) mp1 = vp1; mp2 = vp2; - if ((diff = mp2->bits - mp1->bits) || - (diff = mp1->sec - mp2->sec)) + if ((diff = mp1->sec - mp2->sec)) return diff; /* Fall back to alphabetic ordering of names. */ -- cgit