Module Name: src
Committed By: rin
Date: Thu Aug 3 07:49:23 UTC 2023
Modified Files:
src/usr.sbin/makemandb: apropos-utils.c apropos.c
custom_apropos_tokenizer.c fts3_tokenizer.h whatis.c
Log Message:
makemandb: trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/usr.sbin/makemandb/apropos-utils.c
cvs rdiff -u -r1.26 -r1.27 src/usr.sbin/makemandb/apropos.c
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/makemandb/custom_apropos_tokenizer.c
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/makemandb/fts3_tokenizer.h
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/makemandb/whatis.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/makemandb/apropos-utils.c
diff -u src/usr.sbin/makemandb/apropos-utils.c:1.50 src/usr.sbin/makemandb/apropos-utils.c:1.51
--- src/usr.sbin/makemandb/apropos-utils.c:1.50 Sun Sep 11 20:32:37 2022
+++ src/usr.sbin/makemandb/apropos-utils.c Thu Aug 3 07:49:23 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: apropos-utils.c,v 1.50 2022/09/11 20:32:37 gutteridge Exp $ */
+/* $NetBSD: apropos-utils.c,v 1.51 2023/08/03 07:49:23 rin Exp $ */
/*-
* Copyright (c) 2011 Abhinav Upadhyay <er.abhinav.upadh...@gmail.com>
* All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: apropos-utils.c,v 1.50 2022/09/11 20:32:37 gutteridge Exp $");
+__RCSID("$NetBSD: apropos-utils.c,v 1.51 2023/08/03 07:49:23 rin Exp $");
#include <sys/queue.h>
#include <sys/stat.h>
@@ -202,11 +202,11 @@ create_db(sqlite3 *db)
"CREATE VIRTUAL TABLE mandb USING fts4(section, name, "
"name_desc, desc, lib, return_vals, env, files, "
"exit_status, diagnostics, errors, md5_hash UNIQUE, machine, "
-#ifndef APROPOS_DEBUG
+#ifndef APROPOS_DEBUG
"compress=zip, uncompress=unzip, tokenize=custom_apropos_tokenizer, "
#else
"tokenize=porter, "
-#endif
+#endif
"notindexed=section, notindexed=md5_hash); "
//mandb_meta
"CREATE TABLE IF NOT EXISTS mandb_meta(device, inode, mtime, "
Index: src/usr.sbin/makemandb/apropos.c
diff -u src/usr.sbin/makemandb/apropos.c:1.26 src/usr.sbin/makemandb/apropos.c:1.27
--- src/usr.sbin/makemandb/apropos.c:1.26 Thu May 19 04:08:03 2022
+++ src/usr.sbin/makemandb/apropos.c Thu Aug 3 07:49:23 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: apropos.c,v 1.26 2022/05/19 04:08:03 gutteridge Exp $ */
+/* $NetBSD: apropos.c,v 1.27 2023/08/03 07:49:23 rin Exp $ */
/*-
* Copyright (c) 2011 Abhinav Upadhyay <er.abhinav.upadh...@gmail.com>
* All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: apropos.c,v 1.26 2022/05/19 04:08:03 gutteridge Exp $");
+__RCSID("$NetBSD: apropos.c,v 1.27 2023/08/03 07:49:23 rin Exp $");
#include <err.h>
#include <signal.h>
@@ -275,7 +275,7 @@ main(int argc, char *argv[])
if (pc == -1)
err(EXIT_FAILURE, "pclose error");
- /*
+ /*
* Something wrong with the database, writing output, or a non-existent
* pager.
*/
Index: src/usr.sbin/makemandb/custom_apropos_tokenizer.c
diff -u src/usr.sbin/makemandb/custom_apropos_tokenizer.c:1.4 src/usr.sbin/makemandb/custom_apropos_tokenizer.c:1.5
--- src/usr.sbin/makemandb/custom_apropos_tokenizer.c:1.4 Sun Dec 5 08:03:32 2021
+++ src/usr.sbin/makemandb/custom_apropos_tokenizer.c Thu Aug 3 07:49:23 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: custom_apropos_tokenizer.c,v 1.4 2021/12/05 08:03:32 wiz Exp $ */
+/* $NetBSD: custom_apropos_tokenizer.c,v 1.5 2023/08/03 07:49:23 rin Exp $ */
/*
** 2006 September 30
**
@@ -72,7 +72,7 @@ aproposPorterCreate(int argc, const char
/*
* Destroy a tokenizer
*/
-static int
+static int
aproposPorterDestroy(sqlite3_tokenizer * pTokenizer)
{
free(pTokenizer);
@@ -82,10 +82,10 @@ aproposPorterDestroy(sqlite3_tokenizer *
/*
* Prepare to begin tokenizing a particular string. The input
* string to be tokenized is zInput[0..nInput-1]. A cursor
- * used to incrementally tokenize this string is returned in
+ * used to incrementally tokenize this string is returned in
* *ppCursor.
*/
-static int
+static int
aproposPorterOpen(
sqlite3_tokenizer * pTokenizer, /* The tokenizer */
const char *zInput, int nInput, /* String to be tokenized */
@@ -114,7 +114,7 @@ aproposPorterOpen(
* Close a tokenization cursor previously opened by a call to
* aproposPorterOpen() above.
*/
-static int
+static int
aproposPorterClose(sqlite3_tokenizer_cursor *pCursor)
{
custom_apropos_tokenizer_cursor *c = (custom_apropos_tokenizer_cursor *) pCursor;
@@ -134,7 +134,7 @@ static const char cType[] = {
/*
* isConsonant() and isVowel() determine if their first character in
* the string they point to is a consonant or a vowel, according
- * to Porter ruls.
+ * to Porter ruls.
*
* A consonate is any letter other than 'a', 'e', 'i', 'o', or 'u'.
* 'Y' is a consonant unless it follows another consonant,
@@ -146,7 +146,7 @@ static const char cType[] = {
*/
static int isVowel(const char*);
-static int
+static int
isConsonant(const char *z)
{
int j;
@@ -160,7 +160,7 @@ isConsonant(const char *z)
return z[1] == 0 || isVowel(z + 1);
}
-static int
+static int
isVowel(const char *z)
{
int j;
@@ -193,7 +193,7 @@ isVowel(const char *z)
* In this routine z[] is in reverse order. So we are really looking
* for an instance of a consonant followed by a vowel.
*/
-static int
+static int
m_gt_0(const char *z)
{
while (isVowel(z)) {
@@ -210,7 +210,7 @@ m_gt_0(const char *z)
/* Like mgt0 above except we are looking for a value of m which is
* exactly 1
*/
-static int
+static int
m_eq_1(const char *z)
{
while (isVowel(z)) {
@@ -237,7 +237,7 @@ m_eq_1(const char *z)
/* Like mgt0 above except we are looking for a value of m>1 instead
* or m>0
*/
-static int
+static int
m_gt_1(const char *z)
{
while (isVowel(z)) {
@@ -264,7 +264,7 @@ m_gt_1(const char *z)
/*
* Return TRUE if there is a vowel anywhere within z[0..n-1]
*/
-static int
+static int
hasVowel(const char *z)
{
while (isConsonant(z)) {
@@ -279,7 +279,7 @@ hasVowel(const char *z)
* The text is reversed here. So we are really looking at
* the first two characters of z[].
*/
-static int
+static int
doubleConsonant(const char *z)
{
return isConsonant(z) && z[0] == z[1];
@@ -293,7 +293,7 @@ doubleConsonant(const char *z)
* The word is reversed here. So we are really checking the
* first three letters and the first one cannot be in [wxy].
*/
-static int
+static int
star_oh(const char *z)
{
return isConsonant(z) &&
@@ -304,17 +304,17 @@ star_oh(const char *z)
/*
* If the word ends with zFrom and xCond() is true for the stem
- * of the word that precedes the zFrom ending, then change the
+ * of the word that precedes the zFrom ending, then change the
* ending to zTo.
*
* The input word *pz and zFrom are both in reverse order. zTo
- * is in normal order.
+ * is in normal order.
*
* Return TRUE if zFrom matches. Return FALSE if zFrom does not
* match. Not that TRUE is returned even if xCond() fails and
* no substitution occurs.
*/
-static int
+static int
stem(
char **pz, /* The word being stemmed (Reversed) */
const char *zFrom, /* If the ending matches this... (Reversed) */
@@ -346,7 +346,7 @@ stem(
* it contains digits) then word is truncated to 20 or 6 bytes
* by taking 10 or 3 bytes from the beginning and end.
*/
-static void
+static void
copy_stemmer(const char *zIn, size_t nIn, char *zOut, size_t *pnOut)
{
size_t i, mx, j;
@@ -387,16 +387,16 @@ copy_stemmer(const char *zIn, size_t nIn
* word contains digits, 3 bytes are taken from the beginning and
* 3 bytes from the end. For long words without digits, 10 bytes
* are taken from each end. US-ASCII case folding still applies.
- *
- * If the input word contains not digits but does characters not
- * in [a-zA-Z] then no stemming is attempted and this routine just
+ *
+ * If the input word contains not digits but does characters not
+ * in [a-zA-Z] then no stemming is attempted and this routine just
* copies the input into the input into the output with US-ASCII
* case folding.
*
* Stemming never increases the length of the word. So there is
* no chance of overflowing the zOut buffer.
*/
-static void
+static void
porter_stemmer(const char *zIn, size_t nIn, char *zOut, size_t *pnOut)
{
size_t i, j;
@@ -632,7 +632,7 @@ porter_stemmer(const char *zIn, size_t n
/*
* Based on whether the input word is in the nostem list or not
* call porter stemmer to stem it, or call copy_stemmer to keep it
- * as it is (copy_stemmer converts simply converts it to lower case)
+ * as it is (copy_stemmer converts simply converts it to lower case)
* Returns SQLITE_OK if stemming is successful, an error code for
* any errors
*/
@@ -679,7 +679,7 @@ static const char porterIdChar[] = {
* Extract the next token from a tokenization cursor. The cursor must
* have been opened by a prior call to aproposPorterOpen().
*/
-static int
+static int
aproposPorterNext(
sqlite3_tokenizer_cursor *pCursor, /* Cursor returned by aproposPorterOpen */
const char **pzToken, /* OUT: *pzToken is the token text */
@@ -716,8 +716,8 @@ aproposPorterNext(
return SQLITE_NOMEM;
c->zToken = pNew;
}
-
- size_t temp;
+
+ size_t temp;
int stemStatus = do_stem(&z[iStartOffset], n, c->zToken, &temp);
*pnBytes = temp;
if (stemStatus != SQLITE_OK)
@@ -750,7 +750,7 @@ static const sqlite3_tokenizer_module ap
* Allocate a new porter tokenizer. Return a pointer to the new
* tokenizer in *ppModule
*/
-void
+void
get_custom_apropos_tokenizer(sqlite3_tokenizer_module const ** ppModule)
{
*ppModule = &aproposPorterTokenizerModule;
Index: src/usr.sbin/makemandb/fts3_tokenizer.h
diff -u src/usr.sbin/makemandb/fts3_tokenizer.h:1.1 src/usr.sbin/makemandb/fts3_tokenizer.h:1.2
--- src/usr.sbin/makemandb/fts3_tokenizer.h:1.1 Sun Jun 18 16:24:10 2017
+++ src/usr.sbin/makemandb/fts3_tokenizer.h Thu Aug 3 07:49:23 2023
@@ -35,7 +35,7 @@
** When an fts3 table is created, it passes any arguments passed to
** the tokenizer clause of the CREATE VIRTUAL TABLE statement to the
** sqlite3_tokenizer_module.xCreate() function of the requested tokenizer
-** implementation. The xCreate() function in turn returns an
+** implementation. The xCreate() function in turn returns an
** sqlite3_tokenizer structure representing the specific tokenizer to
** be used for the fts3 table (customized by the tokenizer clause arguments).
**
@@ -67,7 +67,7 @@ struct sqlite3_tokenizer_module {
** then argc is set to 2, and the argv[] array contains pointers
** to the strings "arg1" and "arg2".
**
- ** This method should return either SQLITE_OK (0), or an SQLite error
+ ** This method should return either SQLITE_OK (0), or an SQLite error
** code. If SQLITE_OK is returned, then *ppTokenizer should be set
** to point at the newly created tokenizer structure. The generic
** sqlite3_tokenizer.pModule variable should not be initialized by
@@ -88,7 +88,7 @@ struct sqlite3_tokenizer_module {
/*
** Create a tokenizer cursor to tokenize an input buffer. The caller
** is responsible for ensuring that the input buffer remains valid
- ** until the cursor is closed (using the xClose() method).
+ ** until the cursor is closed (using the xClose() method).
*/
int (*xOpen)(
sqlite3_tokenizer *pTokenizer, /* Tokenizer object */
@@ -97,7 +97,7 @@ struct sqlite3_tokenizer_module {
);
/*
- ** Destroy an existing tokenizer cursor. The fts3 module calls this
+ ** Destroy an existing tokenizer cursor. The fts3 module calls this
** method exactly once for each successful call to xOpen().
*/
int (*xClose)(sqlite3_tokenizer_cursor *pCursor);
@@ -108,7 +108,7 @@ struct sqlite3_tokenizer_module {
** "OUT" variables identified below, or SQLITE_DONE to indicate that
** the end of the buffer has been reached, or an SQLite error code.
**
- ** *ppToken should be set to point at a buffer containing the
+ ** *ppToken should be set to point at a buffer containing the
** normalized version of the token (i.e. after any case-folding and/or
** stemming has been performed). *pnBytes should be set to the length
** of this buffer in bytes. The input text that generated the token is
@@ -120,7 +120,7 @@ struct sqlite3_tokenizer_module {
**
** The buffer *ppToken is set to point at is managed by the tokenizer
** implementation. It is only required to be valid until the next call
- ** to xNext() or xClose().
+ ** to xNext() or xClose().
*/
/* TODO(shess) current implementation requires pInput to be
** nul-terminated. This should either be fixed, or pInput/nBytes
@@ -138,7 +138,7 @@ struct sqlite3_tokenizer_module {
** Methods below this point are only available if iVersion>=1.
*/
- /*
+ /*
** Configure the language id of a tokenizer cursor.
*/
int (*xLanguageid)(sqlite3_tokenizer_cursor *pCsr, int iLangid);
Index: src/usr.sbin/makemandb/whatis.c
diff -u src/usr.sbin/makemandb/whatis.c:1.9 src/usr.sbin/makemandb/whatis.c:1.10
--- src/usr.sbin/makemandb/whatis.c:1.9 Sat May 18 10:28:57 2019
+++ src/usr.sbin/makemandb/whatis.c Thu Aug 3 07:49:23 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: whatis.c,v 1.9 2019/05/18 10:28:57 leot Exp $ */
+/* $NetBSD: whatis.c,v 1.10 2023/08/03 07:49:23 rin Exp $ */
/*-
* Copyright (c) 2012 Joerg Sonnenberger <jo...@netbsd.org>
* All rights reserved.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: whatis.c,v 1.9 2019/05/18 10:28:57 leot Exp $");
+__RCSID("$NetBSD: whatis.c,v 1.10 2023/08/03 07:49:23 rin Exp $");
#include <err.h>
#include <stdio.h>
@@ -49,7 +49,7 @@ static int
whatis(sqlite3 *db, const char *cmd)
{
static const char sqlstr[] = "SELECT link AS name, section, name_desc"
- " FROM mandb_links WHERE link=?"
+ " FROM mandb_links WHERE link=?"
" UNION"
" SELECT name, section, name_desc"
" FROM mandb WHERE name MATCH ? AND name=? COLLATE NOCASE"
