Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix some errors in aa6acfa8ca. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
82d1934a428a34c292a612fb67bbcea2 |
| User & Date: | dan 2009-08-24 18:57:58 |
Context
|
2009-08-25
| ||
| 05:57 | Fix a bad interaction between "proxy-locking" and aa6acfa8ca. (check-in: 2a5c9e1d user: dan tags: trunk) | |
|
2009-08-24
| ||
| 18:57 | Fix some errors in aa6acfa8ca. (check-in: 82d1934a user: dan tags: trunk) | |
|
2009-08-22
| ||
| 19:17 | Remove an obsolete documentation file left over from SQLite version 1.0. (check-in: f7eb1efc user: drh tags: trunk) | |
Changes
Changes to src/os_unix.c.
1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 .... 2605 2606 2607 2608 2609 2610 2611 2612 2613 2614 2615 2616 2617 2618 2619 .... 3813 3814 3815 3816 3817 3818 3819 3820 3821 3822 3823 3824 3825 3826 3827 |
for(p=pOpen->pUnused; p; p=pNext){
pNext = p->pNext;
if( close(p->fd) ){
pFile->lastErrno = errno;
rc = SQLITE_IOERR_CLOSE;
p->pNext = pError;
pError = p;
assert(0);
}else{
sqlite3_free(p);
}
}
pOpen->pUnused = pError;
return rc;
}
................................................................................
}
if( rc==SQLITE_OK ){
if( locktype==NO_LOCK ){
struct unixOpenCnt *pOpen = pFile->pOpen;
pOpen->nLock--;
assert( pOpen->nLock>=0 );
if( pOpen->nLock==0 && pOpen->nPending>0 ){
rc = closePendingFds(pFile);
}
}
}
unixLeaveMutex();
if( rc==SQLITE_OK ){
pFile->locktype = locktype;
................................................................................
if( eType==SQLITE_OPEN_MAIN_DB ){
UnixUnusedFd *pUnused;
pUnused = findReusableFd(zName, flags);
if( pUnused ){
fd = pUnused->fd;
}else{
pUnused = sqlite3_malloc(sizeof(pUnused));
if( !pUnused ){
return SQLITE_NOMEM;
}
}
p->pUnused = pUnused;
}else if( !zName ){
/* If zName is NULL, the upper layer is requesting a temp file. */
|
< | | |
1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 .... 2604 2605 2606 2607 2608 2609 2610 2611 2612 2613 2614 2615 2616 2617 2618 .... 3812 3813 3814 3815 3816 3817 3818 3819 3820 3821 3822 3823 3824 3825 3826 |
for(p=pOpen->pUnused; p; p=pNext){
pNext = p->pNext;
if( close(p->fd) ){
pFile->lastErrno = errno;
rc = SQLITE_IOERR_CLOSE;
p->pNext = pError;
pError = p;
}else{
sqlite3_free(p);
}
}
pOpen->pUnused = pError;
return rc;
}
................................................................................
}
if( rc==SQLITE_OK ){
if( locktype==NO_LOCK ){
struct unixOpenCnt *pOpen = pFile->pOpen;
pOpen->nLock--;
assert( pOpen->nLock>=0 );
if( pOpen->nLock==0 ){
rc = closePendingFds(pFile);
}
}
}
unixLeaveMutex();
if( rc==SQLITE_OK ){
pFile->locktype = locktype;
................................................................................
if( eType==SQLITE_OPEN_MAIN_DB ){
UnixUnusedFd *pUnused;
pUnused = findReusableFd(zName, flags);
if( pUnused ){
fd = pUnused->fd;
}else{
pUnused = sqlite3_malloc(sizeof(*pUnused));
if( !pUnused ){
return SQLITE_NOMEM;
}
}
p->pUnused = pUnused;
}else if( !zName ){
/* If zName is NULL, the upper layer is requesting a temp file. */
|