gdb/

	Code cleanup.
	* cp-namespace.c (cp_add_using_directive): Turn positive comparison to
	negative comparisons.

2 files changed, 23 insertions, 9 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8088114269f..9cabcafe722 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2011-06-29  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	Code cleanup.
+	* cp-namespace.c (cp_add_using_directive): Turn positive comparison to
+	negative comparisons.
+
 2011-06-29  André Pönitz  <andre.poenitz@nokia.com>
 
 	* mi/mi-main.c (mi_cmd_list_features): Emit
diff --git a/gdb/cp-namespace.c b/gdb/cp-namespace.c
index 7ff7bf76bc0..ff4d63e4c58 100644
--- a/gdb/cp-namespace.c
+++ b/gdb/cp-namespace.c
@@ -133,15 +133,23 @@ cp_add_using_directive (const char *dest,
 
   for (current = using_directives; current != NULL; current = current->next)
     {
-      if (strcmp (current->import_src, src) == 0
-          && strcmp (current->import_dest, dest) == 0
-          && ((alias == NULL && current->alias == NULL)
-              || (alias != NULL && current->alias != NULL
-        	  && strcmp (alias, current->alias) == 0))
-	  && ((declaration == NULL && current->declaration == NULL)
-	      || (declaration != NULL && current->declaration != NULL
-		  && strcmp (declaration, current->declaration) == 0)))
-	return;
+      if (strcmp (current->import_src, src) != 0)
+	continue;
+      if (strcmp (current->import_dest, dest) != 0)
+	continue;
+      if ((alias == NULL && current->alias != NULL)
+	  || (alias != NULL && current->alias == NULL)
+	  || (alias != NULL && current->alias != NULL
+	      && strcmp (alias, current->alias) != 0))
+	continue;
+      if ((declaration == NULL && current->declaration != NULL)
+	  || (declaration != NULL && current->declaration == NULL)
+	  || (declaration != NULL && current->declaration != NULL
+	      && strcmp (declaration, current->declaration) != 0))
+	continue;
+
+      /* Parameters exactly match CURRENT.  */
+      return;
     }
 
   new = OBSTACK_ZALLOC (obstack, struct using_direct);