]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Fix harmless compiler warnings in the vfstrace.c extension.
authordrh <>
Mon, 9 Sep 2024 15:19:26 +0000 (15:19 +0000)
committerdrh <>
Mon, 9 Sep 2024 15:19:26 +0000 (15:19 +0000)
FossilOrigin-Name: f23954e604bf4da45f07194b54a4fe1c83002ab65d6c6f0ac095e88baba18547

ext/misc/vfstrace.c
manifest
manifest.uuid

index ecc756795f3befd1808bf059c30dd0f27f22424a..fd972411d8ad283bbc36be6aa403f3f0f81b7038 100644 (file)
@@ -182,7 +182,7 @@ static const char *vfstraceNextSystemCall(sqlite3_vfs*, const char *zName);
 **     xyzzy.txt           -> xyzzy.txt
 */
 static const char *fileTail(const char *z){
-  int i;
+  size_t i;
   if( z==0 ) return 0;
   i = strlen(z)-1;
   while( i>0 && z[i-1]!='/' ){ i--; }
@@ -912,14 +912,14 @@ int vfstrace_register(
   sqlite3_vfs *pNew;
   sqlite3_vfs *pRoot;
   vfstrace_info *pInfo;
-  int nName;
-  int nByte;
+  size_t nName;
+  size_t nByte;
 
   pRoot = sqlite3_vfs_find(zOldVfsName);
   if( pRoot==0 ) return SQLITE_NOTFOUND;
   nName = strlen(zTraceName);
   nByte = sizeof(*pNew) + sizeof(*pInfo) + nName + 1;
-  pNew = sqlite3_malloc( nByte );
+  pNew = sqlite3_malloc64( nByte );
   if( pNew==0 ) return SQLITE_NOMEM;
   memset(pNew, 0, nByte);
   pInfo = (vfstrace_info*)&pNew[1];
index 4c907f4559c56f00096ac3bf1af22bfe81b8b769..3b8a584824e82b01fab515a0a27787530cd97a56 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Move\sthe\svfstrace\sextension\sout\sof\ssrc/\sover\sinto\sext/misc/\swhere\sit\sbelongs.\nMake\sit\spart\sof\sthe\sstandard\sbuild\sfor\sthe\sCLI.\s\sBring\ssome\sof\sthe\svfstrace\noutput\sup-to-date.
-D 2024-09-09T14:50:23.152
+C Fix\sharmless\scompiler\swarnings\sin\sthe\svfstrace.c\sextension.
+D 2024-09-09T15:19:26.342
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -435,7 +435,7 @@ F ext/misc/urifuncs.c f71360d14fa9e7626b563f1f781c6148109462741c5235ac63ae0f8917
 F ext/misc/uuid.c 5bb2264c1b64d163efa46509544fd7500cb8769cb7c16dd52052da8d961505cf
 F ext/misc/vfslog.c 3932ab932eeb2601dbc4447cb14d445aaa9fbe43b863ef5f014401c3420afd20
 F ext/misc/vfsstat.c a85df08654743922a19410d7b1e3111de41bb7cd07d20dd16eda4e2b808d269d
-F ext/misc/vfstrace.c 54b91e641b8e76a7e9049628c104f4b33bde015969dacf0d95ef11140fb5f6bc w src/test_vfstrace.c
+F ext/misc/vfstrace.c 9ff6f4352cdd3ed611e93239ad641c6e70dd48a50cae2d8c563dd1a4c549d5f9
 F ext/misc/vtablog.c 1100250ce8782db37c833e3a9a5c9a3ecf1af5e15b8325572b82e6e0a138ffb5
 F ext/misc/vtshim.c 1976e6dd68dd0d64508c91a6dfab8e75f8aaf6cd
 F ext/misc/wholenumber.c 0fa0c082676b7868bf2fa918e911133f2b349bcdceabd1198bba5f65b4fc0668
@@ -2212,11 +2212,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 70e42f941c0778a04b82655409c7caf4c1039589f7e43a8ec1e736ea8f931b26
-R 1378141f27acd6b5e1f32f92428038b9
-T *branch * vfstrace
-T *sym-vfstrace *
-T -sym-trunk *
+P 055b97de8d2397987d72dbab1cde78ece2d1c066e95042b4ed6b7b36b2cf9006
+R 121ef6e86bed835ee78e7e9a5da1af0d
 U drh
-Z 9efca4af73cc272f57a358ecf75e82b9
+Z 339b357d35c1fb68817d90123ff83e8c
 # Remove this line to create a well-formed Fossil manifest.
index 3c68b6d6556977671875996c52b3016c144b2638..d3ff79492e323821a329e5e4d7b309b74d5cf4ec 100644 (file)
@@ -1 +1 @@
-055b97de8d2397987d72dbab1cde78ece2d1c066e95042b4ed6b7b36b2cf9006
+f23954e604bf4da45f07194b54a4fe1c83002ab65d6c6f0ac095e88baba18547