database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-10 01:02:56 +03:00
Code Activity

Address some minor 32/64 bit issues. (CVS 1932)

Browse Source 
FossilOrigin-Name: 6c9be972c1c289b657ba87db8db08fceb89b0171
This commit is contained in:
drh
2004-09-02 15:53:56 +00:00
parent 32fc1a5c51
commit c44af71c08
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@@ -1,5 +1,5 @@
C Fix\sa\sbug\sin\sthe\spagesize\stest\sscript.\s(CVS\s1931) C Address\ssome\sminor\s32/64\sbit\sissues.\s(CVS\s1932)
D 2004-09-02T15:49:08 D 2004-09-02T15:53:57
F Makefile.in 65a7c43fcaf9a710d62f120b11b6e435eeb4a450 F Makefile.in 65a7c43fcaf9a710d62f120b11b6e435eeb4a450
F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -35,12 +35,12 @@ F src/date.c edff4aa851eeca8abbc737dc3933a2f0671156ce
F src/delete.c cebfdde83e7bf68d8118e1c13e40c99787302fbf F src/delete.c cebfdde83e7bf68d8118e1c13e40c99787302fbf
F src/encode.c a876af473d1d636faa3dca51c7571f2e007eea37 F src/encode.c a876af473d1d636faa3dca51c7571f2e007eea37
F src/expr.c d618305952f75567514824cf9bdd5de74db5e00a F src/expr.c d618305952f75567514824cf9bdd5de74db5e00a
F src/func.c ab1d6436edea1333f2a9398800a6404942661724 F src/func.c 54a095713dd117e5482b25fa829e241d6938f1b6
F src/hash.c a97721a55440b7bea31ffe471bb2f6b4123cddd5 F src/hash.c a97721a55440b7bea31ffe471bb2f6b4123cddd5
F src/hash.h 1b0c445e1c89ff2aaad9b4605ba61375af001e84 F src/hash.h 1b0c445e1c89ff2aaad9b4605ba61375af001e84
F src/insert.c fc1ce65a0fe68f226143de9b43c3582164a92aff F src/insert.c fc1ce65a0fe68f226143de9b43c3582164a92aff
F src/legacy.c 2f3617c61bcdcd1d776154a9cfebf99facda8ad8 F src/legacy.c 2f3617c61bcdcd1d776154a9cfebf99facda8ad8
F src/main.c c42b3c1c9e0e401a490ed8f8ce789eb7302a9b69 F src/main.c 981bbcf4521762ab9f8ecbda1a4260ef94d7234f
F src/md5.c 7ae1c39044b95de2f62e066f47bb1deb880a1070 F src/md5.c 7ae1c39044b95de2f62e066f47bb1deb880a1070
F src/os.h d1780e0db95cad01f213d48da22ab490eb4fd345 F src/os.h d1780e0db95cad01f213d48da22ab490eb4fd345
F src/os_common.h cd7eb025fdab7dc91e0e97bf6310f1648205857f F src/os_common.h cd7eb025fdab7dc91e0e97bf6310f1648205857f
@@ -248,7 +248,7 @@ F www/tclsqlite.tcl 560ecd6a916b320e59f2917317398f3d59b7cc25
F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9 F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9
F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
P 8dd938e48048ffeb11181db9d98112ea2adbcfa6 P 1cf05bc607c88a3c0b81e82ee2d4fc761f08901a
R 80d652972567c39854f07852d4459386 R ca84df6aa85a3e62cdf58c252c001156
U drh U drh
Z 8f27e83e13b1fbe98bf42e4736180b8f Z d222cf180b4b3681708f917d9465c554

2
manifest.uuid
View File

@@ -1 +1 @@
1cf05bc607c88a3c0b81e82ee2d4fc761f08901a 6c9be972c1c289b657ba87db8db08fceb89b0171

4
src/func.c
View File

@@ -16,7 +16,7 @@
** sqliteRegisterBuildinFunctions() found at the bottom of the file. ** sqliteRegisterBuildinFunctions() found at the bottom of the file.
** All other code has file scope. ** 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 <ctype.h>
#include <math.h> #include <math.h>
@@ -44,7 +44,7 @@ static void minmaxFunc(
CollSeq *pColl; CollSeq *pColl;
if( argc==0 ) return; if( argc==0 ) return;
mask = (int)sqlite3_user_data(context); mask = sqlite3_user_data(context)==0 ? 0 : -1;
pColl = sqlite3GetFuncCollSeq(context); pColl = sqlite3GetFuncCollSeq(context);
assert( pColl ); assert( pColl );
assert( mask==-1 || mask==0 ); assert( mask==-1 || mask==0 );

8
src/main.c
View File

@@ -14,7 +14,7 @@
** other files are for internal use by SQLite and should not be ** other files are for internal use by SQLite and should not be
** accessed by users of the library. ** 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 "sqliteInt.h"
#include "os.h" #include "os.h"
@@ -578,8 +578,8 @@ static int sqliteDefaultBusyCallback(
static const short int totals[] = static const short int totals[] =
{ 0, 1, 3, 8, 18, 33, 53, 78, 103, 128, 178, 228, 287}; { 0, 1, 3, 8, 18, 33, 53, 78, 103, 128, 178, 228, 287};
# define NDELAY (sizeof(delays)/sizeof(delays[0])) # define NDELAY (sizeof(delays)/sizeof(delays[0]))
int timeout = (int)Timeout; ptr timeout = (ptr)Timeout;
int delay, prior; ptr delay, prior;
if( count <= NDELAY ){ if( count <= NDELAY ){
delay = delays[count-1]; delay = delays[count-1];
@@ -649,7 +649,7 @@ void sqlite3_progress_handler(
*/ */
int sqlite3_busy_timeout(sqlite3 *db, int ms){ int sqlite3_busy_timeout(sqlite3 *db, int ms){
if( ms>0 ){ if( ms>0 ){
sqlite3_busy_handler(db, sqliteDefaultBusyCallback, (void*)ms); sqlite3_busy_handler(db, sqliteDefaultBusyCallback, (void*)(ptr)ms);
}else{ }else{
sqlite3_busy_handler(db, 0, 0); sqlite3_busy_handler(db, 0, 0);
} }