shell.c.in: use eputz/oputz() instead of eputf/oputf() where appropriate to avoid...

FossilOrigin-Name: 9ef8317faebc29d016bdf2e8c678fb21ca2cfa95272f1f18b461fcaf0e220ac5

diff --git a/manifest b/manifest
index 7dd86f35531705dfdcc9a4ef8eddba714604d591..1153795db6e28f13eb55ded34e16b1440e63fb20 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sharmless\scompiler\swarnings\sin\sfts5V2toV1Tokenize().
-D 2024-08-24T20:05:59.988
+C shell.c.in:\suse\seputz/oputz()\sinstead\sof\seputf/oputf()\swhere\sappropriate\sto\savoid\scompilation\serrors\sin\s-std=c99\smode\s(namely\swasm\sbuilds).
+D 2024-08-25T11:59:29.477
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -765,7 +765,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 2c127880c0634962837f16f2f48a295e514357af959330cc038de73015d5b5e8
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c 4b14337a2742f0c0beeba490e9a05507e9b4b12184b9cd12773501d08d48e3fe
-F src/shell.c.in fa98789df3e106eac287b001decd28ef7fe703c119282f91294af32d5c18ce10
+F src/shell.c.in 5a05e1a1d187ab916afe9a628d7e9b20b5997273b595bd748db324814e0ccca9
 F src/sqlite.h.in f07bff4225a1244efd604a0ffef81ed69f29d3dbaed7e22f906f26229ba3ca9e
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54
@@ -2210,8 +2210,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 23ae505cbfde6dfd1dbb2216cf76c1e316b49f2ca84491a1aae28ad33f7777a9
-R 3d0d5a942eeee701f351d015af5828aa
-U drh
-Z b6c5eb8f043c1d2348c0c60d14f2a5f6
+P df65d00f104f31741056686f2ba41ecb192c552012bffb17c2a8b5d4db058328
+R 8d4b348b6bf673b94cab6e107b5bbb73
+U stephan
+Z 5120e8419efd39e01384da30ed409ec4
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index fc66c305e96c59d3072bd16872891cd48705dd1e..4e98a047908934470e9a01673204fb8c5e20340e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-df65d00f104f31741056686f2ba41ecb192c552012bffb17c2a8b5d4db058328
+9ef8317faebc29d016bdf2e8c678fb21ca2cfa95272f1f18b461fcaf0e220ac5

diff --git a/src/shell.c.in b/src/shell.c.in
index ab17f46e14a3779db733477a94e9b6ba73bd6c3f..db10d21b8ee74541759f63933cb266961dafc4fe 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -283,7 +283,7 @@ INCLUDE ../ext/consio/console_io.c
 #else
 /* For Fiddle, all console handling and emit redirection is omitted. */
 /* These next 3 macros are for emitting formatted output. When complaints
- * from the WASM build are issued for non-formatted output, (when a mere
+ * from the WASM build are issued for non-formatted output, when a mere
  * string literal is to be emitted, the ?putz(z) forms should be used.
  * (This permits compile-time checking of format string / argument mismatch.)
  */
@@ -11070,11 +11070,11 @@ static int do_meta_command(char *zLine, ShellState *p){
               }
               if( jj>=ArraySize(aLabel) ){
                 eputf("Error: no such optimization: \"%s\"\n", zLabel);
-                eputf("Should be one of:");
+                eputz("Should be one of:");
                 for(jj=0; jj<ArraySize(aLabel); jj++){
                   eputf(" %s", aLabel[jj].zLabel);
                 }
-                eputf("\n");
+                eputz("\n");
                 rc = 1;
                 goto meta_command_exit;
               }
@@ -11091,9 +11091,9 @@ static int do_meta_command(char *zLine, ShellState *p){
             curOpt = ~newOpt;
           }
           if( newOpt==0 ){
-            oputf("+All\n");
+            oputz("+All\n");
           }else if( newOpt==0xffffffff ){
-            oputf("-All\n");
+            oputz("-All\n");
           }else{
             int jj;
             for(jj=0; jj<ArraySize(aLabel); jj++){