diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 73f11cfb08..9dd208958b 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,13 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-06-02 12:42 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/contrib/hbsqlit3/tests/blob.prg + * harbour/contrib/hbsqlit3/tests/sqlite3_test.prg + * harbour/contrib/hbsqlit3/sqlite3/sqlite3.c + * harbour/contrib/hbsqlit3/sqlite3/sqlite3.h + * converted TABs to SPACEs + 2008-06-02 12:00 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * source/common/hbverdsp.c ! Minor correction. diff --git a/harbour/contrib/hbsqlit3/sqlite3/sqlite3.c b/harbour/contrib/hbsqlit3/sqlite3/sqlite3.c index 9044ec504c..7e264ad974 100644 --- a/harbour/contrib/hbsqlit3/sqlite3/sqlite3.c +++ b/harbour/contrib/hbsqlit3/sqlite3/sqlite3.c @@ -1547,7 +1547,7 @@ SQLITE_API int sqlite3_complete16(const void *sql); ** ** CorruptionFollowingBusyError wiki page for a discussion of why ** this is important. -** +** ** There can only be a single busy handler defined for each database ** connection. Setting a new busy handler clears any previous one. ** Note that calling [sqlite3_busy_timeout()] will also set or clear @@ -11488,9 +11488,9 @@ SQLITE_API void *sqlite3_malloc(int nByte){ void *aAddr[40]; pHdr->nBacktrace = backtrace(aAddr, mem.nBacktrace+1)-1; memcpy(pBt, &aAddr[1], pHdr->nBacktrace*sizeof(void*)); - if( mem.xBacktrace ){ + if( mem.xBacktrace ){ mem.xBacktrace(nByte, pHdr->nBacktrace-1, &aAddr[1]); - } + } }else{ pHdr->nBacktrace = 0; } @@ -36851,7 +36851,7 @@ static int btreeCopyFile(Btree *pTo, Btree *pFrom){ } memcpy(zTo, zFrom, nCopy); - sqlite3PagerUnref(pFromPage); + sqlite3PagerUnref(pFromPage); } } @@ -36916,7 +36916,7 @@ static int btreeCopyFile(Btree *pTo, Btree *pFrom){ rc = sqlite3PagerGet(pBtFrom->pPager, iFrom, &pFromPage); if( rc==SQLITE_OK ){ char *zFrom = sqlite3PagerGetData(pFromPage); - rc = sqlite3OsWrite(pFile, zFrom, nFromPageSize, iOff); + rc = sqlite3OsWrite(pFile, zFrom, nFromPageSize, iOff); sqlite3PagerUnref(pFromPage); } } @@ -45240,7 +45240,7 @@ case OP_NewRowid: { /* out2-prerelease */ Mem *pMem; assert( pOp->p3>0 && pOp->p3<=p->nMem ); /* P3 is a valid memory cell */ pMem = &p->aMem[pOp->p3]; - REGISTER_TRACE(pOp->p3, pMem); + REGISTER_TRACE(pOp->p3, pMem); sqlite3VdbeMemIntegerify(pMem); assert( (pMem->flags & MEM_Int)!=0 ); /* mem(P3) holds an integer */ if( pMem->u.i==MAX_ROWID || pC->useRandomRowid ){ diff --git a/harbour/contrib/hbsqlit3/sqlite3/sqlite3.h b/harbour/contrib/hbsqlit3/sqlite3/sqlite3.h index a492b6d22f..9f8dfb8be5 100644 --- a/harbour/contrib/hbsqlit3/sqlite3/sqlite3.h +++ b/harbour/contrib/hbsqlit3/sqlite3/sqlite3.h @@ -1141,7 +1141,7 @@ int sqlite3_complete16(const void *sql); ** ** CorruptionFollowingBusyError wiki page for a discussion of why ** this is important. -** +** ** There can only be a single busy handler defined for each database ** connection. Setting a new busy handler clears any previous one. ** Note that calling [sqlite3_busy_timeout()] will also set or clear diff --git a/harbour/contrib/hbsqlit3/tests/blob.prg b/harbour/contrib/hbsqlit3/tests/blob.prg index c7187d6796..dc4ada2a2f 100644 --- a/harbour/contrib/hbsqlit3/tests/blob.prg +++ b/harbour/contrib/hbsqlit3/tests/blob.prg @@ -79,7 +79,7 @@ PROCEDURE main() sqlite3_blob_close( blob ) ? "Close BLOB" ENDIF - sqlite3_sleep( 3000 ) + sqlite3_sleep( 3000 ) ?"" ?"Save BLOB using sqlite3_column_blob()" diff --git a/harbour/contrib/hbsqlit3/tests/sqlite3_test.prg b/harbour/contrib/hbsqlit3/tests/sqlite3_test.prg index 1412a47694..3f13ead942 100644 --- a/harbour/contrib/hbsqlit3/tests/sqlite3_test.prg +++ b/harbour/contrib/hbsqlit3/tests/sqlite3_test.prg @@ -31,7 +31,7 @@ PROCEDURE main() IF sqlite3_libversion_number() < 3005001 RETURN - ENDIF + ENDIF t1() t2() @@ -236,9 +236,9 @@ PROCEDURE t2() ?? aTable[nI][nJ], " " NEXT nJ ? - NEXT nI + NEXT nI - sqlite3_sleep( 3000 ) + sqlite3_sleep( 3000 ) ENDIF RETURN