grep branch, master, updated. v2.9-55-g93927af

[Jim Meyering]

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 "grep".

The branch, master has been updated
       via  93927af364aa09dc23a50ca8e4c9a62af0132c59 (commit)
      from  aeef1229af5f6ad00d466daa32a6af53c3bf0729 (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 -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=93927af364aa09dc23a50ca8e4c9a62af0132c59


commit 93927af364aa09dc23a50ca8e4c9a62af0132c59
Author: Jim Meyering <address@hidden>
Date:   Mon May 2 15:06:52 2011 +0200

    build: fix compilation failure when MBS_SUPPORT is 0
    
    * src/dfa.c (add_utf8_anychar): Always compile this function,
    but when MBS_SUPPORT is 0, give it an empty body.
    (prepare_wc_buf): Likewise.
    [! MBS_SUPPORT] (setbit_wc): Define to always abort.

diff --git a/src/dfa.c b/src/dfa.c
index e99202b..8303022 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -579,7 +579,8 @@ setbit_c (int b, charclass c)
   setbit (b, c);
 }
 #else
-#define setbit_c setbit
+# define setbit_c setbit
+static inline bool setbit_wc (wint_t wc, charclass c) { abort (); }
 #endif
 
 /* Like setbit_c, but if case is folded, set both cases of a letter.  For
@@ -1524,10 +1525,10 @@ addtok_wc (wint_t wc)
 static void addtok_wc (wint_t wc) {}
 #endif
 
-#if MBS_SUPPORT
 static void
 add_utf8_anychar (void)
 {
+#if MBS_SUPPORT
   static const charclass utf8_classes[5] = {
       {  0,  0,  0,  0, ~0, ~0, 0, 0 },            /* 80-bf: non-lead bytes */
       { ~0, ~0, ~0, ~0, 0, 0, 0, 0 },              /* 00-7f: 1-byte sequence */
@@ -1572,8 +1573,8 @@ add_utf8_anychar (void)
       addtok (CAT);
       addtok (OR);
     }
-}
 #endif
+}
 
 /* The grammar understood by the parser is as follows.
 
@@ -3141,13 +3142,13 @@ transit_state (struct dfa *d, int s, unsigned char 
const **pp)
   return s1;
 }
 
-#if MBS_SUPPORT
 
 /* Initialize mblen_buf and inputwcs with data from the next line.  */
 
 static void
 prepare_wc_buf (const char *begin, const char *end)
 {
+#if MBS_SUPPORT
   unsigned char eol = eolbyte;
   size_t remain_bytes, i;
 
@@ -3188,9 +3189,8 @@ prepare_wc_buf (const char *begin, const char *end)
   buf_end = (unsigned char *) (begin + i);
   mblen_buf[i] = 0;
   inputwcs[i] = 0; /* sentinel */
-}
-
 #endif /* MBS_SUPPORT */
+}
 
 /* Search through a buffer looking for a match to the given struct dfa.
    Find the first occurrence of a string matching the regexp in the

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

Summary of changes:
 src/dfa.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
grep