projects
/
collection4.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
a38bcd4
)
graph_ident.c: Fix a logic error in "part_copy_with_selector".
author
Florian Forster
<ff@octo.it>
Mon, 14 Jun 2010 15:47:56 +0000
(17:47 +0200)
committer
Florian Forster
<octo@leeloo.lan.home.verplant.org>
Mon, 14 Jun 2010 15:47:56 +0000
(17:47 +0200)
graph_ident.c
patch
|
blob
|
history
diff --git
a/graph_ident.c
b/graph_ident.c
index
9252ebe
..
7b57f5d
100644
(file)
--- 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. */
/* 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);
if (strcmp (selector, part) != 0)
return (NULL);