From: drh <>
Date: Tue, 17 May 2022 15:11:57 +0000 (+0000)
Subject: Fix harmless compiler warnings in the new unixFullPathname implementation.
X-Git-Tag: version-3.39.0~133
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b8b2d9c5e1ab01c93bff9010985f0a80d288a606;p=thirdparty%2Fsqlite.git

Fix harmless compiler warnings in the new unixFullPathname implementation.

FossilOrigin-Name: f7e1ceb5b59a876cfd04a8aac0ee2b322c970555b9c361b4953d711ef6596e37
---

diff --git a/manifest b/manifest
index e73180ebad..7f1d327e7e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Avoid\streating\sconstant\sexpressions\slike\s"?\sIN\s()"\sor\s"?\sNOT\sIN\s()"\sas\sintegers\sif\sthey\sappear\sin\sa\sGROUP\sBY\sor\sORDER\sBY\sclause.
-D 2022-05-17T15:01:01.127
+C Fix\sharmless\scompiler\swarnings\sin\sthe\snew\sunixFullPathname\simplementation.
+D 2022-05-17T15:11:57.632
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -537,7 +537,7 @@ F src/os.c b1c4f2d485961e9a5b6b648c36687d25047c252222e9660b7cc25a6e1ea436ab
 F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63
 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
 F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
-F src/os_unix.c 02becb87c58245d2831f10f4f1a9108a465f8091cc598b2a9c78976f51a4e446
+F src/os_unix.c 2df2b33db88f00af13805d4573ee126bc5973f9e3b91d03c575fa7ba64e7dc41
 F src/os_win.c a8ea80037e81127ca01959daa87387cc135f325c88dc745376c4f760de852a10
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 F src/pager.c 42120492784fc9bcd9082b5c9b5e329b7318c357f9f3574a1bbfcf7418910356
@@ -1954,8 +1954,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 2ad152236c408cbb1f942b221de4bf3cbaa9c35313d7eb07a63f46b6040fc981
-R 43491feb68bb986ef951c6ac394e5e71
-U dan
-Z 4bd491f85f12c206c1579a88f589c75a
+P d8b249e8cdf0babe1427d0587dbdc27a52ec06a5ef3a20dfb05a0ea4adb85858
+R 56c8d067b3c475439a951ae630953e32
+U drh
+Z 99cc78493b68b2d09cacc03a9e60389c
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index d58fe49873..e1be3622c7 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d8b249e8cdf0babe1427d0587dbdc27a52ec06a5ef3a20dfb05a0ea4adb85858
\ No newline at end of file
+f7e1ceb5b59a876cfd04a8aac0ee2b322c970555b9c361b4953d711ef6596e37
\ No newline at end of file
diff --git a/src/os_unix.c b/src/os_unix.c
index da50f2de1e..b933de3765 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -6484,7 +6484,7 @@ static void appendOnePathElement(
         return;
       }
       got = osReadlink(zIn, zLnk, sizeof(zLnk)-2);
-      if( got<=0 || got>=sizeof(zLnk)-2 ){
+      if( got<=0 || got>=(ssize_t)sizeof(zLnk)-2 ){
         pPath->rc = unixLogError(SQLITE_CANTOPEN_BKPT, "readlink", zIn);
         return;
       }
@@ -6534,6 +6534,7 @@ static int unixFullPathname(
   char *zOut                    /* Output buffer */
 ){
   DbPath path;
+  UNUSED_PARAMETER(pVfs);
   path.rc = 0;
   path.nUsed = 0;
   path.nSymlink = 0;