author | Kevin Bowling <kbowling@llnw.com> | |
Wed, 6 Apr 2016 06:20:48 +0000 (23:20 -0700) | ||
committer | Kevin Bowling <kbowling@llnw.com> | |
Wed, 6 Apr 2016 06:20:48 +0000 (23:20 -0700) |
1 | 2 | |||
---|---|---|---|---|
src/collectd.conf.pod | patch | | diff1 | | diff2 | | blob | history |
src/daemon/meta_data.c | patch | | diff1 | | diff2 | | blob | history |
src/target_set.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc src/collectd.conf.pod
Simple merge
diff --cc src/daemon/meta_data.c
index f87e35e41c78607d1eb3609688d6982c02d341c8,8ddd47801ed7c9d6f9d80712ccf69443c0b49a21..03b1d263992e54d00f5dc8ba18d175290e618022
+++ b/src/daemon/meta_data.c
{
meta_entry_t *copy;
- if (orig == NULL)
- return (NULL);
+ /* WARNINGS :
+ * - we do not check that orig != NULL here. You should have done it before.
+ * - we do not set copy->next. DO NOT FORGET TO SET copy->next IN YOUR FUNCTION
+ */
copy = md_entry_alloc (orig->key);
+ if (copy == NULL)
+ return (NULL);
copy->type = orig->type;
if (copy->type == MD_TYPE_STRING)
copy->value.mv_string = strdup (orig->value.mv_string);
diff --cc src/target_set.c
Simple merge