From: drh <>
Date: Wed, 22 Sep 2021 10:28:50 +0000 (+0000)
Subject: Use sqlite3_snprintf() for the ".changes" output formatting in the shell
X-Git-Tag: version-3.37.0~210
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6d9f034ba87269e4968e8c40ddd4d2a17b4968ed;p=thirdparty%2Fsqlite.git

Use sqlite3_snprintf() for the ".changes" output formatting in the shell
because it now uses %lld, and some older C compilers do not understand that
construct.

FossilOrigin-Name: 53dadf80672a4fe05341fe40873b6cfa73f6bc1e07cc41fcf10fe290c9156363
---

diff --git a/manifest b/manifest
index 4202f3e506..f86734c343 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\s.expert\sname\scollision\sbug\sreported\sat\shttps://sqlite.org/forum/forumpost/05e6f32984561f57?t=h
-D 2021-09-21T20:03:05.965
+C Use\ssqlite3_snprintf()\sfor\sthe\s".changes"\soutput\sformatting\sin\sthe\sshell\nbecause\sit\snow\suses\s%lld,\sand\ssome\solder\sC\scompilers\sdo\snot\sunderstand\sthat\nconstruct.
+D 2021-09-22T10:28:50.658
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -548,7 +548,7 @@ F src/random.c 097dc8b31b8fba5a9aca1697aeb9fd82078ec91be734c16bffda620ced7ab83c
 F src/resolve.c 42b94d37a54200707a95566eff4f7e8a380e32d080016b699f23bd79a73a5028
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c 030c3d07326708343208418c84da607752aebc13c92df929b7c68c7c08e7df54
-F src/shell.c.in 639c01f9a743ed73beb1d4b1e982b07b731c3801811d8344063f43b11008582a
+F src/shell.c.in 937934e6f64502b7c33d1cce2a981a5fc34bb906d203186c3fa6aa24c41303d2
 F src/sqlite.h.in 4e977a5e2ed1a9e8987ff65a2cab5f99a4298ebf040ea5ff636e1753339ff45a
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h e97f4e9b509408fea4c4e9bef5a41608dfac343b4d3c7a990dedde1e19af9510
@@ -1925,7 +1925,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 a1c7f7f8e1b46440234be96e813e4c2c28150413dd95dcab5d13b9c80a202edf
-R 4025a996a7ae646cead16f1b9879d649
-U larrybr
-Z c2e5ece08cc58eb5c76d74654bc5b60e
+P 4a3f98ad0dd2a8c0370042611a041bed2bd8d9ca82d6706e2db349eb97aaf1f0
+R 51d44ac91d7412651fc030dfe8de96ff
+U drh
+Z 4a6f83300593abcce49be47ea108877f
diff --git a/manifest.uuid b/manifest.uuid
index 57b60e08fd..d91103bc4c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4a3f98ad0dd2a8c0370042611a041bed2bd8d9ca82d6706e2db349eb97aaf1f0
\ No newline at end of file
+53dadf80672a4fe05341fe40873b6cfa73f6bc1e07cc41fcf10fe290c9156363
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index 513f9bcaee..3d8f9537dd 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -10774,8 +10774,11 @@ static int runOneSqlLine(ShellState *p, char *zSql, FILE *in, int startline){
     }
     return 1;
   }else if( ShellHasFlag(p, SHFLG_CountChanges) ){
-    raw_printf(p->out, "changes: %3lld   total_changes: %lld\n",
+    char zLineBuf[2000];
+    sqlite3_snprintf(sizeof(zLineBuf), zLineBuf,
+            "changes: %lld   total_changes: %lld",
             sqlite3_changes64(p->db), sqlite3_total_changes64(p->db));
+    raw_printf(p->out, "%s\n", zLineBuf);
   }
   return 0;
 }