Fix some minor compiler warnings. Added sqlite3Isalpha() for use in
the soundex() function. (CVS 6203) FossilOrigin-Name: bfc71edca471221add6b32b867d0b15171974eaf
This commit is contained in:
drh
parent
25f42fe7a1
commit
dc86e2b2cd
24
manifest
24
manifest
@ -1,5 +1,5 @@
|
||||
C Remove\sincorrect\sALWAYS\smacro\sassociated\swith\sempty\sIN()\ssets.\sTicket\s#3602.\s(CVS\s6202)
|
||||
D 2009-01-24T09:56:15
|
||||
C Fix\ssome\sminor\scompiler\swarnings.\s\sAdded\ssqlite3Isalpha()\sfor\suse\sin\nthe\ssoundex()\sfunction.\s(CVS\s6203)
|
||||
D 2009-01-24T11:30:43
|
||||
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
|
||||
F Makefile.in 6619a1b72de7ada2bb7be97862913e27c6f5e339
|
||||
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
|
||||
@ -104,7 +104,7 @@ F src/auth.c c8b2ab5c8bad4bd90ed7c294694f48269162c627
|
||||
F src/bitvec.c 44f7059ac1f874d364b34af31b9617e52223ba75
|
||||
F src/btmutex.c 63c5cc4ad5715690767ffcb741e185d7bc35ec1a
|
||||
F src/btree.c 01b3af74d9e756901f21401ca1a3d0bb8b2b9368
|
||||
F src/btree.h 4f141cf748d2ee7c6d7fc175f64f87a45cd44113
|
||||
F src/btree.h 07359623fa24748709dd61212a32364a6adc6b56
|
||||
F src/btreeInt.h 44bcbfe387ba99a3a9f2527bd12fa1bb8bc574b3
|
||||
F src/build.c c8bf5dcef4d5889bc57eecdb8b3dba178e5e06a8
|
||||
F src/callback.c bee8949d619b1b7b1e4dfac8a19c5116ae1dd12a
|
||||
@ -113,8 +113,8 @@ F src/date.c 6fd7a113e88b229d08956c8bef7cafcc664cd01d
|
||||
F src/delete.c 6249005bdd8f85db6ec5f31ddb5c07de023693cc
|
||||
F src/expr.c 76dc3dc83b56ab8db50a772714fac49def8bbf12
|
||||
F src/fault.c dc88c821842157460750d2d61a8a8b4197d047ff
|
||||
F src/func.c 74ee4010aa2282edd679f7258a5881c03c8b21be
|
||||
F src/global.c 9dd8b611d5f1668164eb27d924e0f7f7b9ed786f
|
||||
F src/func.c 51b41e10d41cdf4d0a6072f2eba16ed96ebda7cc
|
||||
F src/global.c ab003581ea4ff193cfe17a00e1303bc51db619a5
|
||||
F src/hash.c 5824e6ff7ba78cd34c8d6cd724367713583e5b55
|
||||
F src/hash.h 28f38ebb1006a5beedcb013bcdfe31befe7437ae
|
||||
F src/hwtime.h 4a1d45f4cae1f402ea19686acf24acf4f0cb53cb
|
||||
@ -142,8 +142,8 @@ F src/os_common.h 24525d8b7bce66c374dfc1810a6c9043f3359b60
|
||||
F src/os_os2.c bed77dc26e3a95ce4a204936b9a1ca6fe612fcc5
|
||||
F src/os_unix.c c74255cc1fcddc38fc3cc1dcf70c2325d3c2948e
|
||||
F src/os_win.c 496e3ceb499aedc63622a89ef76f7af2dd902709
|
||||
F src/pager.c be92682af31f44f41c9947f174c5f811648ec68c
|
||||
F src/pager.h 869b7027b031e30da24ebe9bdb973d1ec673a96b
|
||||
F src/pager.c ce459ad59b388d2beafd263c4365bb05c9bdfcc9
|
||||
F src/pager.h 59e3b500a0f6a8d17ec61976535007b0de39b9a4
|
||||
F src/parse.y b214295a91e985c42adb6bfd3ad1c56c47828e8d
|
||||
F src/pcache.c fcf7738c83c4d3e9d45836b2334c8a368cc41274
|
||||
F src/pcache.h 9b927ccc5a538e31b4c3bc7eec4f976db42a1324
|
||||
@ -158,7 +158,7 @@ F src/select.c ae72b604e47092521c4d9ae54e1b1cbeb872a747
|
||||
F src/shell.c 0d801ef653fd73d17161afebaab898a58ec3524b
|
||||
F src/sqlite.h.in 8821a61dceff26993ed6689239b6fbcd8d8f6e50
|
||||
F src/sqlite3ext.h 1db7d63ab5de4b3e6b83dd03d1a4e64fef6d2a17
|
||||
F src/sqliteInt.h 086886697368982dd7469689cd6e96c94d091008
|
||||
F src/sqliteInt.h 3ee870a4d5886992cd09af62f0d13dc7a6033f9f
|
||||
F src/sqliteLimit.h ffe93f5a0c4e7bd13e70cd7bf84cfb5c3465f45d
|
||||
F src/status.c 237b193efae0cf6ac3f0817a208de6c6c6ef6d76
|
||||
F src/table.c 332ab0ea691e63862e2a8bdfe2c0617ee61062a3
|
||||
@ -697,7 +697,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
|
||||
F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
|
||||
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
|
||||
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
|
||||
P 9c0b9f881367871105965d4268e2f2cde7f4d884
|
||||
R 703fcaebc30ee4e59c826e459cd7857d
|
||||
U danielk1977
|
||||
Z 9c10950aed830445208d8addcef66699
|
||||
P f3c09a0cb8bfc1a112c31b556d8921d5c75c5eef
|
||||
R 273d64919d0a36f301f9c3bc91cda828
|
||||
U drh
|
||||
Z ddeeb86e027f778011bc8d715076adfb
|
||||
|
||||
@ -1 +1 @@
|
||||
f3c09a0cb8bfc1a112c31b556d8921d5c75c5eef
|
||||
bfc71edca471221add6b32b867d0b15171974eaf
|
||||
@ -13,7 +13,7 @@
|
||||
** subsystem. See comments in the source code for a detailed description
|
||||
** of what each interface routine does.
|
||||
**
|
||||
** @(#) $Id: btree.h,v 1.106 2008/12/17 17:30:26 danielk1977 Exp $
|
||||
** @(#) $Id: btree.h,v 1.107 2009/01/24 11:30:43 drh Exp $
|
||||
*/
|
||||
#ifndef _BTREE_H_
|
||||
#define _BTREE_H_
|
||||
@ -104,7 +104,6 @@ int sqlite3BtreeLockTable(Btree *, int, u8);
|
||||
int sqlite3BtreeSavepoint(Btree *, int, int);
|
||||
|
||||
const char *sqlite3BtreeGetFilename(Btree *);
|
||||
const char *sqlite3BtreeGetDirname(Btree *);
|
||||
const char *sqlite3BtreeGetJournalname(Btree *);
|
||||
int sqlite3BtreeCopyFile(Btree *, Btree *);
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
** sqliteRegisterBuildinFunctions() found at the bottom of the file.
|
||||
** All other code has file scope.
|
||||
**
|
||||
** $Id: func.c,v 1.210 2009/01/20 16:53:40 danielk1977 Exp $
|
||||
** $Id: func.c,v 1.211 2009/01/24 11:30:43 drh Exp $
|
||||
*/
|
||||
#include "sqliteInt.h"
|
||||
#include <stdlib.h>
|
||||
@ -976,7 +976,7 @@ static void soundexFunc(
|
||||
assert( argc==1 );
|
||||
zIn = (u8*)sqlite3_value_text(argv[0]);
|
||||
if( zIn==0 ) zIn = (u8*)"";
|
||||
for(i=0; zIn[i] && !isalpha(zIn[i]); i++){}
|
||||
for(i=0; zIn[i] && !sqlite3Isalpha(zIn[i]); i++){}
|
||||
if( zIn[i] ){
|
||||
u8 prevcode = iCode[zIn[i]&0x7f];
|
||||
zResult[0] = sqlite3Toupper(zIn[i]);
|
||||
|
||||
11
src/global.c
11
src/global.c
@ -12,7 +12,7 @@
|
||||
**
|
||||
** This file contains definitions of global variables and contants.
|
||||
**
|
||||
** $Id: global.c,v 1.10 2009/01/20 16:53:40 danielk1977 Exp $
|
||||
** $Id: global.c,v 1.11 2009/01/24 11:30:43 drh Exp $
|
||||
*/
|
||||
#include "sqliteInt.h"
|
||||
|
||||
@ -67,13 +67,14 @@ const unsigned char sqlite3UpperToLower[] = {
|
||||
** equivalents to the following standard library functions:
|
||||
**
|
||||
** isspace() 0x01
|
||||
** isalnum() 0x02
|
||||
** isalpha() 0x02
|
||||
** isdigit() 0x04
|
||||
** isalnum() 0x06
|
||||
** isxdigit() 0x08
|
||||
** toupper() 0x20
|
||||
**
|
||||
** Bit 0x20 is set if the mapped character requires translation to upper
|
||||
** case. i.e. if the character is a lower-case ASCII character.character.
|
||||
** case. i.e. if the character is a lower-case ASCII character.
|
||||
** If x is a lower-case ASCII character, then its upper-case equivalent
|
||||
** is (x - 0x20). Therefore toupper() can be implemented as:
|
||||
**
|
||||
@ -93,8 +94,8 @@ const unsigned char sqlite3CtypeMap[256] = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 18..1f ........ */
|
||||
0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 20..27 !"#$%&' */
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 28..2f ()*+,-./ */
|
||||
0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, /* 30..37 01234567 */
|
||||
0x0e, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 38..3f 89:;<=>? */
|
||||
0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, /* 30..37 01234567 */
|
||||
0x0c, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 38..3f 89:;<=>? */
|
||||
|
||||
0x00, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x0a, 0x02, /* 40..47 @ABCDEFG */
|
||||
0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, /* 48..4f HIJKLMNO */
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
** file simultaneously, or one process from reading the database while
|
||||
** another is writing.
|
||||
**
|
||||
** @(#) $Id: pager.c,v 1.558 2009/01/23 16:45:01 danielk1977 Exp $
|
||||
** @(#) $Id: pager.c,v 1.559 2009/01/24 11:30:43 drh Exp $
|
||||
*/
|
||||
#ifndef SQLITE_OMIT_DISKIO
|
||||
#include "sqliteInt.h"
|
||||
@ -4328,6 +4328,7 @@ static int pager_incr_changecounter(Pager *pPager, int isDirectMode){
|
||||
#ifndef SQLITE_ENABLE_ATOMIC_WRITE
|
||||
const int isDirect = 0;
|
||||
assert( isDirectMode==0 );
|
||||
UNUSED_PARAMETER(isDirectMode);
|
||||
#else
|
||||
const int isDirect = isDirectMode;
|
||||
#endif
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
** subsystem. The page cache subsystem reads and writes a file a page
|
||||
** at a time and provides a journal for rollback.
|
||||
**
|
||||
** @(#) $Id: pager.h,v 1.97 2009/01/23 16:45:01 danielk1977 Exp $
|
||||
** @(#) $Id: pager.h,v 1.98 2009/01/24 11:30:43 drh Exp $
|
||||
*/
|
||||
|
||||
#ifndef _PAGER_H_
|
||||
@ -132,7 +132,6 @@ int sqlite3PagerRefcount(Pager*);
|
||||
const char *sqlite3PagerFilename(Pager*);
|
||||
const sqlite3_vfs *sqlite3PagerVfs(Pager*);
|
||||
sqlite3_file *sqlite3PagerFile(Pager*);
|
||||
const char *sqlite3PagerDirname(Pager*);
|
||||
const char *sqlite3PagerJournalname(Pager*);
|
||||
int sqlite3PagerNosync(Pager*);
|
||||
void *sqlite3PagerTempSpace(Pager*);
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
*************************************************************************
|
||||
** Internal interface definitions for SQLite.
|
||||
**
|
||||
** @(#) $Id: sqliteInt.h,v 1.829 2009/01/20 17:06:27 danielk1977 Exp $
|
||||
** @(#) $Id: sqliteInt.h,v 1.830 2009/01/24 11:30:43 drh Exp $
|
||||
*/
|
||||
#ifndef _SQLITEINT_H_
|
||||
#define _SQLITEINT_H_
|
||||
@ -2155,7 +2155,8 @@ int sqlite3WalkSelectFrom(Walker*, Select*);
|
||||
#ifdef SQLITE_ASCII
|
||||
# define sqlite3Toupper(x) ((x)&~(sqlite3CtypeMap[(unsigned char)(x)]&0x20))
|
||||
# define sqlite3Isspace(x) (sqlite3CtypeMap[(unsigned char)(x)]&0x01)
|
||||
# define sqlite3Isalnum(x) (sqlite3CtypeMap[(unsigned char)(x)]&0x02)
|
||||
# define sqlite3Isalnum(x) (sqlite3CtypeMap[(unsigned char)(x)]&0x06)
|
||||
# define sqlite3Isalpha(x) (sqlite3CtypeMap[(unsigned char)(x)]&0x02)
|
||||
# define sqlite3Isdigit(x) (sqlite3CtypeMap[(unsigned char)(x)]&0x04)
|
||||
# define sqlite3Isxdigit(x) (sqlite3CtypeMap[(unsigned char)(x)]&0x08)
|
||||
# define sqlite3Tolower(x) (sqlite3UpperToLower[(unsigned char)(x)])
|
||||
@ -2164,6 +2165,7 @@ int sqlite3WalkSelectFrom(Walker*, Select*);
|
||||
# define sqlite3Toupper(x) toupper((unsigned char)(x))
|
||||
# define sqlite3Isspace(x) isspace((unsigned char)(x))
|
||||
# define sqlite3Isalnum(x) isalnum((unsigned char)(x))
|
||||
# define sqlite3Isalpha(x) isalpha((unsigned char)(x))
|
||||
# define sqlite3Isdigit(x) isdigit((unsigned char)(x))
|
||||
# define sqlite3Isxdigit(x) isxdigit((unsigned char)(x))
|
||||
# define sqlite3Tolower(x) tolower((unsigned char)(x))
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user