Update MSCV makefile for the fts3tokenize virtual table. Clear some

harmless compiler warnings in the fts3tokenize code.

FossilOrigin-Name: 2b3fed09eb89f1e9d6a5f7487ef526b46eb51490

diff --git a/Makefile.msc b/Makefile.msc
index 8c91e86bc8b940aa5194af333a0a2e561aede006..47f815e677435297775a1255cd77f3c2d7621489 100644 (file)
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -478,7 +478,7 @@ LIBOBJS0 = alter.lo analyze.lo attach.lo auth.lo \
          expr.lo fault.lo fkey.lo \
          fts3.lo fts3_aux.lo fts3_expr.lo fts3_hash.lo fts3_icu.lo \
          fts3_porter.lo fts3_snippet.lo fts3_tokenizer.lo fts3_tokenizer1.lo \
-         fts3_unicode.lo fts3_unicode2.lo fts3_write.lo \
+         fts3_tokenize_vtab.lo fts3_unicode.lo fts3_unicode2.lo fts3_write.lo \
          func.lo global.lo hash.lo \
          icu.lo insert.lo journal.lo legacy.lo loadext.lo \
          main.lo malloc.lo mem0.lo mem1.lo mem2.lo mem3.lo mem5.lo \
@@ -638,6 +638,7 @@ SRC = $(SRC) \
   $(TOP)\ext\fts3\fts3_tokenizer.h \
   $(TOP)\ext\fts3\fts3_tokenizer.c \
   $(TOP)\ext\fts3\fts3_tokenizer1.c \
+  $(TOP)\ext\fts3\fts3_tokenize_vtab.c \
   $(TOP)\ext\fts3\fts3_unicode.c \
   $(TOP)\ext\fts3\fts3_unicode2.c \
   $(TOP)\ext\fts3\fts3_write.c
@@ -748,6 +749,7 @@ TESTSRC2 = \
   $(TOP)\ext\fts3\fts3_aux.c \
   $(TOP)\ext\fts3\fts3_expr.c \
   $(TOP)\ext\fts3\fts3_tokenizer.c \
+  $(TOP)\ext\fts3\fts3_tokenize_vtab.c \
   $(TOP)\ext\fts3\fts3_unicode.c \
   $(TOP)\ext\fts3\fts3_unicode2.c \
   $(TOP)\ext\fts3\fts3_write.c \
@@ -1176,6 +1178,9 @@ fts3_tokenizer.lo:        $(TOP)\ext\fts3\fts3_tokenizer.c $(HDR) $(EXTHDR)
 fts3_tokenizer1.lo:    $(TOP)\ext\fts3\fts3_tokenizer1.c $(HDR) $(EXTHDR)
        $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)\ext\fts3\fts3_tokenizer1.c
 
+fts3_tokenize_vtab.lo: $(TOP)\ext\fts3\fts3_tokenize_vtab.c $(HDR) $(EXTHDR)
+       $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)\ext\fts3\fts3_tokenize_vtab.c
+
 fts3_unicode.lo:       $(TOP)\ext\fts3\fts3_unicode.c $(HDR) $(EXTHDR)
        $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)\ext\fts3\fts3_unicode.c
 

diff --git a/ext/fts3/fts3Int.h b/ext/fts3/fts3Int.h
index 77ca4704e808cb7741bd7df09724c2db0e4233bd..a11c18a3b7a226b88ce11d648892068dc2d15a01 100644 (file)
--- a/ext/fts3/fts3Int.h
+++ b/ext/fts3/fts3Int.h
@@ -549,6 +549,9 @@ int sqlite3Fts3EvalPhrasePoslist(Fts3Cursor *, Fts3Expr *, int iCol, char **);
 int sqlite3Fts3MsrOvfl(Fts3Cursor *, Fts3MultiSegReader *, int *);
 int sqlite3Fts3MsrIncrRestart(Fts3MultiSegReader *pCsr);
 
+/* fts3_tokenize_vtab.c */
+int sqlite3Fts3InitTok(sqlite3*);
+
 /* fts3_unicode2.c (functions generated by parsing unicode text files) */
 #ifdef SQLITE_ENABLE_FTS4_UNICODE61
 int sqlite3FtsUnicodeFold(int, int);

