Merge branch 'collectd-5.7' into collectd-5.8

[collectd.git] / src / match_timediff.c

diff --git a/src/match_timediff.c b/src/match_timediff.c
index 996201a..c80694d 100644 (file)
--- a/src/match_timediff.c
+++ b/src/match_timediff.c
@@ -25,8 +25,8 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
-#include "utils_cache.h"
 #include "filter_chain.h"
 
 #define SATISFY_ALL 0
@@ -37,8 +37,7 @@
  */
 struct mt_match_s;
 typedef struct mt_match_s mt_match_t;
-struct mt_match_s
-{
+struct mt_match_s {
   cdtime_t future;
   cdtime_t past;
 };
@@ -46,36 +45,32 @@ struct mt_match_s
 /*
  * internal helper functions
  */
-static int mt_create (const oconfig_item_t *ci, void **user_data) /* {{{ */
+static int mt_create(const oconfig_item_t *ci, void **user_data) /* {{{ */
 {
   mt_match_t *m;
   int status;
-  int i;
 
-  m = (mt_match_t *) malloc (sizeof (*m));
-  if (m == NULL)
-  {
-    ERROR ("mt_create: malloc failed.");
-    return (-ENOMEM);
+  m = calloc(1, sizeof(*m));
+  if (m == NULL) {
+    ERROR("mt_create: calloc failed.");
+    return -ENOMEM;
   }
-  memset (m, 0, sizeof (*m));
 
   m->future = 0;
   m->past = 0;
 
   status = 0;
-  for (i = 0; i < ci->children_num; i++)
-  {
+  for (int i = 0; i < ci->children_num; i++) {
     oconfig_item_t *child = ci->children + i;
 
-    if (strcasecmp ("Future", child->key) == 0)
-      status = cf_util_get_cdtime (child, &m->future);
-    else if (strcasecmp ("Past", child->key) == 0)
-      status = cf_util_get_cdtime (child, &m->past);
-    else
-    {
-      ERROR ("timediff match: The `%s' configuration option is not "
-          "understood and will be ignored.", child->key);
+    if (strcasecmp("Future", child->key) == 0)
+      status = cf_util_get_cdtime(child, &m->future);
+    else if (strcasecmp("Past", child->key) == 0)
+      status = cf_util_get_cdtime(child, &m->past);
+    else {
+      ERROR("timediff match: The `%s' configuration option is not "
+            "understood and will be ignored.",
+            child->key);
       status = 0;
     }
 
@@ -84,75 +79,65 @@ static int mt_create (const oconfig_item_t *ci, void **user_data) /* {{{ */
   }
 
   /* Additional sanity-checking */
-  while (status == 0)
-  {
-    if ((m->future == 0) && (m->past == 0))
-    {
-      ERROR ("timediff match: Either `Future' or `Past' must be configured. "
-          "This match will be ignored.");
+  while (status == 0) {
+    if ((m->future == 0) && (m->past == 0)) {
+      ERROR("timediff match: Either `Future' or `Past' must be configured. "
+            "This match will be ignored.");
       status = -1;
     }
 
     break;
   }
 
-  if (status != 0)
-  {
-    free (m);
-    return (status);
+  if (status != 0) {
+    free(m);
+    return status;
   }
 
   *user_data = m;
-  return (0);
+  return 0;
 } /* }}} int mt_create */
 
-static int mt_destroy (void **user_data) /* {{{ */
+static int mt_destroy(void **user_data) /* {{{ */
 {
-  if (user_data != NULL)
-  {
-    sfree (*user_data);
+  if (user_data != NULL) {
+    sfree(*user_data);
   }
 
-  return (0);
+  return 0;
 } /* }}} int mt_destroy */
 
-static int mt_match (const data_set_t __attribute__((unused)) *ds, /* {{{ */
-    const value_list_t *vl,
-    notification_meta_t __attribute__((unused)) **meta, void **user_data)
-{
+static int mt_match(const data_set_t __attribute__((unused)) * ds, /* {{{ */
+                    const value_list_t *vl,
+                    notification_meta_t __attribute__((unused)) * *meta,
+                    void **user_data) {
   mt_match_t *m;
   cdtime_t now;
 
   if ((user_data == NULL) || (*user_data == NULL))
-    return (-1);
+    return -1;
 
   m = *user_data;
-  now = cdtime ();
+  now = cdtime();
 
-  if (m->future != 0)
-  {
+  if (m->future != 0) {
     if (vl->time >= (now + m->future))
-      return (FC_MATCH_MATCHES);
+      return FC_MATCH_MATCHES;
   }
 
-  if (m->past != 0)
-  {
+  if (m->past != 0) {
     if (vl->time <= (now - m->past))
-      return (FC_MATCH_MATCHES);
+      return FC_MATCH_MATCHES;
   }
 
-  return (FC_MATCH_NO_MATCH);
+  return FC_MATCH_NO_MATCH;
 } /* }}} int mt_match */
 
-void module_register (void)
-{
-  match_proc_t mproc;
+void module_register(void) {
+  match_proc_t mproc = {0};
 
-  memset (&mproc, 0, sizeof (mproc));
-  mproc.create  = mt_create;
+  mproc.create = mt_create;
   mproc.destroy = mt_destroy;
-  mproc.match   = mt_match;
-  fc_register_match ("timediff", mproc);
+  mproc.match = mt_match;
+  fc_register_match("timediff", mproc);
 } /* module_register */
-
-/* vim: set sw=2 sts=2 tw=78 et fdm=marker : */