X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmatch_timediff.c;h=6d00ed2955b674bc89e91f12d802c7d6a758cfbd;hb=936c450a86c841eea89888c8550c9118fae90c25;hp=2e2741550c46e63882fd162d31caf8264cbfce21;hpb=c1219a1c9db2e8400e2ee94b87f86ccd441485d5;p=collectd.git diff --git a/src/match_timediff.c b/src/match_timediff.c index 2e274155..6d00ed29 100644 --- a/src/match_timediff.c +++ b/src/match_timediff.c @@ -2,26 +2,31 @@ * collectd - src/match_timediff.c * Copyright (C) 2008,2009 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 - * Free Software Foundation; only version 2 of the License is applicable. + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. * * Authors: - * Florian Forster + * Florian Forster **/ #include "collectd.h" + #include "common.h" -#include "utils_cache.h" #include "filter_chain.h" #define SATISFY_ALL 0 @@ -32,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; }; @@ -41,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."); + 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; } @@ -79,21 +79,18 @@ 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); + if (status != 0) { + free(m); return (status); } @@ -101,20 +98,19 @@ static int mt_create (const oconfig_item_t *ci, void **user_data) /* {{{ */ 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); } /* }}} 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; @@ -122,16 +118,14 @@ static int mt_match (const data_set_t __attribute__((unused)) *ds, /* {{{ */ 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); } - if (m->past != 0) - { + if (m->past != 0) { if (vl->time <= (now - m->past)) return (FC_MATCH_MATCHES); } @@ -139,15 +133,13 @@ static int mt_match (const data_set_t __attribute__((unused)) *ds, /* {{{ */ 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 : */