diff --git a/ext/fts3/fts3_tokenize_vtab.c b/ext/fts3/fts3_tokenize_vtab.c
index f00fefe7a94889daec4506882227145e9f4feb7b..0f2cef83c397614ca677d608456192647d1ab83d 100644 (file)
--- a/ext/fts3/fts3_tokenize_vtab.c
+++ b/ext/fts3/fts3_tokenize_vtab.c
@@ -92,7 +92,7 @@ static int fts3tokQueryTokenizer(
   sqlite3_bind_text(pStmt, 1, zName, -1, SQLITE_STATIC);
   if( SQLITE_ROW==sqlite3_step(pStmt) ){
     if( sqlite3_column_type(pStmt, 0)==SQLITE_BLOB ){
-      memcpy(pp, sqlite3_column_blob(pStmt, 0), sizeof(*pp));
+      memcpy((void*)pp, sqlite3_column_blob(pStmt, 0), sizeof(*pp));
     }
   }
 
@@ -125,7 +125,7 @@ static int fts3tokDequoteArray(
     char **azDequote;
 
     for(i=0; i<argc; i++){
-      nByte += (strlen(argv[i]) + 1);
+      nByte += (int)(strlen(argv[i]) + 1);
     }
 
     *pazDequote = azDequote = sqlite3_malloc(sizeof(char *)*argc + nByte);
@@ -134,7 +134,7 @@ static int fts3tokDequoteArray(
     }else{
       char *pSpace = (char *)&azDequote[argc];
       for(i=0; i<argc; i++){
-        int n = strlen(argv[i]);
+        int n = (int)strlen(argv[i]);
         azDequote[i] = pSpace;
         memcpy(pSpace, argv[i], n+1);
         sqlite3Fts3Dequote(pSpace);

diff --git a/manifest b/manifest
index 9d7bde3b76e4fed9254ea51ab01d542eb9b55316..fe2a260a733db26dbbea760a3b938272731a779f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Add\svirtual\stable\smodule\s'fts3tokenize'\sto\sfts3.\sfts3tokenize\sprovides\sSQL\saccess\sto\sFTS\stokenizer\simplementations.
-D 2013-04-22T15:30:37.451
+C Update\sMSCV\smakefile\sfor\sthe\sfts3tokenize\svirtual\stable.\s\sClear\ssome\nharmless\scompiler\swarnings\sin\sthe\sfts3tokenize\scode.
+D 2013-04-22T17:07:56.175
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 87591ea5bf7d6ed521ad42d5bc69c124debe11a5
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
-F Makefile.msc a244e5b5ba2493625db95b4d46b79201ea868bfe
+F Makefile.msc 67d9db478186d7d4a498c794fff049f7231a9626
 F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
 F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
 F VERSION 05c7bd63b96f31cfdef5c766ed91307ac121f5aa
@@ -57,7 +57,7 @@ F ext/fts3/README.tokenizers e0a8b81383ea60d0334d274fadf305ea14a8c314
 F ext/fts3/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d
 F ext/fts3/fts3.c 784aadfb4c2a217c3eb1feaecac924989f29728f
 F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe
-F ext/fts3/fts3Int.h 1e58825246b56259267382d2f9902774c049460a
+F ext/fts3/fts3Int.h 352c8a83ee4c6a14ced1759a39dd890ab947cbe0
 F ext/fts3/fts3_aux.c b02632f6dd0e375ce97870206d914ea6d8df5ccd
 F ext/fts3/fts3_expr.c 6cb4410f87676ae633bd7923bbc78526cb839c4d
 F ext/fts3/fts3_hash.c 8dd2d06b66c72c628c2732555a32bc0943114914
@@ -67,7 +67,7 @@ F ext/fts3/fts3_porter.c a465b49fcb8249a755792f87516eff182efa42b3
 F ext/fts3/fts3_snippet.c 5fcfcafff46a2a3a63b8e59fcb51987d01c74695
 F ext/fts3/fts3_term.c a521f75132f9a495bdca1bdd45949b3191c52763
 F ext/fts3/fts3_test.c f9a1a1702db1bfad3e2d0064746eeb808f125489
-F ext/fts3/fts3_tokenize_vtab.c 1019e24b7f12d234c902053ad8e70f43424d360a
+F ext/fts3/fts3_tokenize_vtab.c e097c2e19126249b812a4002e76309d5fef3495b
 F ext/fts3/fts3_tokenizer.c bbdc731bc91338050675c6d1da9ab82147391e16
 F ext/fts3/fts3_tokenizer.h 64c6ef6c5272c51ebe60fc607a896e84288fcbc3
 F ext/fts3/fts3_tokenizer1.c 5c98225a53705e5ee34824087478cf477bdb7004
@@ -1054,7 +1054,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P 206caf21f6f6963aa38a9aa0f6ea11c7230bb726
-R 36a7a566fbf2ef5cbf69a5b7a4283f26
-U dan
-Z 5ed9f520f4f2e158b055381052a84fbc
+P c5a4b21a15bd8a184380817ff41657acbccb866d
+R 8cef88af587ec812976b521330718bb2
+U drh
+Z 6d195d8624ede0ee30827cabebff2ea8

diff --git a/manifest.uuid b/manifest.uuid
index c65f3e21d5c00dfa58d02a7c324474f038637cd9..4f76ff333d9612f8174cdb7ac4419c16aa6f22b2 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c5a4b21a15bd8a184380817ff41657acbccb866d
\ No newline at end of file
+2b3fed09eb89f1e9d6a5f7487ef526b46eb51490
\ No newline at end of file