From 765bbe76d57b127ca2e72e40af3e8123aeeb217c Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Mon, 14 Jun 2010 17:47:56 +0200 Subject: [PATCH] graph_ident.c: Fix a logic error in "part_copy_with_selector". --- graph_ident.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/graph_ident.c b/graph_ident.c index 9252ebe..7b57f5d 100644 --- a/graph_ident.c +++ b/graph_ident.c @@ -41,11 +41,21 @@ static char *part_copy_with_selector (const char *selector, /* {{{ */ /* Replace the ANY and ALL flags if requested and if the selecter actually * *is* that flag. */ - if ((flags & IDENT_FLAG_REPLACE_ANY) && IS_ANY (selector)) - return (strdup (part)); + if (IS_ANY (selector)) + { + if (flags & IDENT_FLAG_REPLACE_ANY) + return (strdup (part)); + else + return (strdup (selector)); + } - if ((flags & IDENT_FLAG_REPLACE_ALL) && IS_ALL (selector)) - return (strdup (part)); + if (IS_ALL (selector)) + { + if (flags & IDENT_FLAG_REPLACE_ALL) + return (strdup (part)); + else + return (strdup (selector)); + } if (strcmp (selector, part) != 0) return (NULL); -- 2.11.0