m4-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Gary V. Vaughan
Subject: [SCM] GNU M4 source repository branch, master, updated. cvs-readonly-321-g25f5825
Date: Wed, 19 Nov 2014 13:35:03 +0000

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=25f5825272d2e2aa17c0c626026c5b7ba6dbd6f5

The branch, master has been updated
       via  25f5825272d2e2aa17c0c626026c5b7ba6dbd6f5 (commit)
       via  22b46f4ab25c345937d656a91adfe0c2a433a1f0 (commit)
       via  5756e9af9addf1891b92c50f8bbb12ef08ca6334 (commit)
       via  14a0629ba3b954f647bfaa2a72e18dc6a24b2d1a (commit)
      from  c09a187c50f2f74e89d4d0991bdbd2c6846cc707 (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 25f5825272d2e2aa17c0c626026c5b7ba6dbd6f5
Author: Gary V. Vaughan <address@hidden>
Date:   Sun Sep 22 17:22:40 2013 +0700

    configury: separate installed modules from test only modules.
    
    * modulues/import.c, modules/modtest.c, modules/shadow.c: Move
    from here...
    * tests/import.c, tests/modtest.c, tests/shadow.c: ...to here.
    * Makefile.am: Adjust.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

commit 22b46f4ab25c345937d656a91adfe0c2a433a1f0
Author: Gary V. Vaughan <address@hidden>
Date:   Sun Sep 22 16:57:49 2013 +0700

    maint: fix some warnings that break compilation with -Werror.
    
    * m4/hash.c (ITERATOR_NEXT_NEXT): Hide unused macro.
    (maybe_grow): Prevent implicit double promotion.
    (m4_get_hash_length, m4_get_hash_iterator_key)
    (m4_get_hash_iterator_value, m4_hash_string_hash)
    (m4_hash_string_cmp): Add pure attribute for gcc.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

commit 5756e9af9addf1891b92c50f8bbb12ef08ca6334
Author: Gary V. Vaughan <address@hidden>
Date:   Sun Sep 22 16:54:41 2013 +0700

    maint: fix a type coercion flagged by -Wformat.
    
    * modules/m4.c (maketemp): Don't pass a size_t as the precission
    parameter to %.*s.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

commit 14a0629ba3b954f647bfaa2a72e18dc6a24b2d1a
Author: Gary V. Vaughan <address@hidden>
Date:   Sun Sep 22 16:22:06 2013 +0700

    maint: fix gnulib path in .gitmodules.
    
    * .gitmodules (gnulib): Set path to build-aux/gnulib.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

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

Summary of changes:
 .gitmodules                  |    2 +-
 Makefile.am                  |   61 ++++++++++++++++++++----------------------
 m4/hash.c                    |   14 +++++-----
 modules/m4.c                 |    2 +-
 {modules => tests}/import.c  |    0
 {modules => tests}/modtest.c |    0
 {modules => tests}/shadow.c  |    0
 7 files changed, 38 insertions(+), 41 deletions(-)
 rename {modules => tests}/import.c (100%)
 rename {modules => tests}/modtest.c (100%)
 rename {modules => tests}/shadow.c (100%)

diff --git a/.gitmodules b/.gitmodules
index bb9e1ba..0d4d08a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "gnulib"]
-        path = gnulib
+        path = build-aux/gnulib
         url = git://git.sv.gnu.org/gnulib.git
diff --git a/Makefile.am b/Makefile.am
index c752ff2..e9ec90d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -52,6 +52,7 @@ MAINTAINERCLEANFILES =
 include_HEADERS        =
 noinst_LTLIBRARIES=
 lib_LTLIBRARIES        =
+check_LTLIBRARIES =
 EXTRA_LTLIBRARIES=
 
 # Additional configuration.  Version management comes from suggestions
@@ -152,24 +153,20 @@ module_libadd     = m4/libm4.la
 
 noinst_HEADERS = modules/m4.h
 
-pkglib_LTLIBRARIES = \
-                 modules/gnu.la \
-                 modules/m4.la \
-                 modules/traditional.la
+pkglib_LTLIBRARIES =
 
+pkglib_LTLIBRARIES            += modules/gnu.la
 EXTRA_modules_gnu_la_SOURCES   = modules/format.c
 modules_gnu_la_LDFLAGS         = $(module_ldflags)
 modules_gnu_la_LIBADD          = $(module_libadd)
 EXTRA_DIST                    += $(EXTRA_modules_gnu_la_SOURCES)
 
