aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog6
-rw-r--r--gdb/ada-lang.c6
2 files changed, 9 insertions, 3 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 62045ef..8bfa6bf 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 09619de..5fdf851 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;