Merge branch 'pull/collectd-4'

diff --combined src/traffic.c
index 04e30e1,0e2bc25..e08dc14
--- 1/src/traffic.c
--- 2/src/traffic.c
+++ b/src/traffic.c
@@@ -1,6 -1,6 +1,6 @@@
  /**
   * collectd - src/traffic.c
-  * Copyright (C) 2005,2006  Florian octo Forster
+  * Copyright (C) 2005-2007  Florian octo Forster
   *
   * This program is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License as published by the
@@@ -272,7 -272,7 +272,7 @@@ static int traffic_read (void
        struct IFA_DATA *if_data;
  
        if (getifaddrs (&if_list) != 0)
 -              return;
 +              return (-1);
  
        for (if_ptr = if_list; if_ptr != NULL; if_ptr = if_ptr->ifa_next)
        {