+pkglib_LTLIBRARIES            += modules/m4.la
 EXTRA_modules_m4_la_SOURCES    = modules/evalparse.c
 modules_m4_la_LDFLAGS          = $(module_ldflags)
 modules_m4_la_LIBADD           = $(module_libadd)
 EXTRA_DIST                    += $(EXTRA_modules_m4_la_SOURCES)
 
-modules_traditional_la_LDFLAGS = $(module_ldflags)
-modules_traditional_la_LIBADD  = $(module_libadd)
-
 if USE_GMP
 pkglib_LTLIBRARIES            += modules/mpeval.la
 EXTRA_modules_mpeval_la_SOURCES        = modules/evalparse.c
@@ -177,33 +174,17 @@ modules_mpeval_la_LDFLAGS = $(module_ldflags)
 modules_mpeval_la_LIBADD       = $(module_libadd) $(LIBADD_GMP)
 endif
 
-module_check   = -rpath /dev/null
-check_LTLIBRARIES = \
-                 tests/import.la \
-                 tests/modtest.la \
-                 tests/shadow.la \
-                 tests/stdlib.la \
-                 tests/time.la
-
-tests_import_la_LDFLAGS                = $(module_ldflags) $(module_check)
-tests_import_la_LIBADD         = $(module_libadd)
-tests_import_la_SOURCES                = modules/import.c
-
-tests_modtest_la_LDFLAGS       = $(module_ldflags) $(module_check)
-tests_modtest_la_LIBADD                = $(module_libadd)
-tests_modtest_la_SOURCES       = modules/modtest.c
+pkglib_LTLIBRARIES            += modules/stdlib.la
+modules_stdlib_la_LDFLAGS      = $(module_ldflags)
+modules_stdlib_la_LIBADD       = $(module_libadd)
 
-tests_shadow_la_LDFLAGS                = $(module_ldflags) $(module_check)
-tests_shadow_la_LIBADD         = $(module_libadd)
-tests_shadow_la_SOURCES                = modules/shadow.c
-
-tests_stdlib_la_LDFLAGS                = $(module_ldflags) $(module_check)
-tests_stdlib_la_LIBADD         = $(module_libadd)
-tests_stdlib_la_SOURCES                = modules/stdlib.c
+pkglib_LTLIBRARIES            += modules/time.la
+modules_time_la_LDFLAGS                = $(module_ldflags)
+modules_time_la_LIBADD         = $(module_libadd)
 
-tests_time_la_LDFLAGS          = $(module_ldflags) $(module_check)
-tests_time_la_LIBADD           = $(module_libadd)
-tests_time_la_SOURCES          = modules/time.c
+pkglib_LTLIBRARIES            += modules/traditional.la
+modules_traditional_la_LDFLAGS = $(module_ldflags)
+modules_traditional_la_LIBADD  = $(module_libadd)
 
 
 ## ----- ##
@@ -244,6 +225,7 @@ EXTRA_DIST     += m4/system_.h
 ## -------------- ##
 ## Documentation. ##
 ## -------------- ##
+
 info_TEXINFOS  = doc/m4.texi
 m4_TEXINFOS    = doc/regexprops-generic.texi doc/fdl-1.3.texi doc/gpl-3.0.texi
 dist_man_MANS  = $(srcdir)/doc/m4.1
@@ -370,9 +352,24 @@ EXTRA_DIST     += $(TESTSUITE) $(TESTSUITE_AT) 
$(OTHER_FILES) \
                  tests/generate.awk \
                  $(srcdir)/tests/package.m4
 
+module_check   = -rpath /dev/null
+
+check_LTLIBRARIES             += tests/import.la
+tests_import_la_LDFLAGS                = $(module_ldflags) $(module_check)
+tests_import_la_LIBADD         = $(module_libadd)
+
+check_LTLIBRARIES             += tests/modtest.la
+tests_modtest_la_LDFLAGS       = $(module_ldflags) $(module_check)
+tests_modtest_la_LIBADD                = $(module_libadd)
+
+check_LTLIBRARIES             += tests/shadow.la
+tests_shadow_la_LDFLAGS                = $(module_ldflags) $(module_check)
+tests_shadow_la_LIBADD         = $(module_libadd)
+
 # Using variables so that this snippet is not too wide and can
 # be used as is in Texinfo @example/@end example.
 m4_texi     = $(srcdir)/doc/m4.texi
