author | Florian Forster <octo@collectd.org> | |
Sat, 13 Jul 2013 09:23:32 +0000 (11:23 +0200) | ||
committer | Florian Forster <octo@collectd.org> | |
Sat, 13 Jul 2013 09:23:32 +0000 (11:23 +0200) |
1 | 2 | |||
---|---|---|---|---|
src/plugin.c | patch | | diff1 | | diff2 | | blob | history |
src/write_graphite.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc src/plugin.c
Simple merge
diff --cc src/write_graphite.c
index 949a8425178f700b952787f15bc0426f4f6d7299,bde5fb6e94d9ea41acb39bdf00ba254d5b62dfd1..99c6f4d80a91a669ee0ac86f0bfe0620de6bb13f
+++ b/src/write_graphite.c
wg_flush_nolock (/* timeout = */ 0, cb);
- close(cb->sock_fd);
- cb->sock_fd = -1;
+ if (cb->sock_fd >= 0)
+ {
+ close (cb->sock_fd);
+ cb->sock_fd = -1;
+ }
+ sfree(cb->name);
sfree(cb->node);
sfree(cb->service);
sfree(cb->prefix);