diff options
| author | drh <drh@noemail.net> | 2020-11-06 16:48:55 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2020-11-06 16:48:55 +0000 |
| commit | 78043e891ab2fba7dbec1493a9d3e10ab2476745 (patch) | |
| tree | 32d5a5db3a7a62b7dc93f4a9c8277bf931fd34ca /src/os_unix.c | |
| parent | 4e451aad54a03251a72fbdf7f5ac2894a9934956 (diff) | |
| download | sqlite-78043e891ab2fba7dbec1493a9d3e10ab2476745.tar.gz sqlite-78043e891ab2fba7dbec1493a9d3e10ab2476745.zip | |
Add ALWAYS() to conditionals associated with SHM locking that are always true.
FossilOrigin-Name: b599e89076d60afede7d2b3503b9338ca863d0c2d25799afe4080a6186386ea9
Diffstat (limited to 'src/os_unix.c')
| -rw-r--r-- | src/os_unix.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index 6c7227c35..6badcbd39 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -4907,7 +4907,7 @@ static int unixShmLock( if( rc==SQLITE_OK ){ memset(&aLock[ofst], 0, sizeof(int)*n); } - }else if( p->sharedMask & (1<<ofst) ){ + }else if( ALWAYS(p->sharedMask & (1<<ofst)) ){ assert( n==1 && aLock[ofst]>1 ); aLock[ofst]--; } @@ -4940,7 +4940,7 @@ static int unixShmLock( int ii; for(ii=ofst; ii<ofst+n; ii++){ assert( (p->sharedMask & mask)==0 ); - if( (p->exclMask & (1<<ii))==0 && aLock[ii] ){ + if( ALWAYS((p->exclMask & (1<<ii))==0) && aLock[ii] ){ rc = SQLITE_BUSY; break; } |