aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ext/fts1/fulltext.c20
-rw-r--r--manifest12
-rw-r--r--manifest.uuid2
3 files changed, 17 insertions, 17 deletions
diff --git a/ext/fts1/fulltext.c b/ext/fts1/fulltext.c
index b595a190f..e6034ba02 100644
--- a/ext/fts1/fulltext.c
+++ b/ext/fts1/fulltext.c
@@ -41,7 +41,7 @@ SQLITE_EXTENSION_INIT1
/* Write a 64-bit variable-length integer to memory starting at p[0].
* The length of data written will be between 1 and VARINT_MAX bytes.
* The number of bytes written is returned. */
-int putVarint(char *p, sqlite_int64 v){
+static int putVarint(char *p, sqlite_int64 v){
unsigned char *q = (unsigned char *) p;
sqlite_uint64 vu = v;
do{
@@ -56,7 +56,7 @@ int putVarint(char *p, sqlite_int64 v){
/* Read a 64-bit variable-length integer from memory starting at p[0].
* Return the number of bytes read, or 0 on error.
* The value is stored in *v. */
-int getVarint(const char *p, sqlite_int64 *v){
+static int getVarint(const char *p, sqlite_int64 *v){
const unsigned char *q = (const unsigned char *) p;
sqlite_uint64 x = 0, y = 1;
while( (*q & 0x80) == 0x80 ){
@@ -72,7 +72,7 @@ int getVarint(const char *p, sqlite_int64 *v){
return (int) (q - (unsigned char *)p);
}
-int getVarint32(const char *p, int *pi){
+static int getVarint32(const char *p, int *pi){
sqlite_int64 i;
int ret = getVarint(p, &i);
*pi = (int) i;
@@ -544,7 +544,7 @@ typedef enum fulltext_statement {
** query joins a virtual table to itself? If so perhaps we should
** move some of these to the cursor object.
*/
-const char *fulltext_zStatement[MAX_STMT] = {
+static const char *fulltext_zStatement[MAX_STMT] = {
/* CONTENT_INSERT */ "insert into %_content (rowid, content) values (?, ?)",
/* CONTENT_SELECT */ "select content from %_content where rowid = ?",
/* CONTENT_DELETE */ "delete from %_content where rowid = ?",
@@ -1117,7 +1117,7 @@ typedef struct Query {
QueryTerm *pTerm;
} Query;
-void query_add(Query *q, int is_phrase, const char *zTerm){
+static void query_add(Query *q, int is_phrase, const char *zTerm){
QueryTerm *t;
++q->nTerms;
q->pTerm = realloc(q->pTerm, q->nTerms * sizeof(q->pTerm[0]));
@@ -1126,7 +1126,7 @@ void query_add(Query *q, int is_phrase, const char *zTerm){
t->zTerm = zTerm;
}
-void query_free(Query *q){
+static void query_free(Query *q){
int i;
for(i = 0; i < q->nTerms; ++i){
free((void *) q->pTerm[i].zTerm);
@@ -1134,9 +1134,9 @@ void query_free(Query *q){
free(q->pTerm);
}
-int tokenize_segment(sqlite3_tokenizer *pTokenizer,
- const char *zQuery, int in_phrase,
- Query *pQuery){
+static int tokenize_segment(sqlite3_tokenizer *pTokenizer,
+ const char *zQuery, int in_phrase,
+ Query *pQuery){
sqlite3_tokenizer_module *pModule = pTokenizer->pModule;
sqlite3_tokenizer_cursor *pCursor;
int is_first = 1;
@@ -1162,7 +1162,7 @@ int tokenize_segment(sqlite3_tokenizer *pTokenizer,
}
/* Parse a query string, yielding a Query object. */
-int parse_query(fulltext_vtab *v, const char *zQuery, Query *pQuery){
+static int parse_query(fulltext_vtab *v, const char *zQuery, Query *pQuery){
char *zQuery1 = string_dup(zQuery);
int in_phrase = 0;
char *s = zQuery1;
diff --git a/manifest b/manifest
index 096c9547f..15b26e5db 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\shi-bit\scharacters\sdelimiters.\s\sThis\sis\sa\sstopgap\suntil\sthe\stokenizer\nand\sfulltext.c\srecognize\sUTF-8\scorrectly.\s(CVS\s3370)
-D 2006-08-28T20:08:57
+C Make\sstatic\ssome\ssymbols\swhich\sshouldn't\shave\sbeen\sexported.\s(CVS\s3371)
+D 2006-08-28T23:46:02
F Makefile.in 8e7f9ecebab2c6e0f3db20ff129a8f9405ab64f8
F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -21,7 +21,7 @@ F ext/README.txt 913a7bd3f4837ab14d7e063304181787658b14e1
F ext/fts1/README.txt 20ac73b006a70bcfd80069bdaf59214b6cf1db5e
F ext/fts1/ft_hash.c 3927bd880e65329bdc6f506555b228b28924921b
F ext/fts1/ft_hash.h 1a35e654a235c2c662d3ca0dfc3138ad60b8b7d5
-F ext/fts1/fulltext.c 2bf058ab2835531fa5fee4242c51eda19cfe88a7
+F ext/fts1/fulltext.c d935e600d87bc86b7d64f55c7520ea41d6034c5c
F ext/fts1/fulltext.h 08525a47852d1d62a0be81d3fc3fe2d23b094efd
F ext/fts1/simple_tokenizer.c 22501944cd77686be592382692051514ef228ec6
F ext/fts1/tokenizer.h 0c53421b832366d20d720d21ea3e1f6e66a36ef9
@@ -388,7 +388,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 4a74838eac5b939058c8aebef30113c5bdb354e5
-R 4dd7009178412e6bfe81d5289193af1c
+P ca850d3d80f67672172d11392fcdf60bfbb94c02
+R f983b00fc1cd0fd5bcd1ed5dd6fe41c1
U shess
-Z 847ff5b71d65a558b08ddb2fff6d70a4
+Z a627c5db236e5e7e63a2a59bb168ce0e
diff --git a/manifest.uuid b/manifest.uuid
index 2bbd5db09..d075c2742 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ca850d3d80f67672172d11392fcdf60bfbb94c02 \ No newline at end of file
+58006e38af760b53cf72bf127d7c7b8a619a1282 \ No newline at end of file