Merge branch 'collectd-5.8'

diff --combined src/df.c
index db8e519,688c322..e1d5b51
--- 1/src/df.c
--- 2/src/df.c
+++ b/src/df.c
@@@ -152,6 -152,7 +152,7 @@@ static int df_read(void) 
  #elif HAVE_STATFS
    struct statfs statbuf;
  #endif
+   int retval = 0;
    /* struct STATANYFS statbuf; */
    cu_mount_t *mnt_list;
  
@@@ -202,7 -203,9 +203,7 @@@
        continue;
  
      if (STATANYFS(mnt_ptr->dir, &statbuf) < 0) {
 -      char errbuf[1024];
 -      ERROR(STATANYFS_STR "(%s) failed: %s", mnt_ptr->dir,
 -            sstrerror(errno, errbuf, sizeof(errbuf)));
 +      ERROR(STATANYFS_STR "(%s) failed: %s", mnt_ptr->dir, STRERRNO);
        continue;
      }
  
@@@ -282,8 -285,10 +283,10 @@@
              (gauge_t)((float_t)(blk_reserved) / statbuf.f_blocks * 100));
          df_submit_one(disk_name, "percent_bytes", "used",
                        (gauge_t)((float_t)(blk_used) / statbuf.f_blocks * 100));
-       } else
-         return -1;
+       } else {
+         retval = -1;
+         break;
+       }
      }
  
      /* inode handling */
@@@ -313,8 -318,10 +316,10 @@@
            df_submit_one(
                disk_name, "percent_inodes", "used",
                (gauge_t)((float_t)(inode_used) / statbuf.f_files * 100));
-         } else
-           return -1;
+         } else {
+           retval = -1;
+           break;
+         }
        }
        if (values_absolute) {
          df_submit_one(disk_name, "df_inodes", "free", (gauge_t)inode_free);
@@@ -327,7 -334,7 +332,7 @@@
  
    cu_mount_freelist(mnt_list);
  
-   return 0;
+   return retval;
  } /* int df_read */
  
  void module_register(void) {

diff --combined src/memcached.c
index d62b25d,d2827a4..635088e
--- 1/src/memcached.c
--- 2/src/memcached.c
+++ b/src/memcached.c
@@@ -99,8 -99,9 +99,8 @@@ static int memcached_connect_unix(memca
    /* create our socket descriptor */
    int fd = socket(AF_UNIX, SOCK_STREAM, 0);
    if (fd < 0) {
 -    char errbuf[1024];
      ERROR("memcached plugin: memcached_connect_unix: socket(2) failed: %s",
 -          sstrerror(errno, errbuf, sizeof(errbuf)));
 +          STRERRNO);
      return -1;
    }
  
@@@ -133,10 -134,12 +133,10 @@@ static int memcached_connect_inet(memca
  
    int status = getaddrinfo(st->connhost, st->connport, &ai_hints, &ai_list);
    if (status != 0) {
 -    char errbuf[1024];
      ERROR("memcached plugin: memcached_connect_inet: "
            "getaddrinfo(%s,%s) failed: %s",
            st->connhost, st->connport,
 -          (status == EAI_SYSTEM) ? sstrerror(errno, errbuf, sizeof(errbuf))
 -                                 : gai_strerror(status));
 +          (status == EAI_SYSTEM) ? STRERRNO : gai_strerror(status));
      return -1;
    }
  
@@@ -145,9 -148,10 +145,9 @@@
      /* create our socket descriptor */
      fd = socket(ai_ptr->ai_family, ai_ptr->ai_socktype, ai_ptr->ai_protocol);
      if (fd < 0) {
 -      char errbuf[1024];
        WARNING("memcached plugin: memcached_connect_inet: "
                "socket(2) failed: %s",
 -              sstrerror(errno, errbuf, sizeof(errbuf)));
 +              STRERRNO);
        continue;
      }
  
@@@ -242,8 -246,9 +242,8 @@@ static int memcached_query_daemon(char 
  
    status = (int)swrite(st->fd, "stats\r\n", strlen("stats\r\n"));
    if (status != 0) {
 -    char errbuf[1024];
      ERROR("memcached plugin: Instance \"%s\": write(2) failed: %s", st->name,
 -          sstrerror(errno, errbuf, sizeof(errbuf)));
 +          STRERRNO);
      shutdown(st->fd, SHUT_RDWR);
      close(st->fd);
      st->fd = -1;
@@@ -275,16 -280,23 +275,22 @@@
  
      char const end_token[5] = {'E', 'N', 'D', '\r', '\n'};
      if (status < 0) {
 -      char errbuf[1024];
  
        if ((errno == EAGAIN) || (errno == EWOULDBLOCK))
          continue;
  
        ERROR("memcached plugin: Instance \"%s\": Error reading from socket: %s",
 -            st->name, sstrerror(errno, errbuf, sizeof(errbuf)));
 +            st->name, STRERRNO);
        shutdown(st->fd, SHUT_RDWR);
        close(st->fd);
        st->fd = -1;
        return -1;
+     } else if (status == 0) {
+       ERROR("memcached plugin: Instance \"%s\": Connection closed by peer",
+             st->name);
+       close(st->fd);
+       st->fd = -1;
+       return -1;
      }
  
      buffer_fill += (size_t)status;