diff options
| author | mistachkin <mistachkin@noemail.net> | 2011-07-28 19:16:41 +0000 |
|---|---|---|
| committer | mistachkin <mistachkin@noemail.net> | 2011-07-28 19:16:41 +0000 |
| commit | 4e6b49b4098bf4795bb877b79d80133e4ab58685 (patch) | |
| tree | 0b23766b4e0d257b1b6102f814d2c0baed7fa865 /src | |
| parent | e75a717dc87eaf769421ccd4d939c8e44ce5c2f0 (diff) | |
| download | sqlite-4e6b49b4098bf4795bb877b79d80133e4ab58685.tar.gz sqlite-4e6b49b4098bf4795bb877b79d80133e4ab58685.zip | |
Remove redundant sub-expression from retry loop invariant in winAccess. Also, make check for SQLITE_ACCESS_READWRITE formally correct.
FossilOrigin-Name: 93079a92c49edf72eb289f352cd5ed7ab2faaff3
Diffstat (limited to 'src')
| -rw-r--r-- | src/os_win.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/os_win.c b/src/os_win.c index 4aaf74fef..88b47a469 100644 --- a/src/os_win.c +++ b/src/os_win.c @@ -2457,7 +2457,7 @@ static int winAccess( memset(&sAttrData, 0, sizeof(sAttrData)); while( !(rc = GetFileAttributesExW((WCHAR*)zConverted, GetFileExInfoStandard, - &sAttrData)) && rc==0 && retryIoerr(&cnt) ){} + &sAttrData)) && retryIoerr(&cnt) ){} if( rc ){ /* For an SQLITE_ACCESS_EXISTS query, treat a zero-length file ** as if it does not exist. @@ -2495,7 +2495,8 @@ static int winAccess( rc = attr!=INVALID_FILE_ATTRIBUTES; break; case SQLITE_ACCESS_READWRITE: - rc = (attr & FILE_ATTRIBUTE_READONLY)==0; + rc = attr!=INVALID_FILE_ATTRIBUTES && + (attr & FILE_ATTRIBUTE_READONLY)==0; break; default: assert(!"Invalid flags argument"); |