Avoid m4 warnings on bad m4_format usage.

* lib/m4sugar/m4sugar.m4 (m4_text_wrap): Use %*s, in case width
evaulates to 0.
* lib/autotest/general.m4 (AT_ordinal): Likewise; also ensure that
enough arguments are provided.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index 159ba5b24eeca67a0eff09b4ba46bd81d46fc1e9..6d613c1e5396eee9c9f10f9682719c96642ece0e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,15 @@
+2007-10-08  Eric Blake  <ebb9@byu.net>
+
+       Avoid m4 warnings on bad m4_format usage.
+       * lib/m4sugar/m4sugar.m4 (m4_text_wrap): Use %*s, in case width
+       evaulates to 0.
+       * lib/autotest/general.m4 (AT_ordinal): Likewise; also ensure that
+       enough arguments are provided.
+
 2007-10-06  Paolo Bonzini  <bonzini@gnu.org>
 
-        * doc/autoconf.texi (Shell portability): Document shell function
-        portability.
+       * doc/autoconf.texi (Shell portability): Document shell function
+       portability.
 
 2007-10-06  Paolo Bonzini  <bonzini@gnu.org>
 

diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
index df74838ba159d102d2c84da0aa0d79a7b29a1d11..707c7db65f0fa5efaa05c175f6c1c23520d1582f 100644 (file)
--- a/lib/autotest/general.m4
+++ b/lib/autotest/general.m4
@@ -1257,8 +1257,8 @@ m4_divert_push([TESTS])dnl
   AT_ordinal ) @%:@ AT_ordinal. m4_defn([AT_line]): m4_defn([AT_description])
     at_setup_line='m4_defn([AT_line])'
     at_desc="AS_ESCAPE(m4_dquote(m4_defn([AT_description])))"
-    $at_quiet AS_ECHO_N(["m4_format([%3d: ], AT_ordinal)$at_desc"]dnl
-["m4_format(%m4_eval(47 - m4_qlen(m4_defn([AT_description])))[s])"])
+    $at_quiet AS_ECHO_N([m4_format(["%3d: $at_desc%*s"], AT_ordinal,
+      m4_eval(47 - m4_qlen(m4_defn([AT_description]))), [])])
 m4_divert_push([TEST_SCRIPT])dnl
 ])
 

diff --git a/lib/m4sugar/m4sugar.m4 b/lib/m4sugar/m4sugar.m4
index 1da5220f2cd9cce77fd40500aaef1ffb87333766..5385b3f48cebbfa80e3414e440534a3467c68a6f 100644 (file)
--- a/lib/m4sugar/m4sugar.m4
+++ b/lib/m4sugar/m4sugar.m4
@@ -1745,7 +1745,8 @@ m4_Prefix],
        [m4_eval(m4_qlen(m4_defn([m4_Prefix1])) < m4_len(m4_Prefix))],
        [0], [],
        [m4_define([m4_Cursor], m4_len(m4_Prefix))[]dnl
-m4_format(%m4_eval(m4_len(m4_Prefix) - 1 - m4_qlen(m4_defn([m4_Prefix1])))[s],
+m4_format([%*s],
+         m4_eval(m4_len(m4_Prefix) - 1 - m4_qlen(m4_defn([m4_Prefix1]))),
          [])])[]dnl
 m4_foreach_w([m4_Word], [$1],
 [m4_define([m4_Cursor], m4_eval(m4_Cursor + m4_qlen(m4_defn([m4_Word])) + 1))dnl