From: Florian Forster <octo@collectd.org>
Date: Sat, 5 Dec 2015 07:57:07 +0000 (+0100)
Subject: Merge branch 'collectd-5.5'
X-Git-Tag: collectd-5.6.0~522
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8dfaf98cde62e42d4c245400c68ae9c825a2fe68;p=collectd.git

Merge branch 'collectd-5.5'
---

8dfaf98cde62e42d4c245400c68ae9c825a2fe68
diff --cc src/processes.c
index 63d22fc4,e4372099..fac47784
--- a/src/processes.c
+++ b/src/processes.c
@@@ -287,8 -279,8 +287,8 @@@ static void ps_list_register (const cha
  		if (status != 0)
  		{
  			DEBUG ("ProcessMatch: compiling the regular expression \"%s\" failed.", regexp);
--			sfree(new->re);
 -			sfree(new);
++			sfree (new->re);
 +			sfree (new);
  			return;
  		}
  	}
diff --cc src/write_graphite.c
index 0702a6ea,a7eef3fb..6baace14
--- a/src/write_graphite.c
+++ b/src/write_graphite.c
@@@ -141,8 -132,10 +141,8 @@@ static int wg_send_buffer (struct wg_ca
      ssize_t status = 0;
  
      status = swrite (cb->sock_fd, cb->send_buf, strlen (cb->send_buf));
-     if (status < 0)
+     if (status != 0)
      {
 -        const char *protocol = cb->protocol ? cb->protocol : WG_DEFAULT_PROTOCOL;
 -
          if (cb->log_send_errors)
          {
              char errbuf[1024];