diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2014-04-23 16:34:50 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2014-04-23 16:34:50 +0000 |
| commit | 83a9b4af97fd1c631d24b734b275982561069bda (patch) | |
| tree | 62524c50ab6459c93a7fbe177e10232012a1de4c /mansearch.c | |
| parent | e1bb09be17d41880b391cdcbe9d968f8964928ff (diff) | |
| download | mandoc-83a9b4af97fd1c631d24b734b275982561069bda.tar.gz mandoc-83a9b4af97fd1c631d24b734b275982561069bda.tar.zst mandoc-83a9b4af97fd1c631d24b734b275982561069bda.zip | |
improve SQL style: avoid "SELECT *", be explicit in what columns we want;
suggested by espie@.
Diffstat (limited to 'mansearch.c')
| -rw-r--r-- | mansearch.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/mansearch.c b/mansearch.c index fb2de009..eec5ff13 100644 --- a/mansearch.c +++ b/mansearch.c @@ -1,4 +1,4 @@ -/* $Id: mansearch.c,v 1.34 2014/04/20 16:46:05 schwarze Exp $ */ +/* $Id: mansearch.c,v 1.35 2014/04/23 16:34:50 schwarze Exp $ */ /* * Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org> @@ -310,14 +310,15 @@ mansearch(const struct mansearch *search, sqlite3_finalize(s); c = sqlite3_prepare_v2(db, - "SELECT * FROM mlinks WHERE pageid=?" - " ORDER BY sec, arch, name", + "SELECT sec, arch, name, pageid FROM mlinks " + "WHERE pageid=? ORDER BY sec, arch, name", -1, &s, NULL); if (SQLITE_OK != c) fprintf(stderr, "%s\n", sqlite3_errmsg(db)); c = sqlite3_prepare_v2(db, - "SELECT * FROM keys WHERE pageid=? AND bits & ?", + "SELECT bits, key, pageid FROM keys " + "WHERE pageid=? AND bits & ?", -1, &s2, NULL); if (SQLITE_OK != c) fprintf(stderr, "%s\n", sqlite3_errmsg(db)); @@ -542,7 +543,8 @@ sql_statement(const struct expr *e) size_t sz; int needop; - sql = mandoc_strdup("SELECT * FROM mpages WHERE "); + sql = mandoc_strdup( + "SELECT desc, form, pageid FROM mpages WHERE "); sz = strlen(sql); for (needop = 0; NULL != e; e = e->next) { |