From: danielk1977 <danielk1977@noemail.net>
Date: Mon, 15 Sep 2008 04:20:31 +0000 (+0000)
Subject: Check if error code ENOTSUP is supported before using it. Ticket #3375. (CVS 5697)
X-Git-Tag: version-3.6.10~480
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5ad6a88f595ed38c0ca86c3fe66e8ccff87722d6;p=thirdparty%2Fsqlite.git

Check if error code ENOTSUP is supported before using it. Ticket #3375. (CVS 5697)

FossilOrigin-Name: c32cb106c5d68e98f51f1eaf9ae0e2a3c36d00d6
---

diff --git a/manifest b/manifest
index fa08b278d7..fb4aba9179 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sissues\swith\sbizarrely\squoted\scolumn\snames.\s\sTickets\s#3370,\s#3371,\nand\s#3372.\s(CVS\s5696)
-D 2008-09-13T01:20:15
+C Check\sif\serror\scode\sENOTSUP\sis\ssupported\sbefore\susing\sit.\sTicket\s#3375.\s(CVS\s5697)
+D 2008-09-15T04:20:32
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in d15a7ebfe5e057a72a49805ffb302dbb601c8329
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -135,7 +135,7 @@ F src/os.c 543976efc0b177b40779d5fc00f709d6888d6903
 F src/os.h ef8abeb9afc694b82dbd169a91c9b7e26db3c892
 F src/os_common.h 24525d8b7bce66c374dfc1810a6c9043f3359b60
 F src/os_os2.c e391fc95adc744bbdcefd4d11e3066998185a0a0
-F src/os_unix.c 075c3e474d20203153da1b2eb3f0fe3e2096f2de
+F src/os_unix.c 8f4def6a92681735908fa1b87b5cc0291ebafde6
 F src/os_win.c 3209dc0ed734291764393ea8d534ba0d8696a540
 F src/pager.c b1ea487022bf91ffba58fc4c02518398290ac2c2
 F src/pager.h c45380ca9d0933ea5bc4ecb3a43958b6d2ec5a9c
@@ -635,7 +635,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 8e9b9553115c42dae38cad0612d98d9a0c453a5c
-R 7bc434752d16929a3e421e431e8ae91f
-U drh
-Z 0c765190cb5cb7de380cf9d6dd1fc3e7
+P ced6bbd228b4a324ddb9c5ff15fd027811c8806a
+R 4d23aa13f9709d8ea8e494bd8ecff601
+U danielk1977
+Z 15f69e2058d6662c1b75f3319378d24f
diff --git a/manifest.uuid b/manifest.uuid
index eed30f557c..220e8fcf46 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ced6bbd228b4a324ddb9c5ff15fd027811c8806a
\ No newline at end of file
+c32cb106c5d68e98f51f1eaf9ae0e2a3c36d00d6
\ No newline at end of file
diff --git a/src/os_unix.c b/src/os_unix.c
index cd8cd521c3..d84b90419c 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -12,7 +12,7 @@
 **
 ** This file contains code that is specific to Unix systems.
 **
-** $Id: os_unix.c,v 1.200 2008/09/04 17:17:39 danielk1977 Exp $
+** $Id: os_unix.c,v 1.201 2008/09/15 04:20:32 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #if SQLITE_OS_UNIX              /* This file is used on unix only */
@@ -1178,9 +1178,11 @@ static int sqliteErrorFromPosixError(int posixError, int sqliteIOErr) {
     /* something went terribly awry, unless during file system support 
      * introspection, in which it actually means what it says */
 #endif
+#ifdef ENOTSUP
   case ENOTSUP: 
     /* invalid fd, unless during file system support introspection, in which 
      * it actually means what it says */
+#endif
   case EIO:
   case EBADF:
   case EINVAL:
@@ -1563,7 +1565,7 @@ static int unixUnlock(sqlite3_file *id, int locktype){
         pLock->locktype = NO_LOCK;
       }else{
         int tErrno = errno;
-				rc = sqliteErrorFromPosixError(tErrno, SQLITE_IOERR_UNLOCK);
+        rc = sqliteErrorFromPosixError(tErrno, SQLITE_IOERR_UNLOCK);
         if( IS_LOCK_ERROR(rc) ){
           pFile->lastErrno = tErrno;
         }