Merge branch 'collectd-4.1' into collectd-4.2

diff --git a/src/logfile.c b/src/logfile.c
index 789cb95..2b546ac 100644 (file)
--- a/src/logfile.c
+++ b/src/logfile.c
@@ -1,6 +1,7 @@
 /**
  * collectd - src/logfile.c
  * Copyright (C) 2007  Sebastian Harl
+ * Copyright (C) 2007  Florian 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

diff --git a/src/network.c b/src/network.c
index a426214..1934431 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -989,7 +989,7 @@ static int network_add_sending_socket (const char *node, const char *service)
        return (0);
 } /* int network_get_listen_socket */
 
-int network_receive (void)
+static int network_receive (void)
 {
        char buffer[BUFF_SIZE];
        int  buffer_len;