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

[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=891a0fd44d0666fc0576071ec9866cb2b87490eb

The branch, branch-1.6 has been updated
       via  891a0fd44d0666fc0576071ec9866cb2b87490eb (commit)
       via  dae39a14fd724380af8d19a63703ab51db4d96d4 (commit)
      from  0b17f4d076af8ce7349b97f5a5e4c94dd27630db (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 891a0fd44d0666fc0576071ec9866cb2b87490eb
Author: Eric Blake <address@hidden>
Date:   Thu Jun 25 12:08:25 2009 -0600

    Use bitrotate for hashing.
    
    * gnulib: Update to latest.
    * m4/gnulib-cache.m4: Import bitrotate module.
    * src/symtab.c (hash): Use it.
    
    Signed-off-by: Eric Blake <address@hidden>

commit dae39a14fd724380af8d19a63703ab51db4d96d4
Author: Eric Blake <address@hidden>
Date:   Thu Jun 25 11:04:48 2009 -0600

    Fix description of limits on diversions.
    
    * doc/m4.texinfo (Diversions): Fix grammar.  Be less pessimistic
    about limitations.
    * THANKS: Update.
    Reported by Elias Benali.
    
    Signed-off-by: Eric Blake <address@hidden>
    (cherry picked from commit cd172d932ce467b2c592eb9a603962b280aa0570)

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

Summary of changes:
 ChangeLog          |   13 +++++++++++++
 THANKS             |    1 +
 doc/m4.texinfo     |    9 ++++-----
 gnulib             |    2 +-
 m4/gnulib-cache.m4 |    3 ++-
 src/symtab.c       |    3 ++-
 6 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d35b823..69321da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2009-06-25  Eric Blake  <address@hidden>
+
+       Use bitrotate for hashing.
+       * gnulib: Update to latest.
+       * m4/gnulib-cache.m4: Import bitrotate module.
+       * src/symtab.c (hash): Use it.
+
+       Fix description of limits on diversions.
+       * doc/m4.texinfo (Diversions): Fix grammar.  Be less pessimistic
+       about limitations.
+       * THANKS: Update.
+       Reported by Elias Benali.
+
 2009-06-20  Eric Blake  <address@hidden>
 
        Update gnulib for hash fixes.
diff --git a/THANKS b/THANKS
index f7779ab..95e841f 100644
--- a/THANKS
+++ b/THANKS
@@ -32,6 +32,7 @@ Daniel Richard G.     address@hidden
 David J. MacKenzie     address@hidden
 David Perlin           address@hidden
 Elbert Pol             address@hidden
+Elias Benali           address@hidden
 Erez Zadok             address@hidden
 Eric Allman            address@hidden
 Eric Backus            address@hidden
diff --git a/doc/m4.texinfo b/doc/m4.texinfo
index ee907dd..0182979 100644
--- a/doc/m4.texinfo
+++ b/doc/m4.texinfo
@@ -5636,17 +5636,16 @@ time.
 
 @cindex @env{TMPDIR}
 Numbered diversions are counted from 0 upwards, diversion number 0
-being the normal output stream.  The number of simultaneous diversions
-is limited mainly by the memory used to describe them, because @acronym{GNU}
+being the normal output stream.  @acronym{GNU}
 @code{m4} tries to keep diversions in memory.  However, there is a
-limit to the overall memory usable by all diversions taken altogether
+limit to the overall memory usable by all diversions taken together
 (512K, currently).  When this maximum is about to be exceeded,
 a temporary file is opened to receive the contents of the biggest
 diversion still in memory, freeing this memory for other diversions.
 When creating the temporary file, @code{m4} honors the value of the
 environment variable @env{TMPDIR}, and falls back to @file{/tmp}.
-So, it is theoretically possible that the number and aggregate size of
-diversions is limited only by available disk space.
+Thus, the amount of available disk space provides the only real limit on
+the number and aggregate size of diversions.
 
 @ignore
 @comment We need to test spilled diversions, but don't need to expose
diff --git a/gnulib b/gnulib
index 12f78b4..836f397 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 12f78b4faa14cd2da952f865979843dee79fcf93
+Subproject commit 836f3974faad2f3de7bafd46719b77d6632a4c96
diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
index d3e4d73..3db1a44 100644
--- a/m4/gnulib-cache.m4
+++ b/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=libm4 
--source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests 
--aux-dir=build-aux --with-tests --no-libtool --macro-prefix=M4 announce-gen 
assert autobuild avltree-oset binary-io clean-temp cloexec close-stream closein 
config-h dirname error execute fdl-1.3 fflush filenamecat flexmember fopen 
fopen-safer freadptr freadseek fseeko gendocs getopt git-version-gen 
gnumakefile gnupload gpl-3.0 hash intprops maintainer-makefile memchr2 memcmp2 
memmem mkstemp obstack obstack-printf-posix pipe progname quote regex rename 
snprintf-posix stdbool stdint stdlib-safer strtod strtol unlocked-io 
vasnprintf-posix verror version-etc version-etc-fsf wait-process xalloc 
xmemdup0 xprintf xvasprintf-posix
+#   gnulib-tool --import --dir=. --local-dir=local --lib=libm4 
--source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests 
--aux-dir=build-aux --with-tests --no-libtool --macro-prefix=M4 announce-gen 
assert autobuild avltree-oset binary-io bitrotate clean-temp cloexec 
close-stream closein config-h dirname error execute fdl-1.3 fflush filenamecat 
flexmember fopen fopen-safer freadptr freadseek fseeko gendocs getopt 
git-version-gen gnumakefile gnupload gpl-3.0 hash intprops maintainer-makefile 
memchr2 memcmp2 memmem mkstemp obstack obstack-printf-posix pipe progname quote 
regex rename snprintf-posix stdbool stdint stdlib-safer strtod strtol 
unlocked-io vasnprintf-posix verror version-etc version-etc-fsf wait-process 
xalloc xmemdup0 xprintf xvasprintf-posix
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([local])
@@ -25,6 +25,7 @@ gl_MODULES([
   autobuild
   avltree-oset
   binary-io
+  bitrotate
   clean-temp
   cloexec
   close-stream
diff --git a/src/symtab.c b/src/symtab.c
index 338bf17..dd9eb67 100644
--- a/src/symtab.c
+++ b/src/symtab.c
@@ -33,6 +33,7 @@
 
 #include "m4.h"
 
+#include "bitrotate.h"
 #include "hash.h"
 
 #ifdef DEBUG_SYM
@@ -112,7 +113,7 @@ hash (const char *s, size_t len)
   /* This algorithm was originally borrowed from GNU Emacs, but has
      been modified to allow embedded NUL.  */
   while (len--)
-    val = (val << 7) + (val >> (sizeof val * CHAR_BIT - 7)) + to_uchar (*s++);
+    val = rotl_sz (val, 7) + to_uchar (*s++);
   return val;
 }
 


hooks/post-receive
-- 
GNU M4 source repository