[SCM] GNU M4 source repository branch, master, updated. cvs-readonly-223-ge6a31a7

[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=e6a31a7b140bc717b5320e1dcb588eea46a6839c

The branch, master has been updated
       via  e6a31a7b140bc717b5320e1dcb588eea46a6839c (commit)
       via  8bd67d9a23c7189e0cb9cccc1dd5ad4a166c4f6c (commit)
      from  ab014edea195ad492846d916e7a8eddcee42d9dc (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 e6a31a7b140bc717b5320e1dcb588eea46a6839c
Author: Eric Blake <address@hidden>
Date:   Sat Jun 13 08:04:12 2009 -0600

    Avoid snprintf link failures.
    
    * ltdl/m4/gnulib-cache.m4: Import snprintf-posix module.
    Reported by Ralf Wildenhues.
    
    Signed-off-by: Eric Blake <address@hidden>

commit 8bd67d9a23c7189e0cb9cccc1dd5ad4a166c4f6c
Author: Ralf Wildenhues <address@hidden>
Date:   Fri Jun 12 12:20:14 2009 +0200

    Avoid pointer arithmetic on `void *'.
    
    * modules/m4.c (dump_symbol_CB): Cast obstack_base return value
    to `char *' before using it.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>
    Signed-off-by: Eric Blake <address@hidden>

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

Summary of changes:
 ChangeLog               |   12 ++++++++++++
 ltdl/m4/gnulib-cache.m4 |    3 ++-
 modules/m4.c            |    5 +++--
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 88e64e2..3b356c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2009-06-13  Eric Blake  <address@hidden>
+
+       Avoid snprintf link failures.
+       * ltdl/m4/gnulib-cache.m4: Import snprintf-posix module.
+       Reported by Ralf Wildenhues.
+
+2009-06-12  Ralf Wildenhues  <address@hidden>
+
+       Avoid pointer arithmetic on `void *'.
+       * modules/m4.c (dump_symbol_CB): Cast obstack_base return value
+       to `char *' before using it.
+
 2009-05-04  Eric Blake  <address@hidden>
 
        Silence verbose testsuite runs.
diff --git a/ltdl/m4/gnulib-cache.m4 b/ltdl/m4/gnulib-cache.m4
index e9b234d..d72313b 100644
--- a/ltdl/m4/gnulib-cache.m4
+++ b/ltdl/m4/gnulib-cache.m4
@@ -15,7 +15,7 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --local-dir=local --lib=libgnu 
--source-base=gnu --m4-base=ltdl/m4 --doc-base=doc --tests-base=tests/gnu 
--aux-dir=build-aux --with-tests --libtool --macro-prefix=M4 assert autobuild 
avltree-oset binary-io clean-temp cloexec close-stream closein config-h 
configmake dirname error execute exit fdl-1.3 fflush filenamecat flexmember 
fopen fopen-safer freadptr freadseek fseeko gendocs gettext git-version-gen 
gnumakefile gnupload gpl-3.0 intprops memchr2 memcmp2 memmem mkstemp obstack 
obstack-printf-posix pipe progname propername quote regex regexprops-generic 
rename sprintf-posix stdbool stdlib-safer strnlen strtod strtol tempname 
unlocked-io vasnprintf-posix verify verror wait-process xalloc xalloc-die 
xmemdup0 xprintf-posix xstrndup xvasprintf-posix
+#   gnulib-tool --import --dir=. --local-dir=local --lib=libgnu 
--source-base=gnu --m4-base=ltdl/m4 --doc-base=doc --tests-base=tests/gnu 
--aux-dir=build-aux --with-tests --libtool --macro-prefix=M4 assert autobuild 
avltree-oset binary-io clean-temp cloexec close-stream closein config-h 
configmake dirname error execute exit fdl-1.3 fflush filenamecat flexmember 
fopen fopen-safer freadptr freadseek fseeko gendocs gettext git-version-gen 
gnumakefile gnupload gpl-3.0 intprops memchr2 memcmp2 memmem mkstemp obstack 
obstack-printf-posix pipe progname propername quote regex regexprops-generic 
rename snprintf-posix sprintf-posix stdbool stdlib-safer strnlen strtod strtol 
tempname unlocked-io vasnprintf-posix verify verror wait-process xalloc 
xalloc-die xmemdup0 xprintf-posix xstrndup xvasprintf-posix
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([local])
@@ -63,6 +63,7 @@ gl_MODULES([
   regex
   regexprops-generic
   rename
+  snprintf-posix
   sprintf-posix
   stdbool
   stdlib-safer
diff --git a/modules/m4.c b/modules/m4.c
index f3cfc94..0597fe7 100644
--- a/modules/m4.c
+++ b/modules/m4.c
@@ -275,12 +275,13 @@ dump_symbol_CB (m4_symbol_table *ignored M4_GNUC_UNUSED, 
const char *name,
 
   if (symbol_data->size == 0)
     {
+      char *base;
       size_t offset = obstack_object_size (symbol_data->obs);
       obstack_blank (symbol_data->obs, sizeof *symbol_data->base);
       symbol_data->size = (obstack_room (symbol_data->obs)
                           / sizeof *symbol_data->base);
-      symbol_data->base = (m4_string *) (obstack_base (symbol_data->obs)
-                                        + offset);
+      base = (char *) obstack_base (symbol_data->obs) + offset;
+      symbol_data->base = (m4_string *) base;
     }
   else
     {


hooks/post-receive
-- 
GNU M4 source repository