From: drh Date: Sun, 9 Aug 2020 17:58:45 +0000 (+0000) Subject: Fix a harmless compiler warning. X-Git-Tag: version-3.33.0~16 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=14d093f8473a532a3be809567df9c458b677ed86;p=thirdparty%2Fsqlite.git Fix a harmless compiler warning. FossilOrigin-Name: 6f91769fdb0734905f05e1f4d1c81364e6e874450c9f13a0de2259d564f582a7 --- diff --git a/manifest b/manifest index 1788b467aa..0a629e359e 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sthe\scheck-in\sat\s[41474548ef3f7454]\sso\sthat\sit\scomputes\sthe\spointer\sin\ntime\sfor\serror\schecking\sat\sthe\send\sof\sthe\sroutine\sin\sthe\scase\sof\sa\snon-OOM\nerror. -D 2020-08-08T20:15:16.232 +C Fix\sa\sharmless\scompiler\swarning. +D 2020-08-09T17:58:45.882 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -522,7 +522,7 @@ F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586 F src/os_unix.c 9b1b860163fd2d4d7679b5260d384d1a9f88ef917a90f28963eca8acd472d8c8 F src/os_win.c a2149ff0a85c1c3f9cc102a46c673ce87e992396ba3411bfb53db66813b32f1d F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a -F src/pager.c 9313ca2c38b39c170d1850a93be62a0a2d427a74ea8e6f263513921b3d759243 +F src/pager.c 3700a1c55427a3d4168ad1f1b8a8b0cb9ace1d107e4506e30a8f1e66d8a1195e F src/pager.h 4bf9b3213a4b2bebbced5eaa8b219cf25d4a82f385d093cd64b7e93e5285f66f F src/parse.y 5bdb760a29c0b25caf7e80e82210b81cd2ea3066d5199ca29e6eac40b34bc184 F src/pcache.c 385ff064bca69789d199a98e2169445dc16e4291fa807babd61d4890c3b34177 @@ -1879,7 +1879,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P b412d1d175fde9c6402b6fda7c73ac2db2471f2c9416d5c5073549732dea6d98 -R a6278275a673244b6c78e7a33a428cc8 +P 13d2fed760e7d0def573c56b7181f45622b0ed78d61952a6de901f96949d074e +R d39f49f96174d69a8b9440af3c86a6c6 U drh -Z 4ca012618d12e161cfcf270082963e64 +Z a51d045a11d03da0c517cdccb709af8f diff --git a/manifest.uuid b/manifest.uuid index 80caccb2e0..d1f02b1399 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -13d2fed760e7d0def573c56b7181f45622b0ed78d61952a6de901f96949d074e \ No newline at end of file +6f91769fdb0734905f05e1f4d1c81364e6e874450c9f13a0de2259d564f582a7 \ No newline at end of file diff --git a/src/pager.c b/src/pager.c index c73ed94b83..005d678f94 100644 --- a/src/pager.c +++ b/src/pager.c @@ -2494,6 +2494,7 @@ static int pager_delsuper(Pager *pPager, const char *zSuper){ pSuper = (sqlite3_file *)sqlite3MallocZero(pVfs->szOsFile * 2); if( !pSuper ){ rc = SQLITE_NOMEM_BKPT; + pJournal = 0; }else{ const int flags = (SQLITE_OPEN_READONLY|SQLITE_OPEN_SUPER_JOURNAL); rc = sqlite3OsOpen(pVfs, zSuper, pSuper, flags, 0);