+
 generate    = $(AWK) -f $(srcdir)/tests/generate.awk
 $(srcdir)/tests/generated.at: tests/generate.awk $(m4_texi)
        $(generate) $(m4_texi) >address@hidden
diff --git a/m4/hash.c b/m4/hash.c
index a113e08..3acc709 100644
--- a/m4/hash.c
+++ b/m4/hash.c
@@ -80,7 +80,7 @@ struct m4_hash_iterator
 #define ITERATOR_NEXT(i)        ((i)->next)
 #define ITERATOR_NEXT_BUCKET(i) ((i)->next_bucket)
 
-#define ITERATOR_NEXT_NEXT(i)   NODE_NEXT (ITERATOR_PLACE (i))
+/*#define ITERATOR_NEXT_NEXT(i)   NODE_NEXT (ITERATOR_PLACE (i))*/
 
 /* Helper macros. */
 #define BUCKET_NTH(hash, n)     (HASH_BUCKETS (hash)[n])
@@ -368,7 +368,7 @@ node_lookup (m4_hash *hash, const void *key)
 
 /* How many entries are currently contained by HASH.  Safe to call
    even during an interation.  */
-size_t
+size_t M4_GNUC_PURE
 m4_get_hash_length (m4_hash *hash)
 {
   assert (hash);
@@ -424,7 +424,7 @@ maybe_grow (m4_hash *hash)
 
   nodes_per_bucket = (float) HASH_LENGTH (hash) / (float) HASH_SIZE (hash);
 
-  if (nodes_per_bucket > M4_HASH_MAXIMUM_DENSITY)
+  if (nodes_per_bucket > (float) M4_HASH_MAXIMUM_DENSITY)
     {
       size_t original_size = HASH_SIZE (hash);
       hash_node **original_buckets = HASH_BUCKETS (hash);
@@ -587,7 +587,7 @@ m4_free_hash_iterator (const m4_hash *hash, 
m4_hash_iterator *place)
 }
 
 /* Return the key being visited by the iterator PLACE.  */
-const void *
+const void * M4_GNUC_PURE
 m4_get_hash_iterator_key (m4_hash_iterator *place)
 {
   assert (place);
@@ -596,7 +596,7 @@ m4_get_hash_iterator_key (m4_hash_iterator *place)
 }
 
 /* Return the value being visited by the iterator PLACE.  */
-void *
+void * M4_GNUC_PURE
 m4_get_hash_iterator_value (m4_hash_iterator *place)
 {
   assert (place);
@@ -642,7 +642,7 @@ m4_hash_apply (m4_hash *hash, m4_hash_apply_func *func, 
void *userdata)
 
 /* Return a hash value for a string, similar to gnulib's hash module,
    but with length factored in.  */
-size_t
+size_t M4_GNUC_PURE
 m4_hash_string_hash (const void *ptr)
 {
   const m4_string *key = (const m4_string *) ptr;
@@ -657,7 +657,7 @@ m4_hash_string_hash (const void *ptr)
 
 /* Comparison function for hash keys -- used by the underlying
    hash table ADT when searching for a key match during name lookup.  */
-int
+int M4_GNUC_PURE
 m4_hash_string_cmp (const void *key, const void *try)
 {
   const m4_string *a = (const m4_string *) key;
diff --git a/modules/m4.c b/modules/m4.c
index ec47d01..1d2f7f5 100644
--- a/modules/m4.c
+++ b/modules/m4.c
@@ -769,7 +769,7 @@ M4BUILTIN_HANDLER (maketemp)
       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
     m4_make_temp (context, obs, me, M4ARG (1), M4ARGLEN (1), false);
diff --git a/modules/import.c b/tests/import.c
similarity index 100%
rename from modules/import.c
rename to tests/import.c
diff --git a/modules/modtest.c b/tests/modtest.c
similarity index 100%
rename from modules/modtest.c
rename to tests/modtest.c
diff --git a/modules/shadow.c b/tests/shadow.c
similarity index 100%
rename from modules/shadow.c
rename to tests/shadow.c


hooks/post-receive
-- 
GNU M4 source repository



reply via email to

[Prev in Thread] Current Thread [Next in Thread]