X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Futils_cmd_getval.c;h=f747d5b862e8cf0770698d5e3ebf7d63f8b43ebb;hp=c23650b36fca0705d2092d9218e737eef312719d;hb=a9e50e9e30ecde17e167e271060c8183bfcbf407;hpb=bdd27cb013de89b4149393212aef1bf45a221dba

diff --git a/src/utils_cmd_getval.c b/src/utils_cmd_getval.c
index c23650b3..f747d5b8 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,19 +68,18 @@ 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, ...)                                               \
   do {                                                                         \
     if (fprintf(fh, __VA_ARGS__) < 0) {                                        \
-      char errbuf[1024];                                                       \
       WARNING("cmd_handle_getval: failed to write to socket #%i: %s",          \
-              fileno(fh), sstrerror(errno, errbuf, sizeof(errbuf)));           \
+              fileno(fh), STRERRNO);                                           \
       return -1;                                                               \
     }                                                                          \
     fflush(fh);                                                                \
@@ -97,18 +96,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 +117,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,20 +127,20 @@ 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) {
-    ERROR("ds[%s]->ds_num = %zu, "
-          "but uc_get_rate_by_name returned %zu values.",
+    ERROR("ds[%s]->ds_num = %" PRIsz ", "
+          "but uc_get_rate_by_name returned %" PRIsz " values.",
           ds->type, ds->ds_num, values_num);
     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,
+  print_to_socket(fh, "%" PRIsz " Value%s found\n", values_num,
                   (values_num == 1) ? "" : "s");
   for (size_t i = 0; i < values_num; i++) {
     print_to_socket(fh, "%s=", ds->ds[i].name);
@@ -155,7 +154,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 +163,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 : */