aboutsummaryrefslogtreecommitdiff
path: root/src/auth.c
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2004-09-06 17:24:11 +0000
committerdrh <drh@noemail.net>2004-09-06 17:24:11 +0000
commit9bb575fd72e8c92a39f35bfd75591b210908faad (patch)
treec71d1973ac94e40d9510c941a3ab0501591f59be /src/auth.c
parent873cdcb2ce572b2c1d03d70db8ebfa03266518e9 (diff)
downloadsqlite-9bb575fd72e8c92a39f35bfd75591b210908faad.tar.gz
sqlite-9bb575fd72e8c92a39f35bfd75591b210908faad.zip
Fix a naming conflict between sqlite versions 2 and 3. An open sqlite3
connection now *must* be called "sqlite3". You cannot call it "sqlite". This might break existing code. (CVS 1941) FossilOrigin-Name: 3ddf5a9d1c480a2e3aa32685879063b11afddbe1
Diffstat (limited to 'src/auth.c')
-rw-r--r--src/auth.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/auth.c b/src/auth.c
index 0ac623c95..3a8c1fbc0 100644
--- a/src/auth.c
+++ b/src/auth.c
@@ -14,7 +14,7 @@
** systems that do not need this facility may omit it by recompiling
** the library with -DSQLITE_OMIT_AUTHORIZATION=1
**
-** $Id: auth.c,v 1.16 2004/06/19 16:06:11 drh Exp $
+** $Id: auth.c,v 1.17 2004/09/06 17:24:12 drh Exp $
*/
#include "sqliteInt.h"
@@ -70,7 +70,7 @@
** setting of the auth function is NULL.
*/
int sqlite3_set_authorizer(
- sqlite *db,
+ sqlite3 *db,
int (*xAuth)(void*,int,const char*,const char*,const char*,const char*),
void *pArg
){
@@ -104,7 +104,7 @@ void sqlite3AuthRead(
Expr *pExpr, /* The expression to check authorization on */
SrcList *pTabList /* All table that pExpr might refer to */
){
- sqlite *db = pParse->db;
+ sqlite3 *db = pParse->db;
int rc;
Table *pTab; /* The table being read */
const char *zCol; /* Name of the column of the table */
@@ -170,7 +170,7 @@ int sqlite3AuthCheck(
const char *zArg2,
const char *zArg3
){
- sqlite *db = pParse->db;
+ sqlite3 *db = pParse->db;
int rc;
/* Don't do any authorization checks if the database is initialising. */