diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/func.c | 4 | ||||
| -rw-r--r-- | src/main.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/func.c b/src/func.c index 33ebfc4e5..b31f330dd 100644 --- a/src/func.c +++ b/src/func.c @@ -16,7 +16,7 @@ ** sqliteRegisterBuildinFunctions() found at the bottom of the file. ** All other code has file scope. ** -** $Id: func.c,v 1.81 2004/08/31 00:52:37 drh Exp $ +** $Id: func.c,v 1.82 2004/09/02 15:53:57 drh Exp $ */ #include <ctype.h> #include <math.h> @@ -44,7 +44,7 @@ static void minmaxFunc( CollSeq *pColl; if( argc==0 ) return; - mask = (int)sqlite3_user_data(context); + mask = sqlite3_user_data(context)==0 ? 0 : -1; pColl = sqlite3GetFuncCollSeq(context); assert( pColl ); assert( mask==-1 || mask==0 ); diff --git a/src/main.c b/src/main.c index 91dd1b23b..92479ad3d 100644 --- a/src/main.c +++ b/src/main.c @@ -14,7 +14,7 @@ ** other files are for internal use by SQLite and should not be ** accessed by users of the library. ** -** $Id: main.c,v 1.257 2004/09/02 14:57:08 drh Exp $ +** $Id: main.c,v 1.258 2004/09/02 15:53:57 drh Exp $ */ #include "sqliteInt.h" #include "os.h" @@ -578,8 +578,8 @@ static int sqliteDefaultBusyCallback( static const short int totals[] = { 0, 1, 3, 8, 18, 33, 53, 78, 103, 128, 178, 228, 287}; # define NDELAY (sizeof(delays)/sizeof(delays[0])) - int timeout = (int)Timeout; - int delay, prior; + ptr timeout = (ptr)Timeout; + ptr delay, prior; if( count <= NDELAY ){ delay = delays[count-1]; @@ -649,7 +649,7 @@ void sqlite3_progress_handler( */ int sqlite3_busy_timeout(sqlite3 *db, int ms){ if( ms>0 ){ - sqlite3_busy_handler(db, sqliteDefaultBusyCallback, (void*)ms); + sqlite3_busy_handler(db, sqliteDefaultBusyCallback, (void*)(ptr)ms); }else{ sqlite3_busy_handler(db, 0, 0); } |