projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #1656 from kev009/target_set_add_meta
[collectd.git]
/
src
/
daemon
/
meta_data.c
diff --git
a/src/daemon/meta_data.c
b/src/daemon/meta_data.c
index
03b1d26
..
b3f892a
100644
(file)
--- a/
src/daemon/meta_data.c
+++ b/
src/daemon/meta_data.c
@@
-328,13
+328,14
@@
int meta_data_clone_merge (meta_data_t **dest, meta_data_t *orig) /* {{{ */
if (orig == NULL)
return (0);
if (orig == NULL)
return (0);
- if
(NULL == *dest
) {
+ if
(*dest == NULL
) {
*dest = meta_data_clone(orig);
return(0);
}
pthread_mutex_lock (&orig->lock);
*dest = meta_data_clone(orig);
return(0);
}
pthread_mutex_lock (&orig->lock);
- for(e=orig->head; NULL != e; e = e->next) {
+ for (e=orig->head; e != NULL; e = e->next)
+ {
md_entry_insert_clone((*dest), e);
}
pthread_mutex_unlock (&orig->lock);
md_entry_insert_clone((*dest), e);
}
pthread_mutex_unlock (&orig->lock);