From: drh <> Date: Thu, 5 Feb 2026 13:03:04 +0000 (+0000) Subject: Fix harmless compiler warning when the CLI is compiled with X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e58c1a987cc2086356423376cf696557f37999ab;p=thirdparty%2Fsqlite.git Fix harmless compiler warning when the CLI is compiled with SQLITE_OMIT_PROGRESS_CALLBACK. FossilOrigin-Name: d6150c813ce43e15285a07d24135b10a7c254b3c175dee4f61c3b6a6ce91c29f --- diff --git a/manifest b/manifest index 0cee9e9621..17ffe57dd9 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Display\sscanstatus\sresults\sin\sneat\scolumns. -D 2026-02-04T20:51:27.822 +C Fix\sharmless\scompiler\swarning\swhen\sthe\sCLI\sis\scompiled\swith\nSQLITE_OMIT_PROGRESS_CALLBACK. +D 2026-02-05T13:03:04.505 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -739,7 +739,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c 47aa7fdc9ec4c19b103ac5e79d7887d30119b5675309facf5eed1118391c868b F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 F src/select.c 098caf322d17cd480a5ebd81b9252b9ad90c72be7d5cdc5875e4a0a43e0ba965 -F src/shell.c.in fe1ad71964401a1bd1fc396aa524634096bcbe6cb20b0091a19490e1789431fb +F src/shell.c.in b944a21d98cc4c6107bfd1ec702440579cb4bf86435125b67ff661180e9453b5 F src/sqlite.h.in 8bcbaecfe2cbecf8c5c1381354fcdd7d307443e88b4953fccb222456c1267b61 F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479 F src/sqlite3ext.h 1b7a0ee438bb5c2896d0609c537e917d8057b3340f6ad004d2de44f03e3d3cca @@ -2194,8 +2194,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c -P e6902937ecdbeb449986469859b46631272fb0a9e7e1c31adea14cff072b6d67 -R 43daeeac5ff8274b48ad77362f50e842 +P c476d956d0bd3065cf894de6f9d393b999ff7d2268a35f01a6d88804789ab58f +R 39afed9578b15cff4dc3299503d822ef U drh -Z d676c59d86c6fefd831836dd5b0f9b5c +Z 0eb77c9d708daad390b936c51814f869 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index fe635c9ee8..16d411d198 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -c476d956d0bd3065cf894de6f9d393b999ff7d2268a35f01a6d88804789ab58f +d6150c813ce43e15285a07d24135b10a7c254b3c175dee4f61c3b6a6ce91c29f diff --git a/src/shell.c.in b/src/shell.c.in index 28770664d8..a9c88e7688 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -1420,6 +1420,7 @@ static double timeDiff(struct timeval *pStart, struct timeval *pEnd){ (double)(pEnd->tv_sec - pStart->tv_sec); } +#ifndef SQLITE_OMIT_PROGRESS_CALLBACK /* Return the time since the start of the timer in ** seconds. */ static double elapseTime(ShellState *NotUsed){ @@ -1427,6 +1428,7 @@ static double elapseTime(ShellState *NotUsed){ if( iBegin==0 ) return 0.0; return (timeOfDay() - iBegin)*0.000001; } +#endif /* SQLITE_OMIT_PROGRESS_CALLBACK */ /* ** Print the timing results. @@ -1511,6 +1513,7 @@ static double timeDiff(FILETIME *pStart, FILETIME *pEnd){ return (double) ((i64End - i64Start) / 10000000.0); } +#ifndef SQLITE_OMIT_PROGRESS_CALLBACK /* Return the time since the start of the timer in ** seconds. */ static double elapseTime(ShellState *NotUsed){ @@ -1518,6 +1521,7 @@ static double elapseTime(ShellState *NotUsed){ if( ftWallBegin==0 ) return 0.0; return (timeOfDay() - ftWallBegin)*0.000001; } +#endif /* SQLITE_OMIT_PROGRESS_CALLBACK */ /* ** Print the timing results.