X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Ftail.c;h=3d52380ab350e4cb782cc0ebd9371710ca9706be;hb=a396da422740caf336a6d594515e8d80de6f440a;hp=f7f061a961ec5a17033702afb401a3314cf6e9ba;hpb=3259a9bec97cf502a780d70c0ab2a3394f8a6407;p=collectd.git

diff --git a/src/tail.c b/src/tail.c
index f7f061a9..3d52380a 100644
--- a/src/tail.c
+++ b/src/tail.c
@@ -34,7 +34,7 @@
 /*
  *  <Plugin tail>
  *    <File "/var/log/exim4/mainlog">
- *      PluginName "mail"
+ *      Plugin "mail"
  *      Instance "exim"
  *      Interval 60
  *	<Match>
@@ -59,7 +59,7 @@ struct ctail_config_match_s {
 };
 typedef struct ctail_config_match_s ctail_config_match_t;
 
-static cu_tail_match_t **tail_match_list = NULL;
+static cu_tail_match_t **tail_match_list;
 static size_t tail_match_list_num = 0;
 static cdtime_t tail_match_list_intervals[255];
 
@@ -134,8 +134,7 @@ static int ctail_config_add_match_dstype(ctail_config_match_t *cm,
   return 0;
 } /* int ctail_config_add_match_dstype */
 
-static int ctail_config_add_match(cu_tail_match_t *tm,
-                                  const char *plugin_name,
+static int ctail_config_add_match(cu_tail_match_t *tm, const char *plugin_name,
                                   const char *plugin_instance,
                                   oconfig_item_t *ci, cdtime_t interval) {
   ctail_config_match_t cm = {0};
@@ -194,8 +193,8 @@ static int ctail_config_add_match(cu_tail_match_t *tm,
     // TODO(octo): there's nothing "simple" about the latency stuff …
     status = tail_match_add_match_simple(
         tm, cm.regex, cm.excluderegex, cm.flags,
-        (plugin_name != NULL) ? plugin_name : "tail", plugin_instance,
-        cm.type, cm.type_instance, cm.latency, interval);
+        (plugin_name != NULL) ? plugin_name : "tail", plugin_instance, cm.type,
+        cm.type_instance, cm.latency, interval);
 
     if (status != 0)
       ERROR("tail plugin: tail_match_add_match_simple failed.");
@@ -233,8 +232,8 @@ static int ctail_config_add_file(oconfig_item_t *ci) {
     oconfig_item_t *option = ci->children + i;
     int status = 0;
 
-    if (strcasecmp("PluginName", option->key) == 0)
-      status = cf_util_get_string (option, &plugin_name);
+    if (strcasecmp("Plugin", option->key) == 0)
+      status = cf_util_get_string(option, &plugin_name);
     else if (strcasecmp("Instance", option->key) == 0)
       status = cf_util_get_string(option, &plugin_instance);
     else if (strcasecmp("Interval", option->key) == 0)
@@ -317,7 +316,7 @@ static int ctail_init(void) {
   }
 
   for (size_t i = 0; i < tail_match_list_num; i++) {
-    ssnprintf(str, sizeof(str), "tail-%zu", i);
+    snprintf(str, sizeof(str), "tail-%zu", i);
 
     plugin_register_complex_read(NULL, str, ctail_read,
                                  tail_match_list_intervals[i],