From: Bruno Haible <bruno@clisp.org>
Date: Tue, 15 Mar 2005 12:01:41 +0000 (+0000)
Subject: Avoid goto-ing inside the scope of a local variable. Needed when CC=g++.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e77562885acf16d8d31ddbe976cd38af7571938;p=pspp

Avoid goto-ing inside the scope of a local variable. Needed when CC=g++.
---

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 4075567de3..9b9681e421 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -3,6 +3,9 @@
 	* regex.c (byte_re_match_2_internal): Rename local variable 'not' to
 	'negate'.
 
+	* regex.c (byte_re_match_2_internal): Reduce scope of same_str_p
+	variable.
+
 2005-03-14  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* mktime.c (TYPE_TWOS_COMPLEMENT, TYPE_ONES_COMPLEMENT,
diff --git a/lib/regex.c b/lib/regex.c
index 904b481a34..c5176ea6f2 100644
--- a/lib/regex.c
+++ b/lib/regex.c
@@ -6010,19 +6010,22 @@ 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 = (FIRST_STRING_P (match_end)
-				    == MATCHING_IN_FIRST_STRING);
 	      /* 1 if this match is the best seen so far.  */
 	      boolean best_match_p;
 
-	      /* 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;
+	      {
+		/* 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;
+	      }
 
 	      DEBUG_PRINT1 ("backtracking.\n");