mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sqlite3_create_function() a special case of sqlite3_create_function_v2()

Browse Source 
in order reduce the number of code paths and simplify testing.

FossilOrigin-Name: 4758d86d57aaafc058c98c8b485eae24e6547588
This commit is contained in:
drh 2010-08-27 18:44:54 +00:00
parent d2199f0f8d
commit 7b19facf56
3 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
manifest
View File

@ -1,5 +1,8 @@
C Add\sthe\ssqlite3_create_function_v2()\sAPI,\sa\sversion\sof\screate_function\sthat\sallows\sa\sdestructor\sto\sbe\sspecified. -----BEGIN PGP SIGNED MESSAGE-----
D 2010-08-27T17:48:52 Hash: SHA1
C Make\ssqlite3_create_function()\sa\sspecial\scase\sof\ssqlite3_create_function_v2()\nin\sorder\sreduce\sthe\snumber\sof\scode\spaths\sand\ssimplify\stesting.
D 2010-08-27T18:44:55
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 543f91f24cd7fee774ecc0a61c19704c0c3e78fd F Makefile.in 543f91f24cd7fee774ecc0a61c19704c0c3e78fd
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@ -136,7 +139,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 6d422ea91cf3d2d00408c5a8f2391cd458da85f8 F src/loadext.c 6d422ea91cf3d2d00408c5a8f2391cd458da85f8
F src/main.c 185e558e8e38a36a78fdb36b378571f8fc136a7a F src/main.c ce47368bf71e815ac7a484ca2e872ed3ed92f58c
F src/malloc.c f34c9253326fcd2dad0041801992ccf18ddd6ab5 F src/malloc.c f34c9253326fcd2dad0041801992ccf18ddd6ab5
F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
F src/mem1.c 89d4ea8d5cdd55635cbaa48ad53132af6294cbb2 F src/mem1.c 89d4ea8d5cdd55635cbaa48ad53132af6294cbb2
@ -848,7 +851,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
P a3475ddfbe4526e6e0b334fd1376ee7c31508b80 P 9a724dfbe822c77e76721abe3443c9cb018bb2e2
R ce2fe209cb36d8732f735448dc28c68e R 9607aa96cd0cdc8bcb2114635902ff6c
U dan U drh
Z 0f4ca6d40dff81bf94d3eaa37cf31103 Z f9a6877eb14f8e1dda2f51167504f9f2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFMeAeqoxKgR168RlERAqqWAJ9hpff5bHcs4tXzdEHiUEvZACZNEgCfazU6
NIzIv3Z2B+i1yILARX0ZbxM=
=/ORU
-----END PGP SIGNATURE-----

2
manifest.uuid
View File

@ -1 +1 @@
9a724dfbe822c77e76721abe3443c9cb018bb2e2 4758d86d57aaafc058c98c8b485eae24e6547588

8
src/main.c
View File

@ -1055,12 +1055,8 @@ int sqlite3_create_function(
void (*xStep)(sqlite3_context*,int,sqlite3_value **), void (*xStep)(sqlite3_context*,int,sqlite3_value **),
void (*xFinal)(sqlite3_context*) void (*xFinal)(sqlite3_context*)
){ ){
int rc; return sqlite3_create_function_v2(db, zFunc, nArg, enc, p, xFunc, xStep,
sqlite3_mutex_enter(db->mutex); xFinal, 0);
rc = sqlite3CreateFunc(db, zFunc, nArg, enc, p, xFunc, xStep, xFinal, 0);
rc = sqlite3ApiExit(db, rc);
sqlite3_mutex_leave(db->mutex);
return rc;
} }
int sqlite3_create_function_v2( int sqlite3_create_function_v2(