X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Futils_cmd_listval.c;h=36406305e4018df7b293138e2d6ad825ebdd6ff4;hb=307c875e5a78a2729fbbe1a588d232e9a129d75a;hp=27b88cbfdc923ea02f4b3d603dac48454bc96a74;hpb=e1fda36ff7e4b5f508b630b614b182e298d91fb7;p=collectd.git diff --git a/src/utils_cmd_listval.c b/src/utils_cmd_listval.c index 27b88cbf..36406305 100644 --- a/src/utils_cmd_listval.c +++ b/src/utils_cmd_listval.c @@ -29,49 +29,49 @@ #include "common.h" #include "plugin.h" -#include "utils_cmd_listval.h" #include "utils_cache.h" +#include "utils_cmd_listval.h" #include "utils_parse_option.h" -cmd_status_t cmd_parse_listval (size_t argc, char **argv, - cmd_listval_t *ret_listval __attribute__((unused)), - const cmd_options_t *opts __attribute__((unused)), - cmd_error_handler_t *err) -{ - if (argc != 0) - { - cmd_error (CMD_PARSE_ERROR, err, - "Garbage after end of command: `%s'.", argv[0]); - return (CMD_PARSE_ERROR); +cmd_status_t cmd_parse_listval(size_t argc, char **argv, + cmd_listval_t *ret_listval + __attribute__((unused)), + const cmd_options_t *opts + __attribute__((unused)), + cmd_error_handler_t *err) { + if (argc != 0) { + cmd_error(CMD_PARSE_ERROR, err, "Garbage after end of command: `%s'.", + argv[0]); + return CMD_PARSE_ERROR; } - return (CMD_OK); + return CMD_OK; } /* cmd_status_t cmd_parse_listval */ -#define free_everything_and_return(status) do { \ - for (size_t j = 0; j < number; j++) { \ - sfree(names[j]); \ - names[j] = NULL; \ - } \ - sfree(names); \ - sfree(times); \ - return (status); \ +#define free_everything_and_return(status) \ + do { \ + for (size_t j = 0; j < number; j++) { \ + sfree(names[j]); \ + names[j] = NULL; \ + } \ + sfree(names); \ + sfree(times); \ + return status; \ } while (0) -#define print_to_socket(fh, ...) \ - do { \ - if (fprintf (fh, __VA_ARGS__) < 0) { \ - char errbuf[1024]; \ - WARNING ("handle_listval: failed to write to socket #%i: %s", \ - fileno (fh), sstrerror (errno, errbuf, sizeof (errbuf))); \ - free_everything_and_return (CMD_ERROR); \ - } \ - fflush(fh); \ +#define print_to_socket(fh, ...) \ + do { \ + if (fprintf(fh, __VA_ARGS__) < 0) { \ + char errbuf[1024]; \ + WARNING("handle_listval: failed to write to socket #%i: %s", fileno(fh), \ + sstrerror(errno, errbuf, sizeof(errbuf))); \ + free_everything_and_return(CMD_ERROR); \ + } \ + fflush(fh); \ } while (0) -cmd_status_t cmd_handle_listval (FILE *fh, char *buffer) -{ - cmd_error_handler_t err = { cmd_error_fh, fh }; +cmd_status_t cmd_handle_listval(FILE *fh, char *buffer) { + cmd_error_handler_t err = {cmd_error_fh, fh}; cmd_status_t status; cmd_t cmd; @@ -79,38 +79,32 @@ cmd_status_t cmd_handle_listval (FILE *fh, char *buffer) cdtime_t *times = NULL; size_t number = 0; - DEBUG ("utils_cmd_listval: handle_listval (fh = %p, buffer = %s);", - (void *) fh, buffer); + DEBUG("utils_cmd_listval: handle_listval (fh = %p, buffer = %s);", (void *)fh, + buffer); - if ((status = cmd_parse (buffer, &cmd, NULL, &err)) != CMD_OK) - return (status); - if (cmd.type != CMD_LISTVAL) - { - cmd_error (CMD_UNKNOWN_COMMAND, &err, - "Unexpected command: `%s'.", CMD_TO_STRING (cmd.type)); - free_everything_and_return (CMD_UNKNOWN_COMMAND); + if ((status = cmd_parse(buffer, &cmd, NULL, &err)) != CMD_OK) + return status; + if (cmd.type != CMD_LISTVAL) { + cmd_error(CMD_UNKNOWN_COMMAND, &err, "Unexpected command: `%s'.", + CMD_TO_STRING(cmd.type)); + free_everything_and_return(CMD_UNKNOWN_COMMAND); } - status = uc_get_names (&names, ×, &number); - if (status != 0) - { - DEBUG ("command listval: uc_get_names failed with status %i", status); - cmd_error (CMD_ERROR, &err, "uc_get_names failed."); - free_everything_and_return (CMD_ERROR); + status = uc_get_names(&names, ×, &number); + if (status != 0) { + DEBUG("command listval: uc_get_names failed with status %i", status); + cmd_error(CMD_ERROR, &err, "uc_get_names failed."); + free_everything_and_return(CMD_ERROR); } - print_to_socket (fh, "%i Value%s found\n", - (int) number, (number == 1) ? "" : "s"); + print_to_socket(fh, "%i Value%s found\n", (int)number, + (number == 1) ? "" : "s"); for (size_t i = 0; i < number; i++) - print_to_socket (fh, "%.3f %s\n", CDTIME_T_TO_DOUBLE (times[i]), - names[i]); + print_to_socket(fh, "%.3f %s\n", CDTIME_T_TO_DOUBLE(times[i]), names[i]); - free_everything_and_return (CMD_OK); + free_everything_and_return(CMD_OK); } /* cmd_status_t cmd_handle_listval */ -void cmd_destroy_listval (cmd_listval_t *listval __attribute__((unused))) -{ +void cmd_destroy_listval(cmd_listval_t *listval __attribute__((unused))) { /* nothing to do */ } /* void cmd_destroy_listval */ - -/* vim: set sw=2 sts=2 ts=8 : */