From: Florian Forster Date: Fri, 17 Jul 2020 16:08:32 +0000 (+0200) Subject: cmds: Format with contrib/format.sh X-Git-Tag: 6.0.0-rc0~144^2~19 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36ddb70a574c0638a80841b62d7cd7651020cf81;p=thirdparty%2Fcollectd.git cmds: Format with contrib/format.sh --- diff --git a/src/utils/cmds/cmds.c b/src/utils/cmds/cmds.c index 6994cf2fa..a213e9a15 100644 --- a/src/utils/cmds/cmds.c +++ b/src/utils/cmds/cmds.c @@ -31,8 +31,8 @@ #include "utils/cmds/getval.h" #include "utils/cmds/listval.h" #include "utils/cmds/parse_option.h" -#include "utils/cmds/putval.h" #include "utils/cmds/putmetric.h" +#include "utils/cmds/putval.h" #include "utils/common/common.h" #include @@ -214,8 +214,8 @@ cmd_status_t cmd_parsev(size_t argc, char **argv, cmd_t *ret_cmd, cmd_parse_putval(argc - 1, argv + 1, &ret_cmd->cmd.putval, opts, err); } else if (strcasecmp("PUTMETRIC", command) == 0) { ret_cmd->type = CMD_PUTMETRIC; - status = - cmd_parse_putmetric(argc - 1, argv + 1, &ret_cmd->cmd.putmetric, opts, err); + status = cmd_parse_putmetric(argc - 1, argv + 1, &ret_cmd->cmd.putmetric, + opts, err); } else { ret_cmd->type = CMD_UNKNOWN; cmd_error(CMD_UNKNOWN_COMMAND, err, "Unknown command `%s'.", command); diff --git a/src/utils/cmds/cmds.h b/src/utils/cmds/cmds.h index 3e30a56bb..e9e2c0b7f 100644 --- a/src/utils/cmds/cmds.h +++ b/src/utils/cmds/cmds.h @@ -46,8 +46,9 @@ typedef enum { ? "GETVAL" \ : ((type) == CMD_LISTVAL) \ ? "LISTVAL" \ - : ((type) == CMD_PUTVAL) ? "PUTVAL" \ - : ((type) == CMD_PUTMETRIC) ? "PUTMETRIC" : "UNKNOWN" + : ((type) == CMD_PUTVAL) \ + ? "PUTVAL" \ + : ((type) == CMD_PUTMETRIC) ? "PUTMETRIC" : "UNKNOWN" typedef struct { double timeout; diff --git a/src/utils/cmds/putval.c b/src/utils/cmds/putval.c index a287d0ed1..1a6d114de 100644 --- a/src/utils/cmds/putval.c +++ b/src/utils/cmds/putval.c @@ -91,14 +91,15 @@ cmd_status_t cmd_parse_putval(size_t argc, char **argv, value_list_t vl = VALUE_LIST_INIT; if ((opts != NULL) && (opts->identifier_default_host != NULL)) { - sstrncpy(vl.host, opts->identifier_default_host, sizeof(vl.host)); + sstrncpy(vl.host, opts->identifier_default_host, sizeof(vl.host)); } char const *identifier = argv[0]; int status = parse_identifier_vl(identifier, &vl); if (status != 0) { DEBUG("cmd_handle_putval: Cannot parse identifier `%s'.", identifier); - cmd_error(CMD_PARSE_ERROR, errhndl, "parse_identifier_vl(\"%s\"): %s", identifier, STRERROR(status)); + cmd_error(CMD_PARSE_ERROR, errhndl, "parse_identifier_vl(\"%s\"): %s", + identifier, STRERROR(status)); return CMD_PARSE_ERROR; }