database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-14 00:22:38 +03:00
Code Activity

Remove some unused code related to URI parsing.

Browse Source 
FossilOrigin-Name: 008cd0ef6b504cf4549468f795aa46f8472f0130
This commit is contained in:
dan
2011-05-03 15:09:05 +00:00
parent 3b18a9a334
commit 6d49e25613
3 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@@ -1,5 +1,5 @@
C Allow\sonly\s"localhost"\sand\s""\sas\sauthorities\sin\sURIs.\sDo\snot\sallow\sescapes\s(%HH)\sin\sthe\sauthority\spart\sof\sa\sURI. C Remove\ssome\sunused\scode\srelated\sto\sURI\sparsing.
D 2011-05-03T11:53:20.345 D 2011-05-03T15:09:05.969
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 7a4d9524721d40ef9ee26f93f9bd6a51dba106f2 F Makefile.in 7a4d9524721d40ef9ee26f93f9bd6a51dba106f2
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -143,7 +143,7 @@ F src/journal.c 552839e54d1bf76fb8f7abe51868b66acacf6a0e
F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e
F src/loadext.c 3ae0d52da013a6326310655be6473fd472347b85 F src/loadext.c 3ae0d52da013a6326310655be6473fd472347b85
F src/main.c 28da02efcab49fd4cc51008b5f6d27b742682807 F src/main.c 872493d84fed9b9c910e1b7b2427a3e28dbe995a
F src/malloc.c 74c740e8ba22b806cfb980c8c0ddea1cbd54a20e F src/malloc.c 74c740e8ba22b806cfb980c8c0ddea1cbd54a20e
F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
F src/mem1.c 00bd8265c81abb665c48fea1e0c234eb3b922206 F src/mem1.c 00bd8265c81abb665c48fea1e0c234eb3b922206
@@ -931,7 +931,7 @@ F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
P 0a694a0b27e3ce251ce313cb5d19a7637c2fa309 P b8a0f1b523d1f31c8e7a102ba4bae5935b07104a
R afa0474b6eff205d0a5c2d2e9845accd R 2dc3488a634991eebc6008406cc86975
U dan U dan
Z 0ad689b41032f94f1c384beb1085aa09 Z 271aa5bc20c9ebf896bbbb0905472291

2
manifest.uuid
View File

@@ -1 +1 @@
b8a0f1b523d1f31c8e7a102ba4bae5935b07104a 008cd0ef6b504cf4549468f795aa46f8472f0130

15
src/main.c
View File

@@ -1856,16 +1856,11 @@ int sqlite3ParseUri(
&& sqlite3Isxdigit(zUri[iIn]) && sqlite3Isxdigit(zUri[iIn])
&& sqlite3Isxdigit(zUri[iIn+1]) && sqlite3Isxdigit(zUri[iIn+1])
){ ){
int codepoint = (sqlite3HexToInt(zUri[iIn++]) << 4); int octet = (sqlite3HexToInt(zUri[iIn++]) << 4);
codepoint += sqlite3HexToInt(zUri[iIn++]); octet += sqlite3HexToInt(zUri[iIn++]);
assert( codepoint>=0 && codepoint<256 ); assert( octet>=0 && octet<256 );
if( codepoint>=128 ){ if( octet==0 ){
*pzErrMsg = sqlite3_mprintf("invalid uri escape: %.3s", &zUri[-3]);
rc = SQLITE_ERROR;
goto parse_uri_out;
}
else if( codepoint==0 ){
/* This branch is taken when "%00" appears within the URI. In this /* This branch is taken when "%00" appears within the URI. In this
** case we ignore all text in the remainder of the path, name or ** case we ignore all text in the remainder of the path, name or
** value currently being parsed. So ignore the current character ** value currently being parsed. So ignore the current character
@@ -1879,7 +1874,7 @@ int sqlite3ParseUri(
} }
continue; continue;
} }
c = codepoint; c = octet;
}else if( eState==1 && (c=='&' || c=='=') ){ }else if( eState==1 && (c=='&' || c=='=') ){
if( zFile[iOut-1]==0 ){ if( zFile[iOut-1]==0 ){
/* An empty option name. Ignore this option altogether. */ /* An empty option name. Ignore this option altogether. */