Merge branch 'ff/plugins-ng' of octo@verplant.org:/var/lib/git/collectd into ff/plugi...

diff --combined src/network.c
index 5738d15,33f581d..11c9718
--- 1/src/network.c
--- 2/src/network.c
+++ b/src/network.c
@@@ -374,7 -374,7 +374,7 @@@ static int parse_packet (void *buffer, 
        part_header_t *header;
        int status;
  
-       value_list_t vl;
+       value_list_t vl = VALUE_LIST_INIT;
        char type[DATA_MAX_NAME_LEN];
  
        DBG ("buffer = %p; buffer_len = %i;", buffer, buffer_len);
@@@ -865,7 -865,7 +865,7 @@@ int network_receive (void
  
  static void *receive_thread (void *arg)
  {
 -      return ((void *) network_receive ());
 +      return (network_receive () ? (void *) 1 : (void *) 0);
  } /* void *receive_thread */
  
  #if 0