From: brobecke <brobecke>
Date: Wed, 6 Oct 2010 15:24:37 +0000 (+0000)
Subject: [Ada] Fix ARI warnings in advance_wild_match
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6ffd60098d2de13a9afa542474b36865a982237e;p=pf3gnuchains%2Fpf3gnuchains4x.git

[Ada] Fix ARI warnings in advance_wild_match

gdb/ChangeLog:

        * ada-lang.c (advance_wild_match): Delete local variable t2.
        Adjust code accordingly.  Minor reformatting.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 62045effc0..8bfa6bfdcf 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-06  Joel Brobecker  <brobecker@adacore.com>
+
+	Fix ARI warnings in advance_wild_match.
+	* ada-lang.c (advance_wild_match): Delete local variable t2.
+	Adjust code accordingly.  Minor reformatting.
+
 2010-10-06  Ken Werner  <ken.werner@de.ibm.com>
 
 	* gdbtypes.h (struct main_type): Remove flag_nottext.
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 09619de814..5fdf8511f0 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -4999,7 +4999,7 @@ advance_wild_match (const char **namep, const char *name0, int target0)
 
   while (1)
     {
-      int t0, t1, t2;
+      int t0, t1;
 
       t0 = *name;
       if (t0 == '_')
@@ -5013,8 +5013,8 @@ advance_wild_match (const char **namep, const char *name0, int target0)
 	      else
 		name += 1;
 	    }
-	  else if (t1 == '_' &&
-		   (((t2 = name[2]) >= 'a' && t2 <= 'z') || t2 == target0))
+	  else if (t1 == '_' && ((name[2] >= 'a' && name[2] <= 'z')
+				 || name[2] == target0))
 	    {
 	      name += 2;
 	      break;