diff options
Diffstat (limited to 'databases/sqlite/patches')
-rw-r--r-- | databases/sqlite/patches/patch-ab | 16 | ||||
-rw-r--r-- | databases/sqlite/patches/patch-ag | 49 |
2 files changed, 8 insertions, 57 deletions
diff --git a/databases/sqlite/patches/patch-ab b/databases/sqlite/patches/patch-ab index efaec98b1a7..1ed2714d1e8 100644 --- a/databases/sqlite/patches/patch-ab +++ b/databases/sqlite/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.1 2001/10/20 18:52:38 reinoud Exp $ +$NetBSD: patch-ab,v 1.2 2001/11/19 00:41:06 reinoud Exp $ ---- ../sqlite/src/btree.c.orig Mon Oct 15 02:44:35 2001 +--- ../sqlite/src/btree.c.orig Sat Nov 10 14:51:08 2001 +++ ../sqlite/src/btree.c @@ -60,7 +60,7 @@ ** The uptr type must be big enough to hold a pointer. @@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.1 2001/10/20 18:52:38 reinoud Exp $ /* There are already defined in sqliteInt.h... ** typedef unsigned int u32; -@@ -818,7 +818,7 @@ +@@ -829,7 +829,7 @@ int sqliteBtreeCursor(Btree *pBt, int iTable, int wrFlag, BtCursor **ppCur){ int rc; BtCursor *pCur; @@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.1 2001/10/20 18:52:38 reinoud Exp $ if( pBt->page1==0 ){ rc = lockBtree(pBt); -@@ -841,7 +841,7 @@ +@@ -852,7 +852,7 @@ if( rc!=SQLITE_OK ){ goto create_cursor_exception; } @@ -29,7 +29,7 @@ $NetBSD: patch-ab,v 1.1 2001/10/20 18:52:38 reinoud Exp $ if( nLock<0 || (nLock>0 && wrFlag) ){ rc = SQLITE_LOCKED; goto create_cursor_exception; -@@ -875,7 +875,7 @@ +@@ -886,7 +886,7 @@ ** when the last cursor is closed. */ int sqliteBtreeCloseCursor(BtCursor *pCur){ @@ -38,16 +38,16 @@ $NetBSD: patch-ab,v 1.1 2001/10/20 18:52:38 reinoud Exp $ Btree *pBt = pCur->pBt; if( pCur->pPrev ){ pCur->pPrev->pNext = pCur->pNext; -@@ -889,7 +889,7 @@ +@@ -900,7 +900,7 @@ sqlitepager_unref(pCur->pPage); } unlockBtreeIfUnused(pBt); - nLock = (int)sqliteHashFind(&pBt->locks, 0, pCur->pgnoRoot); + nLock = (long long int)sqliteHashFind(&pBt->locks, 0, pCur->pgnoRoot); - assert( nLock!=0 ); + assert( nLock!=0 || sqlite_malloc_failed ); nLock = nLock<0 ? 0 : nLock-1; sqliteHashInsert(&pBt->locks, 0, pCur->pgnoRoot, (void*)nLock); -@@ -2311,11 +2311,11 @@ +@@ -2293,11 +2293,11 @@ */ int sqliteBtreeClearTable(Btree *pBt, int iTable){ int rc; diff --git a/databases/sqlite/patches/patch-ag b/databases/sqlite/patches/patch-ag deleted file mode 100644 index 9f26c8861b2..00000000000 --- a/databases/sqlite/patches/patch-ag +++ /dev/null @@ -1,49 +0,0 @@ -$NetBSD: patch-ag,v 1.1 2001/10/20 18:52:38 reinoud Exp $ - ---- ../sqlite/tool/lemon.c.orig Sun Sep 16 01:07:32 2001 -+++ ../sqlite/tool/lemon.c -@@ -1305,7 +1305,7 @@ - /* - ** Return a pointer to the next structure in the linked list. - */ --#define NEXT(A) (*(char**)(((int)A)+offset)) -+#define NEXT(A) (*(char**)(((char *)A)+offset)) - - /* - ** Inputs: -@@ -1383,7 +1383,7 @@ - char *ep; - char *set[LISTSIZE]; - int i; -- offset = (int)next - (int)list; -+ offset = (char *)next - (char *)list; - for(i=0; i<LISTSIZE; i++) set[i] = 0; - while( list ){ - ep = list; -@@ -1531,7 +1531,7 @@ - if( *end ){ - if( err ){ - fprintf(err,"%sillegal character in floating-point argument.\n",emsg); -- errline(i,((int)end)-(int)argv[i],err); -+ errline(i, (int) (end-argv[i]),err); - } - errcnt++; - } -@@ -1542,7 +1542,7 @@ - if( *end ){ - if( err ){ - fprintf(err,"%sillegal character in integer argument.\n",emsg); -- errline(i,((int)end)-(int)argv[i],err); -+ errline(i, (int) (end-argv[i]),err); - } - errcnt++; - } -@@ -2625,7 +2625,7 @@ - - cp = strrchr(lemp->filename,'.'); - if( cp ){ -- sprintf(buf,"%.*s.lt",(int)cp-(int)lemp->filename,lemp->filename); -+ sprintf(buf,"%.*s.lt",cp-lemp->filename,lemp->filename); - }else{ - sprintf(buf,"%s.lt",lemp->filename); - } |