From 51f6fa49cdac0e7702fef71baea85f69a39da82f Mon Sep 17 00:00:00 2001 From: Marc Fournier Date: Mon, 23 Jun 2014 16:47:20 +0200 Subject: [PATCH] write_riemann: coding style consistency Make the style in line with 50d1b34d6 (from master) and avoid later merge conflict. --- src/write_riemann.c | 68 ++++++++++++++++++++--------------------------------- 1 file changed, 25 insertions(+), 43 deletions(-) diff --git a/src/write_riemann.c b/src/write_riemann.c index fdd160b5..b558b060 100644 --- a/src/write_riemann.c +++ b/src/write_riemann.c @@ -84,7 +84,7 @@ static void riemann_event_protobuf_free (Event *event) /* {{{ */ sfree (event); } /* }}} void riemann_event_protobuf_free */ -static void riemann_msg_protobuf_free (Msg *msg) /* {{{ */ +static void riemann_msg_protobuf_free(Msg *msg) /* {{{ */ { size_t i; @@ -104,8 +104,7 @@ static void riemann_msg_protobuf_free (Msg *msg) /* {{{ */ } /* }}} void riemann_msg_protobuf_free */ /* host->lock must be held when calling this function. */ -static int -riemann_connect(struct riemann_host *host) +static int riemann_connect(struct riemann_host *host) /* {{{ */ { int e; struct addrinfo *ai, *res, hints; @@ -160,11 +159,10 @@ riemann_connect(struct riemann_host *host) return -1; } return 0; -} +} /* }}} int riemann_connect */ /* host->lock must be held when calling this function. */ -static int -riemann_disconnect (struct riemann_host *host) +static int riemann_disconnect (struct riemann_host *host) /* {{{ */ { if ((host->flags & F_CONNECT) == 0) return (0); @@ -174,17 +172,15 @@ riemann_disconnect (struct riemann_host *host) host->flags &= ~F_CONNECT; return (0); -} +} /* }}} int riemann_disconnect */ -static inline int -riemann_send_msg(struct riemann_host *host, const Msg *msg) +static int riemann_send_msg (struct riemann_host *host, const Msg *msg) /* {{{ */ { int status = 0; u_char *buffer = NULL; size_t buffer_len; status = riemann_connect (host); - if (status != 0) return status; @@ -194,12 +190,10 @@ riemann_send_msg(struct riemann_host *host, const Msg *msg) buffer_len += 4; buffer = malloc (buffer_len); - if (buffer == NULL) { ERROR ("write_riemann plugin: malloc failed."); return ENOMEM; } - memset (buffer, 0, buffer_len); if (host->use_tcp) @@ -214,26 +208,22 @@ riemann_send_msg(struct riemann_host *host, const Msg *msg) } status = (int) swrite (host->s, buffer, buffer_len); - if (status != 0) { char errbuf[1024]; - ERROR ("write_riemann plugin: Sending to Riemann at %s:%s failed: %s", (host->node != NULL) ? host->node : RIEMANN_HOST, (host->service != NULL) ? host->service : RIEMANN_PORT, sstrerror (errno, errbuf, sizeof (errbuf))); - sfree (buffer); return -1; } sfree (buffer); return 0; -} +} /* }}} int riemann_send_msg */ -static inline int -riemann_recv_ack(struct riemann_host *host) +static int riemann_recv_ack(struct riemann_host *host) /* {{{ */ { int status = 0; Msg *msg = NULL; @@ -273,21 +263,19 @@ riemann_recv_ack(struct riemann_host *host) msg__free_unpacked (msg, NULL); return 0; -} +} /* }}} int riemann_recv_ack */ /** * Function to send messages (Msg) to riemann. * * Acquires the host lock, disconnects on errors. */ -static int -riemann_send(struct riemann_host *host, Msg const *msg) +static int riemann_send(struct riemann_host *host, Msg const *msg) /* {{{ */ { int status = 0; pthread_mutex_lock (&host->lock); status = riemann_send_msg(host, msg); - if (status != 0) { riemann_disconnect (host); pthread_mutex_unlock (&host->lock); @@ -311,14 +299,14 @@ riemann_send(struct riemann_host *host, Msg const *msg) pthread_mutex_unlock (&host->lock); return 0; -} +} /* }}} int riemann_send */ static int riemann_event_add_tag (Event *event, char const *tag) /* {{{ */ { return (strarray_add (&event->tags, &event->n_tags, tag)); } /* }}} int riemann_event_add_tag */ -static int riemann_event_add_attribute (Event *event, /* {{{ */ +static int riemann_event_add_attribute(Event *event, /* {{{ */ char const *key, char const *value) { Attribute **new_attributes; @@ -351,7 +339,7 @@ static int riemann_event_add_attribute (Event *event, /* {{{ */ return (0); } /* }}} int riemann_event_add_attribute */ -static Msg *riemann_notification_to_protobuf (struct riemann_host *host, /* {{{ */ +static Msg *riemann_notification_to_protobuf(struct riemann_host *host, /* {{{ */ notification_t const *n) { Msg *msg; @@ -445,7 +433,7 @@ static Msg *riemann_notification_to_protobuf (struct riemann_host *host, /* {{{ return (msg); } /* }}} Msg *riemann_notification_to_protobuf */ -static Event *riemann_value_to_protobuf (struct riemann_host const *host, /* {{{ */ +static Event *riemann_value_to_protobuf(struct riemann_host const *host, /* {{{ */ data_set_t const *ds, value_list_t const *vl, size_t index, gauge_t const *rates) @@ -543,7 +531,7 @@ static Event *riemann_value_to_protobuf (struct riemann_host const *host, /* {{{ return (event); } /* }}} Event *riemann_value_to_protobuf */ -static Msg *riemann_value_list_to_protobuf (struct riemann_host const *host, /* {{{ */ +static Msg *riemann_value_list_to_protobuf(struct riemann_host const *host, /* {{{ */ data_set_t const *ds, value_list_t const *vl) { @@ -598,8 +586,7 @@ static Msg *riemann_value_list_to_protobuf (struct riemann_host const *host, /* return (msg); } /* }}} Msg *riemann_value_list_to_protobuf */ -static int -riemann_notification(const notification_t *n, user_data_t *ud) +static int riemann_notification(const notification_t *n, user_data_t *ud) /* {{{ */ { int status; struct riemann_host *host = ud->data; @@ -618,8 +605,7 @@ riemann_notification(const notification_t *n, user_data_t *ud) return (status); } /* }}} int riemann_notification */ -static int -riemann_write(const data_set_t *ds, +static int riemann_write(const data_set_t *ds, /* {{{ */ const value_list_t *vl, user_data_t *ud) { @@ -638,10 +624,9 @@ riemann_write(const data_set_t *ds, riemann_msg_protobuf_free (msg); return status; -} +} /* }}} int riemann_write */ -static void -riemann_free(void *p) +static void riemann_free(void *p) /* {{{ */ { struct riemann_host *host = p; @@ -662,10 +647,9 @@ riemann_free(void *p) sfree(host->service); pthread_mutex_destroy (&host->lock); sfree(host); -} +} /* }}} void riemann_free */ -static int -riemann_config_node(oconfig_item_t *ci) +static int riemann_config_node(oconfig_item_t *ci) /* {{{ */ { struct riemann_host *host = NULL; int status = 0; @@ -793,10 +777,9 @@ riemann_config_node(oconfig_item_t *ci) pthread_mutex_unlock (&host->lock); return status; -} +} /* }}} int riemann_config_node */ -static int -riemann_config(oconfig_item_t *ci) +static int riemann_config(oconfig_item_t *ci) /* {{{ */ { int i; oconfig_item_t *child; @@ -823,10 +806,9 @@ riemann_config(oconfig_item_t *ci) } } return (0); -} +} /* }}} int riemann_config */ -void -module_register(void) +void module_register(void) { plugin_register_complex_config ("write_riemann", riemann_config); } -- 2.11.0