Don't retain the search query in the resulting manual links.

[mandoc.git] / mansearch.c

diff --git a/mansearch.c b/mansearch.c
index 9832d5771094d260c4b8b595e85a3014dc48305a..e6e5d997b3cb5e989e8381f16124ad5cabd0435a 100644 (file)
--- a/mansearch.c
+++ b/mansearch.c
@@ -1,4 +1,4 @@
-/*     $Id: mansearch.c,v 1.62 2015/11/07 14:22:29 schwarze Exp $ */
+/*     $Id: mansearch.c,v 1.63 2015/11/26 07:42:11 schwarze Exp $ */
 /*
  * Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -54,17 +54,17 @@ extern const char *const mansearch_keynames[];
 #define        SQL_BIND_TEXT(_db, _s, _i, _v) \
        do { if (SQLITE_OK != sqlite3_bind_text \
                ((_s), (_i)++, (_v), -1, SQLITE_STATIC)) \
-               warnx("%s", sqlite3_errmsg((_db))); \
+               errx((int)MANDOCLEVEL_SYSERR, "%s", sqlite3_errmsg((_db))); \
        } while (0)
 #define        SQL_BIND_INT64(_db, _s, _i, _v) \
        do { if (SQLITE_OK != sqlite3_bind_int64 \
                ((_s), (_i)++, (_v))) \
-               warnx("%s", sqlite3_errmsg((_db))); \
+               errx((int)MANDOCLEVEL_SYSERR, "%s", sqlite3_errmsg((_db))); \
        } while (0)
 #define        SQL_BIND_BLOB(_db, _s, _i, _v) \
        do { if (SQLITE_OK != sqlite3_bind_blob \
                ((_s), (_i)++, (&_v), sizeof(_v), SQLITE_STATIC)) \
-               warnx("%s", sqlite3_errmsg((_db))); \
+               errx((int)MANDOCLEVEL_SYSERR, "%s", sqlite3_errmsg((_db))); \
        } while (0)
 
 struct expr {
@@ -262,7 +262,8 @@ mansearch(const struct mansearch *search,
                j = 1;
                c = sqlite3_prepare_v2(db, sql, -1, &s, NULL);
                if (SQLITE_OK != c)
-                       warnx("%s", sqlite3_errmsg(db));
+                       errx((int)MANDOCLEVEL_SYSERR,
+                           "%s", sqlite3_errmsg(db));
 
                for (ep = e; NULL != ep; ep = ep->next) {
                        if (NULL == ep->substr) {
@@ -312,14 +313,16 @@ mansearch(const struct mansearch *search,
                    "WHERE pageid=? ORDER BY sec, arch, name",
                    -1, &s, NULL);
                if (SQLITE_OK != c)
-                       warnx("%s", sqlite3_errmsg(db));
+                       errx((int)MANDOCLEVEL_SYSERR,
+                           "%s", sqlite3_errmsg(db));
 
                c = sqlite3_prepare_v2(db,
                    "SELECT bits, key, pageid FROM keys "
                    "WHERE pageid=? AND bits & ?",
                    -1, &s2, NULL);
                if (SQLITE_OK != c)
-                       warnx("%s", sqlite3_errmsg(db));
+                       errx((int)MANDOCLEVEL_SYSERR,
+                           "%s", sqlite3_errmsg(db));
 
                for (mp = ohash_first(&htab, &idx);
                                NULL != mp;