Code cleanup.
	* cp-namespace.c (cp_add_using_directive): Turn positive comparison to
	negative comparisons.
This commit is contained in:
Jan Kratochvil 2011-06-29 22:02:58 +00:00
parent 37e41b0352
commit 70c622a3d2
2 changed files with 23 additions and 9 deletions

View File

@ -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

View File

@ -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);