diff options
author | drh <drh@noemail.net> | 2015-11-24 16:40:23 +0000 |
---|---|---|
committer | drh <drh@noemail.net> | 2015-11-24 16:40:23 +0000 |
commit | 5a8d190b9ecf9e38857bfa77440a4e9c91aa28e3 (patch) | |
tree | 9d7cd7266c7ed8dfbcf7f30b2fb8ebdb60fc8436 /src/os_unix.c | |
parent | aaeaa18e2e4ba3f82c4f11929f50fa9837d50e00 (diff) | |
download | sqlite-5a8d190b9ecf9e38857bfa77440a4e9c91aa28e3.tar.gz sqlite-5a8d190b9ecf9e38857bfa77440a4e9c91aa28e3.zip |
Remove from os_unix.c pointless logic that tries to prevent a recurrence of
a warning message that can only occur once.
FossilOrigin-Name: 20256177072caa4f2b4114038ad1c8f6e26bc562
Diffstat (limited to 'src/os_unix.c')
-rw-r--r-- | src/os_unix.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index 768a2a9ee..82224053f 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -258,8 +258,7 @@ static pid_t randomnessPid = 0; #define UNIXFILE_DELETE 0x20 /* Delete on close */ #define UNIXFILE_URI 0x40 /* Filename might have query parameters */ #define UNIXFILE_NOLOCK 0x80 /* Do no file locking */ -#define UNIXFILE_WARNED 0x0100 /* verifyDbFile() warnings issued */ -#define UNIXFILE_BLOCK 0x0200 /* Next SHM lock might block */ +#define UNIXFILE_BLOCK 0x0100 /* Next SHM lock might block */ /* ** Include code that is common to all os_*.c files @@ -1360,30 +1359,21 @@ static int fileHasMoved(unixFile *pFile){ static void verifyDbFile(unixFile *pFile){ struct stat buf; int rc; - if( pFile->ctrlFlags & UNIXFILE_WARNED ){ - /* One or more of the following warnings have already been issued. Do not - ** repeat them so as not to clutter the error log */ - return; - } rc = osFstat(pFile->h, &buf); if( rc!=0 ){ sqlite3_log(SQLITE_WARNING, "cannot fstat db file %s", pFile->zPath); - pFile->ctrlFlags |= UNIXFILE_WARNED; return; } if( buf.st_nlink==0 && (pFile->ctrlFlags & UNIXFILE_DELETE)==0 ){ sqlite3_log(SQLITE_WARNING, "file unlinked while open: %s", pFile->zPath); - pFile->ctrlFlags |= UNIXFILE_WARNED; return; } if( buf.st_nlink>1 ){ sqlite3_log(SQLITE_WARNING, "multiple links to file: %s", pFile->zPath); - pFile->ctrlFlags |= UNIXFILE_WARNED; return; } if( fileHasMoved(pFile) ){ sqlite3_log(SQLITE_WARNING, "file renamed while open: %s", pFile->zPath); - pFile->ctrlFlags |= UNIXFILE_WARNED; return; } } |