This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH] avoid assignment inside if condition (dictionary.c)
- From: Joel Brobecker <brobecker at adacore dot com>
- To: gdb-patches at sourceware dot org
- Cc: Joel Brobecker <brobecker at adacore dot com>
- Date: Tue, 26 Oct 2010 10:52:15 -0400
- Subject: [PATCH] avoid assignment inside if condition (dictionary.c)
- References: <20101008015546.GA9173@sourceware.org>
This change gets rid of an ARI warning which was recently introduced
by one of our changes.
gdb/ChangeLog:
* dictionary.c (dict_hash): Move assignment out of if condition.
Tested on x86_64-linux, and checked in.
---
gdb/ChangeLog | 4 ++++
gdb/dictionary.c | 5 +++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a6fca05..99d24f4 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-26 Joel Brobecker <brobecker@adacore.com>
+
+ * dictionary.c (dict_hash): Move assignment out of if condition.
+
2010-10-22 Jie Zhang <jie@codesourcery.com>
* Makefile.in (install): Remove dependency of install-only and
diff --git a/gdb/dictionary.c b/gdb/dictionary.c
index 4f18e8c..9d53ff0 100644
--- a/gdb/dictionary.c
+++ b/gdb/dictionary.c
@@ -798,7 +798,6 @@ dict_hash (const char *string0)
const char *string;
unsigned int hash;
- int c;
string = string0;
if (*string == '_')
@@ -827,7 +826,9 @@ dict_hash (const char *string0)
case '_':
if (string[1] == '_' && string != string0)
{
- if (((c = string[2]) < 'a' || c > 'z') && c != 'O')
+ int c = string[2];
+
+ if ((c < 'a' || c > 'z') && c != 'O')
return hash;
hash = 0;
string += 2;
--
1.7.1