projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'github/pr/2052'
[collectd.git]
/
src
/
utils_cmd_flush.c
diff --git
a/src/utils_cmd_flush.c
b/src/utils_cmd_flush.c
index
cfd6a48
..
9ef50ff
100644
(file)
--- a/
src/utils_cmd_flush.c
+++ b/
src/utils_cmd_flush.c
@@
-34,9
+34,11
@@
#include "utils_cmd_flush.h"
cmd_status_t cmd_parse_flush (size_t argc, char **argv,
#include "utils_cmd_flush.h"
cmd_status_t cmd_parse_flush (size_t argc, char **argv,
- cmd_flush_t *ret_flush, cmd_error_handler_t *err)
+ cmd_flush_t *ret_flush, const cmd_options_t *opts,
+ cmd_error_handler_t *err)
{
{
- if (ret_flush == NULL)
+
+ if ((ret_flush == NULL) || (opts == NULL))
{
errno = EINVAL;
cmd_error (CMD_ERROR, err, "Invalid arguments to cmd_parse_flush.");
{
errno = EINVAL;
cmd_error (CMD_ERROR, err, "Invalid arguments to cmd_parse_flush.");
@@
-82,7
+84,8
@@
cmd_status_t cmd_parse_flush (size_t argc, char **argv,
ret_flush->identifiers_num++;
if (parse_identifier (opt_value,
&id->host, &id->plugin, &id->plugin_instance,
ret_flush->identifiers_num++;
if (parse_identifier (opt_value,
&id->host, &id->plugin, &id->plugin_instance,
- &id->type, &id->type_instance) != 0)
+ &id->type, &id->type_instance,
+ opts->identifier_default_host) != 0)
{
cmd_error (CMD_PARSE_ERROR, err,
"Invalid identifier `%s'.", opt_value);
{
cmd_error (CMD_PARSE_ERROR, err,
"Invalid identifier `%s'.", opt_value);
@@
-133,15
+136,13
@@
cmd_status_t cmd_handle_flush (FILE *fh, char *buffer)
int error = 0;
int status;
int error = 0;
int status;
- size_t i;
-
if ((fh == NULL) || (buffer == NULL))
return (-1);
DEBUG ("utils_cmd_flush: cmd_handle_flush (fh = %p, buffer = %s);",
(void *) fh, buffer);
if ((fh == NULL) || (buffer == NULL))
return (-1);
DEBUG ("utils_cmd_flush: cmd_handle_flush (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_FLUSH)
{
return (status);
if (cmd.type != CMD_FLUSH)
{
@@
-151,7
+152,7
@@
cmd_status_t cmd_handle_flush (FILE *fh, char *buffer)
return (CMD_UNKNOWN_COMMAND);
}
return (CMD_UNKNOWN_COMMAND);
}
- for (i = 0; (i == 0) || (i < cmd.cmd.flush.plugins_num); i++)
+ for (
size_t
i = 0; (i == 0) || (i < cmd.cmd.flush.plugins_num); i++)
{
char *plugin = NULL;
{
char *plugin = NULL;