From: dan Date: Fri, 24 Jul 2026 14:10:00 +0000 (+0000) Subject: Fix a problem in test1.c causing test script win32lock.test to fail. X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=b047809309cc5b870e2bdd9f53d070988df28dc3;p=thirdparty%2Fsqlite.git Fix a problem in test1.c causing test script win32lock.test to fail. FossilOrigin-Name: 8f6d25b3f0171a40be8a5cb646739f54e496aaf9d4829c24c243ec4b71e0caa8 --- diff --git a/manifest b/manifest index 82569cc893..19a5fbdd11 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sto\sthe\sinteraction\sbetween\sindexes-on-expressions,\ssubtypes,\sand\nthe\sunary\s"+"\soperator.\s\sThis\sis\sa\scontinuation\sof\sthe\sprior\sfix\sfrom\ncheck-in\s[d75c08c8416bde3f].\s\sThis\senhanced\sfix\sis\sprompted\sby\n[bugs:/info/2026-07-24T08:42:47Z|Bug\s2026-07-24T08:42:47Z]. -D 2026-07-24T13:36:44.121 +C Fix\sa\sproblem\sin\stest1.c\scausing\stest\sscript\swin32lock.test\sto\sfail. +D 2026-07-24T14:10:00.168 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -753,7 +753,7 @@ F src/status.c 7565d63a79aa2f326339a24a0461a60096d0bd2bce711fefb50b5c89335f3592 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1 F src/tclsqlite.c dce1b8217ed34545d8ce04375f22dc05b3f04e124994bd110969d6267480c1b8 F src/tclsqlite.h 614b3780a62522bc9f8f2b9fb22689e8009958e7aa77e572d0f3149050af348a -F src/test1.c f226403694e7273614de9550e41e6839106ee10988a2d37d8a25a94aa85f825f +F src/test1.c db1dd68d65774552ec170417339d4c9b9e940b08b2ec1081e3cf86b0911c3386 F src/test2.c a61ed01d9264a1db74ab42fbc981fc66165f85d5e3947e92be61a73e79ec4f2d F src/test3.c e3e5a073c516295ee33d8d7482b6a87b7f2073867478441efc35928ee0eb97a7 F src/test4.c 0ac87fc13cdb334ab3a71823f99b6c32a6bebe5d603cd6a71d84c823d43a25a0 @@ -2217,8 +2217,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c -P 4d60798b20a560beb945afe7e2998714aa7e5a83a9db078d4431040f0b6e7350 -R bcb7fb7bd55d0c0545755c97da1a6ef8 -U drh -Z c6eb01888af81cac226065cb0f4ef157 +P 5398c6a2b6b218461ce1f6437791c62c1ee125fba195660e0d6d1ad97ed6d14c +R d3000ffe0536a7cecf8a48202e3ff523 +U dan +Z fb993a1ddeb384f9ce40958bd01d71db # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 9e24aedd69..88a485b089 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -5398c6a2b6b218461ce1f6437791c62c1ee125fba195660e0d6d1ad97ed6d14c +8f6d25b3f0171a40be8a5cb646739f54e496aaf9d4829c24c243ec4b71e0caa8 diff --git a/src/test1.c b/src/test1.c index 08f31ddb68..24f77334d8 100644 --- a/src/test1.c +++ b/src/test1.c @@ -7196,7 +7196,7 @@ static int SQLITE_TCLAPI file_control_win32_set_handle( } rc = sqlite3_file_control(db, NULL, SQLITE_FCNTL_WIN32_SET_HANDLE, (void*)&hFile); - sqlite3_snprintf(sizeof(z), z, "%d %p", rc, (void*)hFile); + sqlite3_snprintf(sizeof(z), z, "%d %s", rc,testPointerToString((void*)hFile)); Tcl_AppendResult(interp, z, (char*)0); return TCL_OK; }