database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-03 16:53:36 +03:00
Code Activity

Change the names of external symbols from sqlite_XXX to sqlite3_XXX. (CVS 1339)

Browse Source 
FossilOrigin-Name: 19b100ec0d088b2cca147c967a80d18403b7ee86
This commit is contained in:
danielk1977
2004-05-10 10:37:18 +00:00
parent 6f8a503d71
commit 132872b37e
5 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
manifest
View File

@@ -1,5 +1,5 @@
C Change\sthe\snames\sof\sexternal\ssymbols\sfrom\ssqlite_XXX\sto\ssqlite3_XXX.\s(CVS\s1338) C Change\sthe\snames\sof\sexternal\ssymbols\sfrom\ssqlite_XXX\sto\ssqlite3_XXX.\s(CVS\s1339)
D 2004-05-10T10:34:52 D 2004-05-10T10:37:19
F Makefile.in ab7b0d5118e2da97bac66be8684a1034e3500f5a F Makefile.in ab7b0d5118e2da97bac66be8684a1034e3500f5a
F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -65,9 +65,9 @@ F src/util.c 74ee316594f68c41aed1884d737ab4085d479455
F src/vacuum.c c134702e023db8778e6be59ac0ea7b02315b5476 F src/vacuum.c c134702e023db8778e6be59ac0ea7b02315b5476
F src/vdbe.c 5cd18c8a3ab826f02ef1ce88a5798ec744337b30 F src/vdbe.c 5cd18c8a3ab826f02ef1ce88a5798ec744337b30
F src/vdbe.h 2dc4d1161b64f5684faa6a2d292e318a185ecb2e F src/vdbe.h 2dc4d1161b64f5684faa6a2d292e318a185ecb2e
F src/vdbeInt.h e4ab46c223bac43754335cdd14c9c6a95885b9a8 F src/vdbeInt.h 742e257653aa4249fef3c4313f7e414387b6d7f6
F src/vdbeaux.c 0256d8b9a355a90f24f992dd7b6f0d2373e3e957 F src/vdbeaux.c 943484a2437b6cf40d1ffd3d62e48b5c9a043c5a
F src/where.c 6db0291280f2c642bae2c69a70750325b53717a4 F src/where.c 487e55b1f64c8fbf0f46a9a90c2247fc45ae6a9a
F test/all.test 569a92a8ee88f5300c057cc4a8f50fbbc69a3242 F test/all.test 569a92a8ee88f5300c057cc4a8f50fbbc69a3242
F test/attach.test ba8261d38da6b6a7d4f78ec543c548c4418582ef F test/attach.test ba8261d38da6b6a7d4f78ec543c548c4418582ef
F test/attach2.test ce61e6185b3cd891cc0e9a4c868fcc65eb92fc55 F test/attach2.test ce61e6185b3cd891cc0e9a4c868fcc65eb92fc55
@@ -187,7 +187,7 @@ F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604
F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da
F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1 F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1
F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
P ba2ba24263a9e4d1b65b441295504a5da6380f33 P 2242423e31a5e81e89ffcc99e62307c5cc0120d5
R 34c539e427e74e63b45af740d6fe4c8f R f2908d3295f9c85321a4f31d49755326
U danielk1977 U danielk1977
Z b146f9071529ddd4538b8fe328a13018 Z 3d3dbd26469d780ca594807c5a221b31

2
manifest.uuid
View File

@@ -1 +1 @@
2242423e31a5e81e89ffcc99e62307c5cc0120d5 19b100ec0d088b2cca147c967a80d18403b7ee86

2
src/vdbeInt.h
View File

