Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Fix a couple of gcc warnings. (CVS 1615) |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
960f55f3ecbef4581c8cb7be860023ba |
User & Date: | danielk1977 2004-06-18 06:02:35.000 |
Context
2004-06-18
| ||
11:25 | Fix typos and minor errors in lang.tcl. (CVS 1616) (check-in: 61db159c7d user: danielk1977 tags: trunk) | |
06:02 | Fix a couple of gcc warnings. (CVS 1615) (check-in: 960f55f3ec user: danielk1977 tags: trunk) | |
04:24 | Optimisation for unicode encoding conversion routines. (CVS 1614) (check-in: 39a415eaa6 user: danielk1977 tags: trunk) | |
Changes
Changes to src/build.c.
︙ | ︙ | |||
19 20 21 22 23 24 25 | ** DROP INDEX ** creating ID lists ** BEGIN TRANSACTION ** COMMIT ** ROLLBACK ** PRAGMA ** | | | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 | ** DROP INDEX ** creating ID lists ** BEGIN TRANSACTION ** COMMIT ** ROLLBACK ** PRAGMA ** ** $Id: build.c,v 1.222 2004/06/18 06:02:35 danielk1977 Exp $ */ #include "sqliteInt.h" #include <ctype.h> /* ** This routine is called when a new SQL statement is beginning to ** be parsed. Check to see if the schema for the database needs |
︙ | ︙ | |||
946 947 948 949 950 951 952 | return pColl; } static void callCollNeeded(sqlite *db, const char *zName, int nName){ /* No collation sequence of this type for this encoding is registered. ** Call the collation factory to see if it can supply us with one. */ | | | 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 | return pColl; } static void callCollNeeded(sqlite *db, const char *zName, int nName){ /* No collation sequence of this type for this encoding is registered. ** Call the collation factory to see if it can supply us with one. */ char const *zExternal = 0; assert( !db->xCollNeeded || !db->xCollNeeded16 ); if( nName<0 ) nName = strlen(zName); if( db->xCollNeeded ){ zExternal = sqliteStrNDup(zName, nName); if( !zExternal ) return; db->xCollNeeded(db->pCollNeededArg, db, (int)db->enc, zExternal); } |
︙ | ︙ |
Changes to src/os_unix.c.
︙ | ︙ | |||
603 604 605 606 607 608 609 | ** SQLite to access the file will not know that the journal exists (because ** the directory entry for the journal was never created) and the transaction ** will not roll back - possibly leading to database corruption. */ int sqlite3OsSync(OsFile *id){ SimulateIOError(SQLITE_IOERR); TRACE2("SYNC %-3d\n", id->h); | < < < < < < | 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 | ** SQLite to access the file will not know that the journal exists (because ** the directory entry for the journal was never created) and the transaction ** will not roll back - possibly leading to database corruption. */ int sqlite3OsSync(OsFile *id){ SimulateIOError(SQLITE_IOERR); TRACE2("SYNC %-3d\n", id->h); if( fsync(id->h) ){ return SQLITE_IOERR; } if( id->dirfd>=0 ){ TRACE2("DIRSYNC %-3d\n", id->dirfd); fsync(id->dirfd); close(id->dirfd); /* Only need to sync once, so close the directory */ id->dirfd = -1; /* when we are done. */ } return SQLITE_OK; } /* ** Sync the directory zDirname. This is a no-op on operating systems other ** than UNIX. */ |
︙ | ︙ |
Changes to src/tokenize.c.
︙ | ︙ | |||
11 12 13 14 15 16 17 | ************************************************************************* ** An tokenizer for SQL ** ** This file contains C code that splits an SQL input string up into ** individual tokens and sends those tokens one-by-one over to the ** parser for analysis. ** | | | 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 | ************************************************************************* ** An tokenizer for SQL ** ** This file contains C code that splits an SQL input string up into ** individual tokens and sends those tokens one-by-one over to the ** parser for analysis. ** ** $Id: tokenize.c,v 1.78 2004/06/18 06:02:35 danielk1977 Exp $ */ #include "sqliteInt.h" #include "os.h" #include <ctype.h> #include <stdlib.h> /* |
︙ | ︙ | |||
698 699 700 701 702 703 704 | /* ** This routine is the same as the sqlite3_complete() routine described ** above, except that the parameter is required to be UTF-16 encoded, not ** UTF-8. */ int sqlite3_complete16(const void *zSql){ sqlite3_value *pVal; | | < | 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 | /* ** This routine is the same as the sqlite3_complete() routine described ** above, except that the parameter is required to be UTF-16 encoded, not ** UTF-8. */ int sqlite3_complete16(const void *zSql){ sqlite3_value *pVal; char const *zSql8; int rc = 0; pVal = sqlite3ValueNew(); sqlite3ValueSetStr(pVal, -1, zSql, SQLITE_UTF16NATIVE, SQLITE_STATIC); zSql8 = sqlite3ValueText(pVal, SQLITE_UTF8); if( zSql8 ){ rc = sqlite3_complete(zSql8); } sqlite3ValueFree(pVal); return rc; } |
Changes to src/vdbeInt.h.
︙ | ︙ | |||
388 389 390 391 392 393 394 | int sqlite3VdbeMemFromBtree(BtCursor*,int,int,int,Mem*); void sqlite3VdbeMemRelease(Mem *p); #ifndef NDEBUG void sqlite3VdbeMemSanity(Mem*, u8); #endif int sqlite3VdbeMemTranslate(Mem*, u8); void sqlite3VdbeMemPrettyPrint(Mem *pMem, char *zBuf, int nBuf); | > | 388 389 390 391 392 393 394 395 | int sqlite3VdbeMemFromBtree(BtCursor*,int,int,int,Mem*); void sqlite3VdbeMemRelease(Mem *p); #ifndef NDEBUG void sqlite3VdbeMemSanity(Mem*, u8); #endif int sqlite3VdbeMemTranslate(Mem*, u8); void sqlite3VdbeMemPrettyPrint(Mem *pMem, char *zBuf, int nBuf); int sqlite3VdbeMemHandleBom(Mem *pMem); |
Changes to src/vdbeapi.c.
︙ | ︙ | |||
506 507 508 509 510 511 512 | int i, const void *zData, int nData, void (*xDel)(void*) ){ Vdbe *p = (Vdbe *)pStmt; Mem *pVar; | | | 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 | int i, const void *zData, int nData, void (*xDel)(void*) ){ Vdbe *p = (Vdbe *)pStmt; Mem *pVar; int rc; rc = vdbeUnbind(p, i); if( rc ){ return rc; } pVar = &p->apVar[i-1]; |
︙ | ︙ |
Changes to test/enc2.test.
︙ | ︙ | |||
9 10 11 12 13 14 15 | # #*********************************************************************** # This file implements regression tests for SQLite library. The focus of # this file is testing the SQLite routines used for converting between the # various suported unicode encodings (UTF-8, UTF-16, UTF-16le and # UTF-16be). # | | | 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | # #*********************************************************************** # This file implements regression tests for SQLite library. The focus of # this file is testing the SQLite routines used for converting between the # various suported unicode encodings (UTF-8, UTF-16, UTF-16le and # UTF-16be). # # $Id: enc2.test,v 1.11 2004/06/18 06:02:35 danielk1977 Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl # The rough organisation of tests in this file is: # # enc2.1.*: Simple tests with a UTF-8 db. |
︙ | ︙ | |||
165 166 167 168 169 170 171 | set ::values [list one two three four five] set ::test_collate_enc INVALID proc test_collate {enc lhs rhs} { set ::test_collate_enc $enc set l [lsearch -exact $::values $lhs] set r [lsearch -exact $::values $rhs] set res [expr $l - $r] | < | 165 166 167 168 169 170 171 172 173 174 175 176 177 178 | set ::values [list one two three four five] set ::test_collate_enc INVALID proc test_collate {enc lhs rhs} { set ::test_collate_enc $enc set l [lsearch -exact $::values $lhs] set r [lsearch -exact $::values $rhs] set res [expr $l - $r] return $res } file delete -force test.db set DB [sqlite db test.db] do_test enc2-5.0 { execsql { |
︙ | ︙ | |||
191 192 193 194 195 196 197 | lappend res $::test_collate_enc } {one two three four five UTF-8} do_test enc2-5.2 { add_test_collate $DB 0 1 0 set res [execsql {SELECT * FROM t5 ORDER BY 1 COLLATE test_collate}] lappend res $::test_collate_enc } {one two three four five UTF-16LE} | < | 190 191 192 193 194 195 196 197 198 199 200 201 202 203 | lappend res $::test_collate_enc } {one two three four five UTF-8} do_test enc2-5.2 { add_test_collate $DB 0 1 0 set res [execsql {SELECT * FROM t5 ORDER BY 1 COLLATE test_collate}] lappend res $::test_collate_enc } {one two three four five UTF-16LE} do_test enc2-5.3 { add_test_collate $DB 0 0 1 set res [execsql {SELECT * FROM t5 ORDER BY 1 COLLATE test_collate}] lappend res $::test_collate_enc } {one two three four five UTF-16BE} db close |
︙ | ︙ | |||
222 223 224 225 226 227 228 | lappend res $::test_collate_enc } {one two three four five UTF-16LE} do_test enc2-5.6 { add_test_collate $DB 1 0 1 set res [execsql {SELECT * FROM t5 ORDER BY 1 COLLATE test_collate}] lappend res $::test_collate_enc } {one two three four five UTF-16BE} | < | 220 221 222 223 224 225 226 227 228 229 230 231 232 233 | lappend res $::test_collate_enc } {one two three four five UTF-16LE} do_test enc2-5.6 { add_test_collate $DB 1 0 1 set res [execsql {SELECT * FROM t5 ORDER BY 1 COLLATE test_collate}] lappend res $::test_collate_enc } {one two three four five UTF-16BE} do_test enc2-5.7 { add_test_collate $DB 1 0 0 set res [execsql {SELECT * FROM t5 ORDER BY 1 COLLATE test_collate}] lappend res $::test_collate_enc } {one two three four five UTF-8} db close |
︙ | ︙ | |||
253 254 255 256 257 258 259 | lappend res $::test_collate_enc } {one two three four five UTF-16BE} do_test enc2-5.10 { add_test_collate $DB 1 1 0 set res [execsql {SELECT * FROM t5 ORDER BY 1 COLLATE test_collate}] lappend res $::test_collate_enc } {one two three four five UTF-16LE} | < | 250 251 252 253 254 255 256 257 258 259 260 261 262 263 | lappend res $::test_collate_enc } {one two three four five UTF-16BE} do_test enc2-5.10 { add_test_collate $DB 1 1 0 set res [execsql {SELECT * FROM t5 ORDER BY 1 COLLATE test_collate}] lappend res $::test_collate_enc } {one two three four five UTF-16LE} do_test enc2-5.11 { add_test_collate $DB 1 0 0 set res [execsql {SELECT * FROM t5 ORDER BY 1 COLLATE test_collate}] lappend res $::test_collate_enc } {one two three four five UTF-8} db close |
︙ | ︙ |