Merge branch 'collectd-4.1' into collectd-4.2

diff --git a/src/collectd-exec.pod b/src/collectd-exec.pod
index 29ff45b..4102136 100644 (file)
--- a/src/collectd-exec.pod
+++ b/src/collectd-exec.pod
@@ -42,7 +42,11 @@ I<Value-List>, separated by a spaces. A description of these two parts follows:
 An I<Identifier> is of the form
 C<I<host>B</>I<plugin>B<->I<instance>B</>I<type>B<->I<instance>> with both
 I<instance>-parts being optional. If they're omitted the hyphen must be
-omitted, too.
+omitted, too. I<plugin> and each I<instance>-part may be chosen freely as long
+as the tuple (plugin, plugin instance, type instance) uniquely identifies the
+plugin within collectd. I<type> identifies the type and number of values
+(i.E<nbsp>e. data-set) passed to collectd. A large list of predefined
+data-sets is available in the B<types.db> file.
 
 The I<OptionList> is an optional list of I<Options>, where each option if a
 key-value-pair. A list of currently understood options can be found below, all

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;