From: Florian Forster <octo@collectd.org>
Date: Wed, 8 Jul 2020 20:58:02 +0000 (+0200)
Subject: cmds: Change cmd_create_putval() to accept a strbuf_t.
X-Git-Tag: 6.0.0-rc0~144^2~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c5c2e88d376d9d7ff025f7622943b86312115ecb;p=thirdparty%2Fcollectd.git

cmds: Change cmd_create_putval() to accept a strbuf_t.
---

diff --git a/src/utils/cmds/putval.c b/src/utils/cmds/putval.c
index 616b6a4bd..a27e6aec4 100644
--- a/src/utils/cmds/putval.c
+++ b/src/utils/cmds/putval.c
@@ -242,9 +242,8 @@ cmd_status_t cmd_handle_putval(FILE *fh, char *buffer) {
  *
  *   PUTVAL metric_name label:key="value" interval=10.000 42
  */
-int cmd_create_putval(char *ret, size_t ret_len, /* {{{ */
-                      metric_t const *m) {
-  if ((ret == NULL) || (ret_len == 0) || (m == NULL)) {
+int cmd_create_putval(strbuf_t *buf, metric_t const *m) { /* {{{ */
+  if ((buf == NULL) || (m == NULL)) {
     return EINVAL;
   }
 
@@ -254,10 +253,9 @@ int cmd_create_putval(char *ret, size_t ret_len, /* {{{ */
     return status;
   }
 
-  strbuf_t buf = STRBUF_CREATE_FIXED(ret, ret_len);
-  strbuf_print(&buf, "PUTVAL \"");
-  strbuf_print_escaped(&buf, id_buf.ptr, "\\\"\n\r\t", '\\');
-  strbuf_printf(&buf, "\" interval=%.3f", CDTIME_T_TO_DOUBLE(m->interval));
+  strbuf_print(buf, "PUTVAL \"");
+  strbuf_print_escaped(buf, id_buf.ptr, "\\\"\n\r\t", '\\');
+  strbuf_printf(buf, "\" interval=%.3f", CDTIME_T_TO_DOUBLE(m->interval));
   /* TODO(octo): print option to set the value type. */
-  return value_marshal_text(&buf, m->value, m->family->type);
+  return value_marshal_text(buf, m->value, m->family->type);
 } /* }}} int cmd_create_putval */
diff --git a/src/utils/cmds/putval.h b/src/utils/cmds/putval.h
index e535e3129..9985d3e05 100644
--- a/src/utils/cmds/putval.h
+++ b/src/utils/cmds/putval.h
@@ -41,6 +41,6 @@ cmd_status_t cmd_handle_putval(FILE *fh, char *buffer);
 
 void cmd_destroy_putval(cmd_putval_t *putval);
 
-int cmd_create_putval(char *ret, size_t ret_len, metric_t const *m);
+int cmd_create_putval(strbuf_t *buf, metric_t const *m);
 
 #endif /* UTILS_CMD_PUTVAL_H */