From 558b1900b0750489aaedeeb5ad173ce7331db68f Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Tue, 26 Oct 2010 14:50:13 +0000 Subject: [PATCH] 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. --- gdb/ChangeLog | 4 ++++ gdb/dictionary.c | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index a6fca05b02a..99d24f44e28 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2010-10-26 Joel Brobecker + + * dictionary.c (dict_hash): Move assignment out of if condition. + 2010-10-22 Jie Zhang * Makefile.in (install): Remove dependency of install-only and diff --git a/gdb/dictionary.c b/gdb/dictionary.c index 4f18e8c0179..9d53ff0e301 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; -- 2.30.2