This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[commit/Ada] Fix ARI warnings in advance_wild_match
- From: Joel Brobecker <brobecker at adacore dot com>
- To: gdb-patches at sourceware dot org
- Cc: Joel Brobecker <brobecker at adacore dot com>, Paul Hilfinger <hilfinger at adacore dot com>
- Date: Wed, 6 Oct 2010 08:26:13 -0700
- Subject: [commit/Ada] Fix ARI warnings in advance_wild_match
Hello,
I applied the following patch to fix the new ARI warnings introduced
by one of our recent changes.
gdb/ChangeLog:
* ada-lang.c (advance_wild_match): Delete local variable t2.
Adjust code accordingly. Minor reformatting.
Tested on x86_64-linux. Checked in.
---
gdb/ChangeLog | 6 ++++++
gdb/ada-lang.c | 6 +++---
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;
--
1.7.1