@@ -224,7 +224,7 @@ struct Context {
** An instance of the virtual machine. This structure contains the complete ** An instance of the virtual machine. This structure contains the complete
** state of the virtual machine. ** state of the virtual machine.
** **
** The "sqlite_vm" structure pointer that is returned by sqlite_compile() ** The "sqlite_vm" structure pointer that is returned by sqlite3_compile()
** is really a pointer to an instance of this structure. ** is really a pointer to an instance of this structure.
*/ */
struct Vdbe { struct Vdbe {

48
src/vdbeaux.c
View File

@@ -22,11 +22,11 @@
/* /*
** When debugging the code generator in a symbolic debugger, one can ** When debugging the code generator in a symbolic debugger, one can
** set the sqlite_vdbe_addop_trace to 1 and all opcodes will be printed ** set the sqlite3_vdbe_addop_trace to 1 and all opcodes will be printed
** as they are added to the instruction stream. ** as they are added to the instruction stream.
*/ */
#ifndef NDEBUG #ifndef NDEBUG
int sqlite_vdbe_addop_trace = 0; int sqlite3_vdbe_addop_trace = 0;
#endif #endif
@@ -100,7 +100,7 @@ int sqlite3VdbeAddOp(Vdbe *p, int op, int p1, int p2){
pOp->p3 = 0; pOp->p3 = 0;
pOp->p3type = P3_NOTUSED; pOp->p3type = P3_NOTUSED;
#ifndef NDEBUG #ifndef NDEBUG
if( sqlite_vdbe_addop_trace ) sqlite3VdbePrintOp(0, i, &p->aOp[i]); if( sqlite3_vdbe_addop_trace ) sqlite3VdbePrintOp(0, i, &p->aOp[i]);
#endif #endif
return i; return i;
} }
@@ -226,7 +226,7 @@ int sqlite3VdbeAddOpList(Vdbe *p, int nOp, VdbeOpList const *aOp){
pOut->p3 = pIn->p3; pOut->p3 = pIn->p3;
pOut->p3type = pIn->p3 ? P3_STATIC : P3_NOTUSED; pOut->p3type = pIn->p3 ? P3_STATIC : P3_NOTUSED;
#ifndef NDEBUG #ifndef NDEBUG
if( sqlite_vdbe_addop_trace ){ if( sqlite3_vdbe_addop_trace ){
sqlite3VdbePrintOp(0, i+addr, &p->aOp[i+addr]); sqlite3VdbePrintOp(0, i+addr, &p->aOp[i+addr]);
} }
#endif #endif
@@ -391,24 +391,24 @@ VdbeOp *sqlite3VdbeGetOp(Vdbe *p, int addr){
** The following group or routines are employed by installable functions ** The following group or routines are employed by installable functions
** to return their results. ** to return their results.
** **
** The sqlite_set_result_string() routine can be used to return a string ** The sqlite3_set_result_string() routine can be used to return a string
** value or to return a NULL. To return a NULL, pass in NULL for zResult. ** value or to return a NULL. To return a NULL, pass in NULL for zResult.
** A copy is made of the string before this routine returns so it is safe ** A copy is made of the string before this routine returns so it is safe
** to pass in an ephemeral string. ** to pass in an ephemeral string.
** **
** sqlite_set_result_error() works like sqlite_set_result_string() except ** sqlite3_set_result_error() works like sqlite3_set_result_string() except
** that it signals a fatal error. The string argument, if any, is the ** that it signals a fatal error. The string argument, if any, is the
** error message. If the argument is NULL a generic substitute error message ** error message. If the argument is NULL a generic substitute error message
** is used. ** is used.
** **
** The sqlite_set_result_int() and sqlite_set_result_double() set the return ** The sqlite3_set_result_int() and sqlite3_set_result_double() set the return
** value of the user function to an integer or a double. ** value of the user function to an integer or a double.
** **
** These routines are defined here in vdbe.c because they depend on knowing ** These routines are defined here in vdbe.c because they depend on knowing
** the internals of the sqlite_func structure which is only defined in ** the internals of the sqlite_func structure which is only defined in
** this source file. ** this source file.
*/ */
char *sqlite_set_result_string(sqlite_func *p, const char *zResult, int n){ char *sqlite3_set_result_string(sqlite_func *p, const char *zResult, int n){
assert( !p->isStep ); assert( !p->isStep );
if( p->s.flags & MEM_Dyn ){ if( p->s.flags & MEM_Dyn ){
sqliteFree(p->s.z); sqliteFree(p->s.z);
@@ -437,7 +437,7 @@ char *sqlite_set_result_string(sqlite_func *p, const char *zResult, int n){
} }
return p->s.z; return p->s.z;
} }
void sqlite_set_result_int(sqlite_func *p, int iResult){ void sqlite3_set_result_int(sqlite_func *p, int iResult){
assert( !p->isStep ); assert( !p->isStep );
if( p->s.flags & MEM_Dyn ){ if( p->s.flags & MEM_Dyn ){
sqliteFree(p->s.z); sqliteFree(p->s.z);
@@ -445,7 +445,7 @@ void sqlite_set_result_int(sqlite_func *p, int iResult){
p->s.i = iResult; p->s.i = iResult;
p->s.flags = MEM_Int; p->s.flags = MEM_Int;
} }
void sqlite_set_result_double(sqlite_func *p, double rResult){ void sqlite3_set_result_double(sqlite_func *p, double rResult){
assert( !p->isStep ); assert( !p->isStep );
if( p->s.flags & MEM_Dyn ){ if( p->s.flags & MEM_Dyn ){
sqliteFree(p->s.z); sqliteFree(p->s.z);
@@ -453,9 +453,9 @@ void sqlite_set_result_double(sqlite_func *p, double rResult){
p->s.r = rResult; p->s.r = rResult;
p->s.flags = MEM_Real; p->s.flags = MEM_Real;
} }
void sqlite_set_result_error(sqlite_func *p, const char *zMsg, int n){ void sqlite3_set_result_error(sqlite_func *p, const char *zMsg, int n){
assert( !p->isStep ); assert( !p->isStep );
sqlite_set_result_string(p, zMsg, n); sqlite3_set_result_string(p, zMsg, n);
p->isError = 1; p->isError = 1;
} }
@@ -463,7 +463,7 @@ void sqlite_set_result_error(sqlite_func *p, const char *zMsg, int n){
** Extract the user data from a sqlite_func structure and return a ** Extract the user data from a sqlite_func structure and return a
** pointer to it. ** pointer to it.
*/ */
void *sqlite_user_data(sqlite_func *p){ void *sqlite3_user_data(sqlite_func *p){
assert( p && p->pFunc ); assert( p && p->pFunc );
return p->pFunc->pUserData; return p->pFunc->pUserData;
} }
@@ -477,7 +477,7 @@ void *sqlite_user_data(sqlite_func *p){
** the internals of the sqlite_func structure which is only defined in ** the internals of the sqlite_func structure which is only defined in
** this source file. ** this source file.
*/ */
void *sqlite_aggregate_context(sqlite_func *p, int nByte){ void *sqlite3_aggregate_context(sqlite_func *p, int nByte){
assert( p && p->pFunc && p->pFunc->xStep ); assert( p && p->pFunc && p->pFunc->xStep );
if( p->pAgg==0 ){ if( p->pAgg==0 ){
if( nByte<=NBFS ){ if( nByte<=NBFS ){
@@ -498,7 +498,7 @@ void *sqlite_aggregate_context(sqlite_func *p, int nByte){
** the internals of the sqlite_func structure which is only defined in ** the internals of the sqlite_func structure which is only defined in
** this source file. ** this source file.
*/ */
int sqlite_aggregate_count(sqlite_func *p){ int sqlite3_aggregate_count(sqlite_func *p){
assert( p && p->pFunc && p->pFunc->xStep ); assert( p && p->pFunc && p->pFunc->xStep );
return p->cnt; return p->cnt;
} }
@@ -559,7 +559,7 @@ int sqlite3VdbeList(
p->rc = SQLITE_INTERRUPT; p->rc = SQLITE_INTERRUPT;
} }
rc = SQLITE_ERROR; rc = SQLITE_ERROR;
sqlite3SetString(&p->zErrMsg, sqlite_error_string(p->rc), (char*)0); sqlite3SetString(&p->zErrMsg, sqlite3_error_string(p->rc), (char*)0);
}else{ }else{
sprintf(p->zArgv[0],"%d",i); sprintf(p->zArgv[0],"%d",i);
sprintf(p->zArgv[2],"%d", p->aOp[i].p1); sprintf(p->zArgv[2],"%d", p->aOp[i].p1);
@@ -836,7 +836,7 @@ int sqlite3VdbeReset(Vdbe *p, char **pzErrMsg){
int i; int i;
if( p->magic!=VDBE_MAGIC_RUN && p->magic!=VDBE_MAGIC_HALT ){ if( p->magic!=VDBE_MAGIC_RUN && p->magic!=VDBE_MAGIC_HALT ){
sqlite3SetString(pzErrMsg, sqlite_error_string(SQLITE_MISUSE), (char*)0); sqlite3SetString(pzErrMsg, sqlite3_error_string(SQLITE_MISUSE), (char*)0);
return SQLITE_MISUSE; return SQLITE_MISUSE;
} }
if( p->zErrMsg ){ if( p->zErrMsg ){
@@ -847,7 +847,7 @@ int sqlite3VdbeReset(Vdbe *p, char **pzErrMsg){
} }
p->zErrMsg = 0; p->zErrMsg = 0;
}else if( p->rc ){ }else if( p->rc ){
sqlite3SetString(pzErrMsg, sqlite_error_string(p->rc), (char*)0); sqlite3SetString(pzErrMsg, sqlite3_error_string(p->rc), (char*)0);
} }
Cleanup(p); Cleanup(p);
if( p->rc!=SQLITE_OK ){ if( p->rc!=SQLITE_OK ){
@@ -886,7 +886,7 @@ int sqlite3VdbeReset(Vdbe *p, char **pzErrMsg){
db->aDb[i].inTrans = 1; db->aDb[i].inTrans = 1;
} }
} }
assert( p->pTos<&p->aStack[p->pc] || sqlite_malloc_failed==1 ); assert( p->pTos<&p->aStack[p->pc] || sqlite3_malloc_failed==1 );
#ifdef VDBE_PROFILE #ifdef VDBE_PROFILE
{ {
FILE *out = fopen("vdbe_profile.out", "a"); FILE *out = fopen("vdbe_profile.out", "a");
@@ -922,14 +922,14 @@ int sqlite3VdbeFinalize(Vdbe *p, char **pzErrMsg){
sqlite *db; sqlite *db;
if( p->magic!=VDBE_MAGIC_RUN && p->magic!=VDBE_MAGIC_HALT ){ if( p->magic!=VDBE_MAGIC_RUN && p->magic!=VDBE_MAGIC_HALT ){
sqlite3SetString(pzErrMsg, sqlite_error_string(SQLITE_MISUSE), (char*)0); sqlite3SetString(pzErrMsg, sqlite3_error_string(SQLITE_MISUSE), (char*)0);
return SQLITE_MISUSE; return SQLITE_MISUSE;
} }
db = p->db; db = p->db;
rc = sqlite3VdbeReset(p, pzErrMsg); rc = sqlite3VdbeReset(p, pzErrMsg);
sqlite3VdbeDelete(p); sqlite3VdbeDelete(p);
if( db->want_to_close && db->pVdbe==0 ){ if( db->want_to_close && db->pVdbe==0 ){
sqlite_close(db); sqlite3_close(db);
} }
if( rc==SQLITE_SCHEMA ){ if( rc==SQLITE_SCHEMA ){
sqlite3ResetInternalSchema(db, 0); sqlite3ResetInternalSchema(db, 0);
@@ -945,7 +945,7 @@ int sqlite3VdbeFinalize(Vdbe *p, char **pzErrMsg){
** **
** This routine overrides any prior call. ** This routine overrides any prior call.
*/ */
int sqlite_bind(sqlite_vm *pVm, int i, const char *zVal, int len, int copy){ int sqlite3_bind(sqlite_vm *pVm, int i, const char *zVal, int len, int copy){
Vdbe *p = (Vdbe*)pVm; Vdbe *p = (Vdbe*)pVm;
if( p->magic!=VDBE_MAGIC_RUN || p->pc!=0 ){ if( p->magic!=VDBE_MAGIC_RUN || p->pc!=0 ){
return SQLITE_MISUSE; return SQLITE_MISUSE;
@@ -1047,14 +1047,14 @@ int sqlite3VdbeByteSwap(int x){
int sqlite3VdbeCursorMoveto(Cursor *p){ int sqlite3VdbeCursorMoveto(Cursor *p){
if( p->deferredMoveto ){ if( p->deferredMoveto ){
int res; int res;
extern int sqlite_search_count; extern int sqlite3_search_count;
sqlite3BtreeMoveto(p->pCursor, (char*)&p->movetoTarget, sizeof(int), &res); sqlite3BtreeMoveto(p->pCursor, (char*)&p->movetoTarget, sizeof(int), &res);
p->lastRecno = keyToInt(p->movetoTarget); p->lastRecno = keyToInt(p->movetoTarget);
p->recnoIsValid = res==0; p->recnoIsValid = res==0;
if( res<0 ){ if( res<0 ){
sqlite3BtreeNext(p->pCursor, &res); sqlite3BtreeNext(p->pCursor, &res);
} }
sqlite_search_count++; sqlite3_search_count++;
p->deferredMoveto = 0; p->deferredMoveto = 0;
} }
return SQLITE_OK; return SQLITE_OK;

4
src/where.c
View File

@@ -12,7 +12,7 @@
** This module contains C code that generates VDBE code used to process ** This module contains C code that generates VDBE code used to process
** the WHERE clause of SQL statements. ** the WHERE clause of SQL statements.
** **
** $Id: where.c,v 1.90 2004/05/08 08:23:47 danielk1977 Exp $ ** $Id: where.c,v 1.91 2004/05/10 10:37:19 danielk1977 Exp $
*/ */
#include "sqliteInt.h" #include "sqliteInt.h"
@@ -389,7 +389,7 @@ WhereInfo *sqlite3WhereBegin(
** return value. ** return value.
*/ */
pWInfo = sqliteMalloc( sizeof(WhereInfo) + pTabList->nSrc*sizeof(WhereLevel)); pWInfo = sqliteMalloc( sizeof(WhereInfo) + pTabList->nSrc*sizeof(WhereLevel));
if( sqlite_malloc_failed ){ if( sqlite3_malloc_failed ){
sqliteFree(pWInfo); sqliteFree(pWInfo);
return 0; return 0;
} }