X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Futils_cmd_listval.c;h=24ec942144e48a89726810dedb4eeb0c409b3633;hp=f86388932080fcdf71072a4cdcf0a110b6240c36;hb=d486225f89ea52d8ed2b4242eba2ad94c409f837;hpb=ffaf9b893b6042a76e1c0dadd83ce06904fcc89a diff --git a/src/utils_cmd_listval.c b/src/utils_cmd_listval.c index f8638893..24ec9421 100644 --- a/src/utils_cmd_listval.c +++ b/src/utils_cmd_listval.c @@ -34,18 +34,16 @@ #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); + return CMD_PARSE_ERROR; } - return (CMD_OK); + return CMD_OK; } /* cmd_status_t cmd_parse_listval */ #define free_everything_and_return(status) \ @@ -56,15 +54,14 @@ cmd_status_t cmd_parse_listval(size_t argc, char **argv, } \ sfree(names); \ sfree(times); \ - return (status); \ + 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))); \ + STRERRNO); \ free_everything_and_return(CMD_ERROR); \ } \ fflush(fh); \ @@ -83,7 +80,7 @@ cmd_status_t cmd_handle_listval(FILE *fh, char *buffer) { buffer); if ((status = cmd_parse(buffer, &cmd, NULL, &err)) != CMD_OK) - return (status); + return status; if (cmd.type != CMD_LISTVAL) { cmd_error(CMD_UNKNOWN_COMMAND, &err, "Unexpected command: `%s'.", CMD_TO_STRING(cmd.type)); @@ -104,9 +101,3 @@ cmd_status_t cmd_handle_listval(FILE *fh, char *buffer) { free_everything_and_return(CMD_OK); } /* cmd_status_t cmd_handle_listval */ - -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 : */