X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Futils_cmd_putval.c;h=b2537859163716c0450db8a7c11c65abfe86b02e;hp=0a0af8aede8b42ff663f9298b5a98d455cdf3f1f;hb=f5fdf24ccec9318baf11eec25d6dba881dc77332;hpb=5bed427b409db41140d5799c979ee556dd66393d diff --git a/src/utils_cmd_putval.c b/src/utils_cmd_putval.c index 0a0af8ae..b2537859 100644 --- a/src/utils_cmd_putval.c +++ b/src/utils_cmd_putval.c @@ -69,7 +69,8 @@ static int set_option (value_list_t *vl, const char *key, const char *value) */ cmd_status_t cmd_parse_putval (size_t argc, char **argv, - cmd_putval_t *ret_putval, cmd_error_handler_t *err) + cmd_putval_t *ret_putval, const cmd_options_t *opts, + cmd_error_handler_t *err) { cmd_status_t result; @@ -87,6 +88,13 @@ cmd_status_t cmd_parse_putval (size_t argc, char **argv, value_list_t vl = VALUE_LIST_INIT; size_t i; + if ((ret_putval == NULL) || (opts == NULL)) + { + errno = EINVAL; + cmd_error (CMD_ERROR, err, "Invalid arguments to cmd_parse_putval."); + return (CMD_ERROR); + } + if (argc < 2) { cmd_error (CMD_PARSE_ERROR, err, @@ -103,7 +111,7 @@ cmd_status_t cmd_parse_putval (size_t argc, char **argv, status = parse_identifier (identifier, &hostname, &plugin, &plugin_instance, &type, &type_instance, - NULL); + opts->identifier_default_host); if (status != 0) { DEBUG ("cmd_handle_putval: Cannot parse identifier `%s'.", @@ -257,7 +265,7 @@ cmd_status_t cmd_handle_putval (FILE *fh, char *buffer) DEBUG ("utils_cmd_putval: cmd_handle_putval (fh = %p, buffer = %s);", (void *) fh, buffer); - if ((status = cmd_parse (buffer, &cmd, &err)) != CMD_OK) + if ((status = cmd_parse (buffer, &cmd, NULL, &err)) != CMD_OK) return (status); if (cmd.type != CMD_PUTVAL) {