[SCM] GNU M4 source repository branch, branch-1.6, updated. v1.5.89a-144-g8048110

[Eric Blake]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU M4 source repository".

http://git.sv.gnu.org/gitweb/?p=m4.git;a=commitdiff;h=80481109d9ece4d0a59ded51302873d665f102d2

The branch, branch-1.6 has been updated
       via  80481109d9ece4d0a59ded51302873d665f102d2 (commit)
      from  52b195a5edbd9b534c40493d58a3f203d6271fbc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 80481109d9ece4d0a59ded51302873d665f102d2
Author: Eric Blake <address@hidden>
Date:   Fri Nov 27 20:55:17 2009 -0700

    Use correct printf formats.
    
    * src/macro.c (adjust_refcount): Use %zu for size_t.
    * src/builtin.c (m4_maketemp): Ensure format width argument is
    cast to int.
    Reported by Ralf Wildenhues.
    
    Signed-off-by: Eric Blake <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog     |    8 ++++++++
 src/builtin.c |    2 +-
 src/macro.c   |    2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c77bae9..524457e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-11-28  Eric Blake  <address@hidden>
+
+       Use correct printf formats.
+       * src/macro.c (adjust_refcount): Use %zu for size_t.
+       * src/builtin.c (m4_maketemp): Ensure format width argument is
+       cast to int.
+       Reported by Ralf Wildenhues.
+
 2009-11-26  Eric Blake  <address@hidden>
 
        Ignore write failures before stack overflow exit.
diff --git a/src/builtin.c b/src/builtin.c
index ea27f74..b04abc5 100644
--- a/src/builtin.c
+++ b/src/builtin.c
@@ -1671,7 +1671,7 @@ m4_maketemp (struct obstack *obs, int argc, 
macro_arguments *argv)
       if (len - i < pid_len)
        obstack_grow (obs, pid + pid_len - (len - i), len - i);
       else
-       obstack_printf (obs, "%.*d%s", len - i - pid_len, 0, pid);
+       obstack_printf (obs, "%.*d%s", (int) (len - i - pid_len), 0, pid);
     }
   else
     mkstemp_helper (obs, me, ARG (1), ARG_LEN (1));
diff --git a/src/macro.c b/src/macro.c
index 403a90d..47e0315 100644
--- a/src/macro.c
+++ b/src/macro.c
@@ -746,7 +746,7 @@ adjust_refcount (int level, bool increase)
     }
   if (debug_macro_level
       & (increase ? PRINT_REFCOUNT_INCREASE : PRINT_REFCOUNT_DECREASE))
-    xfprintf (debug, "m4debug: level %d refcount=%d\n", level,
+    xfprintf (debug, "m4debug: level %d refcount=%zu\n", level,
              stacks[level].refcount);
   return stacks[level].refcount;
 }


hooks/post-receive
-- 
GNU M4 source repository