avoid assignment inside if condition (dictionary.c)

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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a6fca05b02ab1f253d1c9e1bee7668413fc26388..99d24f44e285aba77cde95519c992e2690a83f0d 100644 (file)
--- 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 4f18e8c017962390a7a2f051baa91a447b3e1e3b..9d53ff0e3012e298b9bd5a1f3e6a2891e4c7c9a1 100644 (file)
--- 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;