From: drh Date: Tue, 12 Aug 2014 12:19:25 +0000 (+0000) Subject: Fix typos in the VxWorks code of os_unix.c. X-Git-Tag: version-3.8.6~10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=61ffea549087e3489eb59a80bc152ed6c9c65804;p=thirdparty%2Fsqlite.git Fix typos in the VxWorks code of os_unix.c. FossilOrigin-Name: 19682e8fdc4a3b7884dba3e4387763e435ec16e6 --- diff --git a/manifest b/manifest index ecafc92b44..8868264630 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sa\stest\sto\sensure\sthat\sthe\sproblem\sfixed\sby\s[a179e41e40]\sdoes\snot\srecur. -D 2014-08-12T09:36:08.939 +C Fix\stypos\sin\sthe\sVxWorks\scode\sof\sos_unix.c. +D 2014-08-12T12:19:25.484 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -207,7 +207,7 @@ F src/os.c 1b147e4cf7cc39e618115c14a086aed44bc91ace F src/os.h 60d419395e32a8029fa380a80a3da2e9030f635e F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04 F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa -F src/os_unix.c 17e7ab0f9160a78c964d615b15b1658ab2090d42 +F src/os_unix.c 119f4f1fb94e74373d53e4946d33e4bc31e91b26 F src/os_win.c e0260a7ba735b4a30b5eccf1a3ace9d6b9718204 F src/os_win.h 057344a6720b4c8405d9bd98f58cb37a6ee46c25 F src/pager.c f6bb1fa6cdf2062f2d8aec3e64db302bca519ab8 @@ -1186,7 +1186,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P a179e41e40dba4c19a488985f77777acd27b689d -R fc85cc8ab2d6ab6a18c32ae79fed8287 -U dan -Z 3ae13b57bd03139bdf57f8a227f614c2 +P 31356f2cae26278660e6bd360ad35e57261d977c +R 3b3addf1401dd2b7481a8053af2cf7fe +U drh +Z 2e7aab7a2b3236c3b8e957ada63bd33e diff --git a/manifest.uuid b/manifest.uuid index 7def0f461f..fda807ffed 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -31356f2cae26278660e6bd360ad35e57261d977c \ No newline at end of file +19682e8fdc4a3b7884dba3e4387763e435ec16e6 \ No newline at end of file diff --git a/src/os_unix.c b/src/os_unix.c index feb9314167..d8b5db7680 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -1296,12 +1296,12 @@ static int findInodeInfo( ** Return TRUE if pFile has been renamed or unlinked since it was first opened. */ static int fileHasMoved(unixFile *pFile){ - struct stat buf; - return pFile->pInode!=0 && #if OS_VXWORKS - pFile->pId!=pFile->pInode->fileId.Pid; + return pFile->pInode!=0 && pFile->pId!=pFile->pInode->fileId.pId; #else - (osStat(pFile->zPath, &buf)!=0 || buf.st_ino!=pFile->pInode->fileId.ino); + struct stat buf; + return pFile->pInode!=0 && + (osStat(pFile->zPath, &buf)!=0 || buf.st_ino!=pFile->pInode->fileId.ino); #endif }