X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Futils_cmd_getval.c;h=59046f6944cbe9d5c6fbdee1774843f71eddfdbf;hp=c23650b36fca0705d2092d9218e737eef312719d;hb=7111bb6df7628edce3a8e538b386fbe27633a191;hpb=96b920e6b7bf70560eb95c911202afbeaab2b965 diff --git a/src/utils_cmd_getval.c b/src/utils_cmd_getval.c index c23650b3..59046f69 100644 --- a/src/utils_cmd_getval.c +++ b/src/utils_cmd_getval.c @@ -43,7 +43,7 @@ cmd_status_t cmd_parse_getval(size_t argc, char **argv, if ((ret_getval == NULL) || (opts == NULL)) { errno = EINVAL; cmd_error(CMD_ERROR, err, "Invalid arguments to cmd_parse_getval."); - return (CMD_ERROR); + return CMD_ERROR; } if (argc != 1) { @@ -52,7 +52,7 @@ cmd_status_t cmd_parse_getval(size_t argc, char **argv, else cmd_error(CMD_PARSE_ERROR, err, "Garbage after identifier: `%s'.", argv[1]); - return (CMD_PARSE_ERROR); + return CMD_PARSE_ERROR; } /* parse_identifier() modifies its first argument, @@ -68,11 +68,11 @@ cmd_status_t cmd_parse_getval(size_t argc, char **argv, cmd_error(CMD_PARSE_ERROR, err, "Cannot parse identifier `%s'.", identifier_copy); sfree(identifier_copy); - return (CMD_PARSE_ERROR); + return CMD_PARSE_ERROR; } ret_getval->raw_identifier = identifier_copy; - return (CMD_OK); + return CMD_OK; } /* cmd_status_t cmd_parse_getval */ #define print_to_socket(fh, ...) \ @@ -97,18 +97,18 @@ cmd_status_t cmd_handle_getval(FILE *fh, char *buffer) { const data_set_t *ds; if ((fh == NULL) || (buffer == NULL)) - return (-1); + return -1; DEBUG("utils_cmd_getval: cmd_handle_getval (fh = %p, buffer = %s);", (void *)fh, buffer); if ((status = cmd_parse(buffer, &cmd, NULL, &err)) != CMD_OK) - return (status); + return status; if (cmd.type != CMD_GETVAL) { cmd_error(CMD_UNKNOWN_COMMAND, &err, "Unexpected command: `%s'.", CMD_TO_STRING(cmd.type)); cmd_destroy(&cmd); - return (CMD_UNKNOWN_COMMAND); + return CMD_UNKNOWN_COMMAND; } ds = plugin_get_ds(cmd.cmd.getval.identifier.type); @@ -118,7 +118,7 @@ cmd_status_t cmd_handle_getval(FILE *fh, char *buffer) { cmd_error(CMD_ERROR, &err, "Type `%s' is unknown.\n", cmd.cmd.getval.identifier.type); cmd_destroy(&cmd); - return (-1); + return -1; } values = NULL; @@ -128,7 +128,7 @@ cmd_status_t cmd_handle_getval(FILE *fh, char *buffer) { if (status != 0) { cmd_error(CMD_ERROR, &err, "No such value."); cmd_destroy(&cmd); - return (CMD_ERROR); + return CMD_ERROR; } if (ds->ds_num != values_num) { @@ -138,7 +138,7 @@ cmd_status_t cmd_handle_getval(FILE *fh, char *buffer) { cmd_error(CMD_ERROR, &err, "Error reading value from cache."); sfree(values); cmd_destroy(&cmd); - return (CMD_ERROR); + return CMD_ERROR; } print_to_socket(fh, "%zu Value%s found\n", values_num, @@ -155,7 +155,7 @@ cmd_status_t cmd_handle_getval(FILE *fh, char *buffer) { sfree(values); cmd_destroy(&cmd); - return (CMD_OK); + return CMD_OK; } /* cmd_status_t cmd_handle_getval */ void cmd_destroy_getval(cmd_getval_t *getval) { @@ -164,5 +164,3 @@ void cmd_destroy_getval(cmd_getval_t *getval) { sfree(getval->raw_identifier); } /* void cmd_destroy_getval */ - -/* vim: set sw=2 sts=2 ts=8 : */