From: drh <drh@noemail.net>
Date: Fri, 9 Nov 2012 21:40:02 +0000 (+0000)
Subject: Only log unlink() errors if the error is something other than
X-Git-Tag: version-3.7.15~39
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b43081675d225ef7c5dfbab3adfbeb6c9b509ed2;p=thirdparty%2Fsqlite.git

Only log unlink() errors if the error is something other than
SQLITE_IOERR_DELETE_NOENT.  The error is still reported up the stack, it
is simply not added to the sqlite3_log().

FossilOrigin-Name: 5a3b07f0f5dfae7eea870303f52f37d6a17f1da2
---

diff --git a/manifest b/manifest
index 8a494b2e26..028b6852d1 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\sos_unix.c\sto\spropagate\sENOENT\serrors\sback\sto\ssqlite\sas\sSQLITE_IOERR_DELETE_NOENT.\sHave\sSQLite\signore\sthese\swhere\sthey\sare\sbenign\sand\spropagate\sthem\sback\sto\sthe\scaller\swhere\sthey\smay\sindicate\sa\sfile-system\smalfunction\sof\ssome\sdescription.
-D 2012-11-09T20:17:26.376
+C Only\slog\sunlink()\serrors\sif\sthe\serror\sis\ssomething\sother\sthan\nSQLITE_IOERR_DELETE_NOENT.\s\sThe\serror\sis\sstill\sreported\sup\sthe\sstack,\sit\nis\ssimply\snot\sadded\sto\sthe\ssqlite3_log().
+D 2012-11-09T21:40:02.069
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 82c41c0ed4cc94dd3cc7d498575b84c57c2c2384
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -160,7 +160,7 @@ F src/notify.c 976dd0f6171d4588e89e874fcc765e92914b6d30
 F src/os.c e1acdc09ff3ac2412945cca9766e2dcf4675f31c
 F src/os.h 027491c77d2404c0a678bb3fb06286f331eb9b57
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
-F src/os_unix.c 1f7c7f2a3b2c66590c7bab75e4b4d28003b316a9
+F src/os_unix.c f0753566e1125d8b2eef6dd080b48ed91a83d424
 F src/os_win.c 43ec1285357e5d5d919cb0492eac775c58ad7d12
 F src/pager.c ed53fe75a269c1d67645fe079ea0f3f0ce6492d5
 F src/pager.h 1109a06578ec5574dc2c74cf8d9f69daf36fe3e0
@@ -1024,7 +1024,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P 3f87f4593b631819609248c8f1370c1e19465eb0
-R 2f3e513245018c14d7af93e651fbc22c
-U dan
-Z 1e3c59db135f9831a4bbf3c3ac743265
+P bed9c172ce624ab7b5b9de9ad42444891717ad9a
+R 6c7c8f8d3a3d00e4614865ddb6f518c4
+U drh
+Z 81d94dfa08446549954e693bf8235ef9
diff --git a/manifest.uuid b/manifest.uuid
index 734ccb5346..eae5c05106 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-bed9c172ce624ab7b5b9de9ad42444891717ad9a
\ No newline at end of file
+5a3b07f0f5dfae7eea870303f52f37d6a17f1da2
\ No newline at end of file
diff --git a/src/os_unix.c b/src/os_unix.c
index 1de88f942e..ca62139430 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -5378,9 +5378,9 @@ static int unixDelete(
     if( errno==ENOENT ){
       rc = SQLITE_IOERR_DELETE_NOENT;
     }else{
-      rc = SQLITE_IOERR_DELETE;
+      rc = unixLogError(SQLITE_IOERR_DELETE, "unlink", zPath);
     }
-    return unixLogError(rc, "unlink", zPath);
+    return rc;
   }
 #ifndef SQLITE_DISABLE_DIRSYNC
   if( (dirSync & 1)!=0 ){