* config.sub: Update to version 2011-03-23.

[deliverable/binutils-gdb.git] / libiberty / regex.c

diff --git a/libiberty/regex.c b/libiberty/regex.c
index 56410ff81d4fc4ca7f04a24b9baa424bffc02b7f..420c7f4a47da26537ce0439a4716859c969fbd01 100644 (file)
--- a/libiberty/regex.c
+++ b/libiberty/regex.c
@@ -4,7 +4,7 @@
    internationalization features.)
 
    Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-   2002, 2005 Free Software Foundation, Inc.
+   2002, 2005, 2010 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -5908,24 +5908,25 @@ byte_re_match_2_internal (struct re_pattern_buffer *bufp,
              longest match, try backtracking.  */
           if (d != end_match_2)
            {
+             /* 1 if this match ends in the same string (string1 or string2)
+                as the best previous match.  */
+             boolean same_str_p;
+
              /* 1 if this match is the best seen so far.  */
              boolean best_match_p;
 
-              {
-                /* 1 if this match ends in the same string (string1 or string2)
-                   as the best previous match.  */
-                boolean same_str_p = (FIRST_STRING_P (match_end)
-                                      == MATCHING_IN_FIRST_STRING);
-
-                /* AIX compiler got confused when this was combined
-                   with the previous declaration.  */
-                if (same_str_p)
-                  best_match_p = d > match_end;
-                else
-                  best_match_p = !MATCHING_IN_FIRST_STRING;
+              same_str_p = (FIRST_STRING_P (match_end)
+                            == MATCHING_IN_FIRST_STRING);
+
+             /* AIX compiler got confused when this was combined
+                with the previous declaration.  */
+             if (same_str_p)
+               best_match_p = d > match_end;
+             else
+               best_match_p = !MATCHING_IN_FIRST_STRING;
+
+              DEBUG_PRINT1 ("backtracking.\n");
 
-                DEBUG_PRINT1 ("backtracking.\n");
-              }
               if (!FAIL_STACK_EMPTY ())
                 { /* More failure points to try.  */
 
@@ -7139,8 +7140,8 @@ byte_re_match_2_internal (struct re_pattern_buffer *bufp,
                register from the stack, since lowest will == highest in
                `pop_failure_point'.  */
             active_reg_t dummy_low_reg, dummy_high_reg;
-            UCHAR_T *pdummy = NULL;
-            const CHAR_T *sdummy = NULL;
+            UCHAR_T *pdummy ATTRIBUTE_UNUSED = NULL;
+            const CHAR_T *sdummy ATTRIBUTE_UNUSED = NULL;
 
             DEBUG_PRINT1 ("EXECUTING pop_failure_jump.\n");
             POP_FAILURE_POINT (sdummy, pdummy,