projects
/
collection4.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
src/graph_instance.[ch]: Implement "inst_ident_matches" in addition to "inst_matches_...
[collection4.git]
/
src
/
graph_ident.c
diff --git
a/src/graph_ident.c
b/src/graph_ident.c
index
c3d4e54
..
36e066d
100644
(file)
--- a/
src/graph_ident.c
+++ b/
src/graph_ident.c
@@
-203,7
+203,7
@@
void ident_destroy (graph_ident_t *ident) /* {{{ */
} /* }}} void ident_destroy */
/* ident_get_* methods {{{ */
} /* }}} void ident_destroy */
/* ident_get_* methods {{{ */
-const char *ident_get_host (graph_ident_t *ident) /* {{{ */
+const char *ident_get_host (
const
graph_ident_t *ident) /* {{{ */
{
if (ident == NULL)
return (NULL);
{
if (ident == NULL)
return (NULL);
@@
-211,7
+211,7
@@
const char *ident_get_host (graph_ident_t *ident) /* {{{ */
return (ident->host);
} /* }}} char *ident_get_host */
return (ident->host);
} /* }}} char *ident_get_host */
-const char *ident_get_plugin (graph_ident_t *ident) /* {{{ */
+const char *ident_get_plugin (
const
graph_ident_t *ident) /* {{{ */
{
if (ident == NULL)
return (NULL);
{
if (ident == NULL)
return (NULL);
@@
-219,7
+219,7
@@
const char *ident_get_plugin (graph_ident_t *ident) /* {{{ */
return (ident->plugin);
} /* }}} char *ident_get_plugin */
return (ident->plugin);
} /* }}} char *ident_get_plugin */
-const char *ident_get_plugin_instance (graph_ident_t *ident) /* {{{ */
+const char *ident_get_plugin_instance (
const
graph_ident_t *ident) /* {{{ */
{
if (ident == NULL)
return (NULL);
{
if (ident == NULL)
return (NULL);
@@
-227,7
+227,7
@@
const char *ident_get_plugin_instance (graph_ident_t *ident) /* {{{ */
return (ident->plugin_instance);
} /* }}} char *ident_get_plugin_instance */
return (ident->plugin_instance);
} /* }}} char *ident_get_plugin_instance */
-const char *ident_get_type (graph_ident_t *ident) /* {{{ */
+const char *ident_get_type (
const
graph_ident_t *ident) /* {{{ */
{
if (ident == NULL)
return (NULL);
{
if (ident == NULL)
return (NULL);
@@
-235,7
+235,7
@@
const char *ident_get_type (graph_ident_t *ident) /* {{{ */
return (ident->type);
} /* }}} char *ident_get_type */
return (ident->type);
} /* }}} char *ident_get_type */
-const char *ident_get_type_instance (graph_ident_t *ident) /* {{{ */
+const char *ident_get_type_instance (
const
graph_ident_t *ident) /* {{{ */
{
if (ident == NULL)
return (NULL);
{
if (ident == NULL)
return (NULL);
@@
-243,7
+243,7
@@
const char *ident_get_type_instance (graph_ident_t *ident) /* {{{ */
return (ident->type_instance);
} /* }}} char *ident_get_type_instance */
return (ident->type_instance);
} /* }}} char *ident_get_type_instance */
-const char *ident_get_field (graph_ident_t *ident, /* {{{ */
+const char *ident_get_field (
const
graph_ident_t *ident, /* {{{ */
graph_ident_field_t field)
{
if ((ident == NULL) || (field >= _GIF_LAST))
graph_ident_field_t field)
{
if ((ident == NULL) || (field >= _GIF_LAST))
@@
-377,12
+377,8
@@
int ident_compare (const graph_ident_t *i0, /* {{{ */
_Bool ident_matches (const graph_ident_t *selector, /* {{{ */
const graph_ident_t *ident)
{
_Bool ident_matches (const graph_ident_t *selector, /* {{{ */
const graph_ident_t *ident)
{
- if ((selector == NULL)
&&
(ident == NULL))
+ if ((selector == NULL)
||
(ident == NULL))
return (0);
return (0);
- else if (selector == NULL)
- return (-1);
- else if (ident == NULL)
- return (1);
if (!part_matches (selector->host, ident->host))
return (0);
if (!part_matches (selector->host, ident->host))
return (0);