From 22d0859f5c5c43adc8c58ff0dd40be79528681eb Mon Sep 17 00:00:00 2001 From: Stefan Rinkes Date: Thu, 21 Apr 2011 21:30:04 +0200 Subject: [PATCH] pf plugin: some code cleanup --- src/pf.c | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/src/pf.c b/src/pf.c index 9d99e3a7..33e2d4b9 100644 --- a/src/pf.c +++ b/src/pf.c @@ -21,28 +21,6 @@ static int pf_init(void); static int pf_read(void); static void submit_counter(const char *, const char *, counter_t); -void -submit_counter(const char *type, const char *inst, counter_t val) -{ -#ifndef TEST - value_t values[1]; - value_list_t vl = VALUE_LIST_INIT; - - values[0].counter = val; - - vl.values = values; - vl.values_len = 1; - sstrncpy (vl.host, hostname_g, sizeof (vl.host)); - sstrncpy (vl.plugin, "pf", sizeof (vl.plugin)); - sstrncpy (vl.type, type, sizeof(vl.type)); - sstrncpy (vl.type_instance, inst, sizeof(vl.type_instance)); - plugin_dispatch_values(&vl); -#else - printf("%s.%s: %lld\n", type, inst, val); -#endif -} - - int pf_init(void) { @@ -91,6 +69,27 @@ pf_read(void) return (0); } +void +submit_counter(const char *type, const char *inst, counter_t val) +{ +#ifndef TEST + value_t values[1]; + value_list_t vl = VALUE_LIST_INIT; + + values[0].counter = val; + + vl.values = values; + vl.values_len = 1; + sstrncpy (vl.host, hostname_g, sizeof (vl.host)); + sstrncpy (vl.plugin, "pf", sizeof (vl.plugin)); + sstrncpy (vl.type, type, sizeof(vl.type)); + sstrncpy (vl.type_instance, inst, sizeof(vl.type_instance)); + plugin_dispatch_values(&vl); +#else + printf("%s.%s: %lld\n", type, inst, val); +#endif +} + #ifdef TEST int main(int argc, char *argv[]) -- 2.30.2