write_graphite: Update to the new format_graphite interface.

diff --git a/src/write_graphite.c b/src/write_graphite.c
index 354ea71cf0e415c5d377eef1b293f3a43e324b9b..822f7266768c00489fad6add9efedfa83639cdd9 100644 (file)
--- a/src/write_graphite.c
+++ b/src/write_graphite.c
@@ -50,6 +50,7 @@
 #include "utils/common/common.h"
 
 #include "utils/format_graphite/format_graphite.h"
+#include "utils/strbuf/strbuf.h"
 #include "utils_complain.h"
 
 #include <netdb.h>
@@ -387,37 +388,27 @@ static int wg_send_message(char const *message, struct wg_callback *cb) {
   return 0;
 }
 
-static int wg_write_messages(const metric_t *metric_p,
-                             struct wg_callback *cb) {
-  char buffer[WG_SEND_BUF_SIZE] = {0};
-  int status;
+static int wg_write_messages(metric_t const *m, struct wg_callback *cb) {
+  strbuf_t buf = STRBUF_CREATE;
 
-  status = format_graphite(buffer, sizeof(buffer), metric_p, cb->prefix,
-                           cb->postfix, cb->escape_char, cb->format_flags);
-  if (status != 0) /* error message has been printed already. */
+  int status = format_graphite(&buf, m, cb->prefix, cb->postfix, cb->escape_char, cb->format_flags);
+  if (status != 0) {
+    STRBUF_DESTROY(buf);
     return status;
+  }
 
   /* Send the message to graphite */
-  status = wg_send_message(buffer, cb);
-  if (status != 0) /* error message has been printed already. */
-    return status;
-
-  return 0;
+  status = wg_send_message(buf.ptr, cb);
+  STRBUF_DESTROY(buf);
+  return status;
 } /* int wg_write_messages */
 
-static int wg_write(const metric_t *metric_p,
-                    user_data_t *user_data) {
-  struct wg_callback *cb;
-  int status;
-
-  if (user_data == NULL)
+static int wg_write(metric_t const *m, user_data_t *user_data) {
+  if ((m == NULL) || (user_data == NULL)) {
     return EINVAL;
+  }
 
-  cb = user_data->data;
-
-  status = wg_write_messages(metric_p, cb);
-
-  return status;
+  return wg_write_messages(m, user_data->data);
 }
 
 static int config_set_char(char *dest, oconfig_item_t *ci) {