X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Futils_cmds_test.c;h=b540146da3f71f714136db79c4a8fd4e229d9b8e;hp=9e9eae3b5baacc132770761d36d53469d2d42332;hb=936c450a86c841eea89888c8550c9118fae90c25;hpb=77ad300d75ce59bf4d49d839a2af72e90590033c

diff --git a/src/utils_cmds_test.c b/src/utils_cmds_test.c
index 9e9eae3b..b540146d 100644
--- a/src/utils_cmds_test.c
+++ b/src/utils_cmds_test.c
@@ -28,293 +28,197 @@
 #include "testing.h"
 #include "utils_cmds.h"
 
-static void error_cb (void *ud, cmd_status_t status,
-		const char *format, va_list ap)
-{
-	if (status == CMD_OK)
-		return;
-
-	printf ("ERROR[%d]: ", status);
-	vprintf (format, ap);
-	printf ("\n");
-	fflush (stdout);
+static void error_cb(void *ud, cmd_status_t status, const char *format,
+                     va_list ap) {
+  if (status == CMD_OK)
+    return;
+
+  printf("ERROR[%d]: ", status);
+  vprintf(format, ap);
+  printf("\n");
+  fflush(stdout);
 } /* void error_cb */
 
 static cmd_options_t default_host_opts = {
-	/* identifier_default_host = */ "dummy-host",
+    /* identifier_default_host = */ "dummy-host",
 };
 
 static struct {
-	char *input;
-	cmd_options_t *opts;
-	cmd_status_t expected_status;
-	cmd_type_t expected_type;
+  char *input;
+  cmd_options_t *opts;
+  cmd_status_t expected_status;
+  cmd_type_t expected_type;
 } parse_data[] = {
-	/* Valid FLUSH commands. */
-	{
-		"FLUSH",
-		NULL,
-		CMD_OK,
-		CMD_FLUSH,
-	},
-	{
-		"FLUSH identifier=myhost/magic/MAGIC",
-		NULL,
-		CMD_OK,
-		CMD_FLUSH,
-	},
-	{
-		"FLUSH identifier=magic/MAGIC",
-		&default_host_opts,
-		CMD_OK,
-		CMD_FLUSH,
-	},
-	{
-		"FLUSH timeout=123 plugin=\"A\"",
-		NULL,
-		CMD_OK,
-		CMD_FLUSH,
-	},
-	/* Invalid FLUSH commands. */
-	{
-		/* Missing hostname; no default. */
-		"FLUSH identifier=magic/MAGIC",
-		NULL,
-		CMD_PARSE_ERROR,
-		CMD_UNKNOWN,
-	},
-	{
-		/* Missing 'identifier' key. */
-		"FLUSH myhost/magic/MAGIC",
-		NULL,
-		CMD_PARSE_ERROR,
-		CMD_UNKNOWN,
-	},
-	{
-		/* Invalid timeout. */
-		"FLUSH timeout=A",
-		NULL,
-		CMD_PARSE_ERROR,
-		CMD_UNKNOWN,
-	},
-	{
-		/* Invalid identifier. */
-		"FLUSH identifier=invalid",
-		NULL,
-		CMD_PARSE_ERROR,
-		CMD_UNKNOWN,
-	},
-	{
-		/* Invalid option. */
-		"FLUSH invalid=option",
-		NULL,
-		CMD_PARSE_ERROR,
-		CMD_UNKNOWN,
-	},
-
-	/* Valid GETVAL commands. */
-	{
-		"GETVAL myhost/magic/MAGIC",
-		NULL,
-		CMD_OK,
-		CMD_GETVAL,
-	},
-	{
-		"GETVAL magic/MAGIC",
-		&default_host_opts,
-		CMD_OK,
-		CMD_GETVAL,
-	},
-
-	/* Invalid GETVAL commands. */
-	{
-		"GETVAL magic/MAGIC",
-		NULL,
-		CMD_PARSE_ERROR,
-		CMD_UNKNOWN,
-	},
-	{
-		"GETVAL",
-		NULL,
-		CMD_PARSE_ERROR,
-		CMD_UNKNOWN,
-	},
-	{
-		"GETVAL invalid",
-		NULL,
-		CMD_PARSE_ERROR,
-		CMD_UNKNOWN,
-	},
-
-	/* Valid LISTVAL commands. */
-	{
-		"LISTVAL",
-		NULL,
-		CMD_OK,
-		CMD_LISTVAL,
-	},
-
-	/* Invalid LISTVAL commands. */
-	{
-		"LISTVAL invalid",
-		NULL,
-		CMD_PARSE_ERROR,
-		CMD_UNKNOWN,
-	},
-
-	/* Valid PUTVAL commands. */
-	{
-		"PUTVAL magic/MAGIC N:42",
-		&default_host_opts,
-		CMD_OK,
-		CMD_PUTVAL,
-	},
-	{
-		"PUTVAL myhost/magic/MAGIC N:42",
-		NULL,
-		CMD_OK,
-		CMD_PUTVAL,
-	},
-	{
-		"PUTVAL myhost/magic/MAGIC 1234:42",
-		NULL,
-		CMD_OK,
-		CMD_PUTVAL,
-	},
-	{
-		"PUTVAL myhost/magic/MAGIC 1234:42 2345:23",
-		NULL,
-		CMD_OK,
-		CMD_PUTVAL,
-	},
-	{
-		"PUTVAL myhost/magic/MAGIC interval=2 1234:42",
-		NULL,
-		CMD_OK,
-		CMD_PUTVAL,
-	},
-	{
-		"PUTVAL myhost/magic/MAGIC interval=2 1234:42 interval=5 2345:23",
-		NULL,
-		CMD_OK,
-		CMD_PUTVAL,
-	},
-
-	/* Invalid PUTVAL commands. */
-	{
-		"PUTVAL magic/MAGIC N:42",
-		NULL,
-		CMD_PARSE_ERROR,
-		CMD_UNKNOWN,
-	},
-	{
-		"PUTVAL",
-		NULL,
-		CMD_PARSE_ERROR,
-		CMD_UNKNOWN,
-	},
-	{
-		"PUTVAL invalid N:42",
-		NULL,
-		CMD_PARSE_ERROR,
-		CMD_UNKNOWN,
-	},
-	{
-		"PUTVAL myhost/magic/MAGIC A:42",
-		NULL,
-		CMD_PARSE_ERROR,
-		CMD_UNKNOWN,
-	},
-	{
-		"PUTVAL myhost/magic/MAGIC 1234:A",
-		NULL,
-		CMD_PARSE_ERROR,
-		CMD_UNKNOWN,
-	},
-	{
-		"PUTVAL myhost/magic/MAGIC",
-		NULL,
-		CMD_PARSE_ERROR,
-		CMD_UNKNOWN,
-	},
-	{
-		"PUTVAL 1234:A",
-		NULL,
-		CMD_PARSE_ERROR,
-		CMD_UNKNOWN,
-	},
-	{
-		"PUTVAL myhost/magic/UNKNOWN 1234:42",
-		NULL,
-		CMD_PARSE_ERROR,
-		CMD_UNKNOWN,
-	},
-	/*
-	 * As of collectd 5.x, PUTVAL accepts invalid options.
-	{
-		"PUTVAL myhost/magic/MAGIC invalid=2 1234:42",
-		NULL,
-		CMD_PARSE_ERROR,
-		CMD_UNKNOWN,
-	},
-	*/
-
-	/* Invalid commands. */
-	{
-		"INVALID",
-		NULL,
-		CMD_UNKNOWN_COMMAND,
-		CMD_UNKNOWN,
-	},
-	{
-		"INVALID interval=2",
-		NULL,
-		CMD_UNKNOWN_COMMAND,
-		CMD_UNKNOWN,
-	},
+    /* Valid FLUSH commands. */
+    {
+        "FLUSH", NULL, CMD_OK, CMD_FLUSH,
+    },
+    {
+        "FLUSH identifier=myhost/magic/MAGIC", NULL, CMD_OK, CMD_FLUSH,
+    },
+    {
+        "FLUSH identifier=magic/MAGIC", &default_host_opts, CMD_OK, CMD_FLUSH,
+    },
+    {
+        "FLUSH timeout=123 plugin=\"A\"", NULL, CMD_OK, CMD_FLUSH,
+    },
+    /* Invalid FLUSH commands. */
+    {
+        /* Missing hostname; no default. */
+        "FLUSH identifier=magic/MAGIC", NULL, CMD_PARSE_ERROR, CMD_UNKNOWN,
+    },
+    {
+        /* Missing 'identifier' key. */
+        "FLUSH myhost/magic/MAGIC", NULL, CMD_PARSE_ERROR, CMD_UNKNOWN,
+    },
+    {
+        /* Invalid timeout. */
+        "FLUSH timeout=A", NULL, CMD_PARSE_ERROR, CMD_UNKNOWN,
+    },
+    {
+        /* Invalid identifier. */
+        "FLUSH identifier=invalid", NULL, CMD_PARSE_ERROR, CMD_UNKNOWN,
+    },
+    {
+        /* Invalid option. */
+        "FLUSH invalid=option", NULL, CMD_PARSE_ERROR, CMD_UNKNOWN,
+    },
+
+    /* Valid GETVAL commands. */
+    {
+        "GETVAL myhost/magic/MAGIC", NULL, CMD_OK, CMD_GETVAL,
+    },
+    {
+        "GETVAL magic/MAGIC", &default_host_opts, CMD_OK, CMD_GETVAL,
+    },
+
+    /* Invalid GETVAL commands. */
+    {
+        "GETVAL magic/MAGIC", NULL, CMD_PARSE_ERROR, CMD_UNKNOWN,
+    },
+    {
+        "GETVAL", NULL, CMD_PARSE_ERROR, CMD_UNKNOWN,
+    },
+    {
+        "GETVAL invalid", NULL, CMD_PARSE_ERROR, CMD_UNKNOWN,
+    },
+
+    /* Valid LISTVAL commands. */
+    {
+        "LISTVAL", NULL, CMD_OK, CMD_LISTVAL,
+    },
+
+    /* Invalid LISTVAL commands. */
+    {
+        "LISTVAL invalid", NULL, CMD_PARSE_ERROR, CMD_UNKNOWN,
+    },
+
+    /* Valid PUTVAL commands. */
+    {
+        "PUTVAL magic/MAGIC N:42", &default_host_opts, CMD_OK, CMD_PUTVAL,
+    },
+    {
+        "PUTVAL myhost/magic/MAGIC N:42", NULL, CMD_OK, CMD_PUTVAL,
+    },
+    {
+        "PUTVAL myhost/magic/MAGIC 1234:42", NULL, CMD_OK, CMD_PUTVAL,
+    },
+    {
+        "PUTVAL myhost/magic/MAGIC 1234:42 2345:23", NULL, CMD_OK, CMD_PUTVAL,
+    },
+    {
+        "PUTVAL myhost/magic/MAGIC interval=2 1234:42", NULL, CMD_OK,
+        CMD_PUTVAL,
+    },
+    {
+        "PUTVAL myhost/magic/MAGIC interval=2 1234:42 interval=5 2345:23", NULL,
+        CMD_OK, CMD_PUTVAL,
+    },
+
+    /* Invalid PUTVAL commands. */
+    {
+        "PUTVAL magic/MAGIC N:42", NULL, CMD_PARSE_ERROR, CMD_UNKNOWN,
+    },
+    {
+        "PUTVAL", NULL, CMD_PARSE_ERROR, CMD_UNKNOWN,
+    },
+    {
+        "PUTVAL invalid N:42", NULL, CMD_PARSE_ERROR, CMD_UNKNOWN,
+    },
+    {
+        "PUTVAL myhost/magic/MAGIC A:42", NULL, CMD_PARSE_ERROR, CMD_UNKNOWN,
+    },
+    {
+        "PUTVAL myhost/magic/MAGIC 1234:A", NULL, CMD_PARSE_ERROR, CMD_UNKNOWN,
+    },
+    {
+        "PUTVAL myhost/magic/MAGIC", NULL, CMD_PARSE_ERROR, CMD_UNKNOWN,
+    },
+    {
+        "PUTVAL 1234:A", NULL, CMD_PARSE_ERROR, CMD_UNKNOWN,
+    },
+    {
+        "PUTVAL myhost/magic/UNKNOWN 1234:42", NULL, CMD_PARSE_ERROR,
+        CMD_UNKNOWN,
+    },
+    /*
+     * As of collectd 5.x, PUTVAL accepts invalid options.
+    {
+            "PUTVAL myhost/magic/MAGIC invalid=2 1234:42",
+            NULL,
+            CMD_PARSE_ERROR,
+            CMD_UNKNOWN,
+    },
+    */
+
+    /* Invalid commands. */
+    {
+        "INVALID", NULL, CMD_UNKNOWN_COMMAND, CMD_UNKNOWN,
+    },
+    {
+        "INVALID interval=2", NULL, CMD_UNKNOWN_COMMAND, CMD_UNKNOWN,
+    },
 };
 
-DEF_TEST(parse)
-{
-	cmd_error_handler_t err = { error_cb, NULL };
-	int test_result = 0;
+DEF_TEST(parse) {
+  cmd_error_handler_t err = {error_cb, NULL};
+  int test_result = 0;
 
-	for (size_t i = 0; i < STATIC_ARRAY_SIZE (parse_data); i++) {
-		char *input = strdup (parse_data[i].input);
+  for (size_t i = 0; i < STATIC_ARRAY_SIZE(parse_data); i++) {
+    char *input = strdup(parse_data[i].input);
 
-		char description[1024];
-		cmd_status_t status;
-		cmd_t cmd;
+    char description[1024];
+    cmd_status_t status;
+    cmd_t cmd;
 
-		_Bool result;
+    _Bool result;
 
-		memset (&cmd, 0, sizeof (cmd));
+    memset(&cmd, 0, sizeof(cmd));
 
-		status = cmd_parse (input, &cmd, parse_data[i].opts, &err);
-		snprintf (description, sizeof (description),
-				"cmd_parse (\"%s\", opts=%p) = %d (type=%d [%s]); want %d (type=%d [%s])",
-				parse_data[i].input, parse_data[i].opts, status,
-				cmd.type, CMD_TO_STRING (cmd.type),
-				parse_data[i].expected_status,
-				parse_data[i].expected_type,
-				CMD_TO_STRING (parse_data[i].expected_type));
-		result = (status == parse_data[i].expected_status)
-				&& (cmd.type == parse_data[i].expected_type);
-		LOG (result, description);
+    status = cmd_parse(input, &cmd, parse_data[i].opts, &err);
+    snprintf(description, sizeof(description), "cmd_parse (\"%s\", opts=%p) = "
+                                               "%d (type=%d [%s]); want %d "
+                                               "(type=%d [%s])",
+             parse_data[i].input, parse_data[i].opts, status, cmd.type,
+             CMD_TO_STRING(cmd.type), parse_data[i].expected_status,
+             parse_data[i].expected_type,
+             CMD_TO_STRING(parse_data[i].expected_type));
+    result = (status == parse_data[i].expected_status) &&
+             (cmd.type == parse_data[i].expected_type);
+    LOG(result, description);
 
-		/* Run all tests before failing. */
-		if (! result)
-			test_result = -1;
+    /* Run all tests before failing. */
+    if (!result)
+      test_result = -1;
 
-		cmd_destroy (&cmd);
-		free (input);
-	}
+    cmd_destroy(&cmd);
+    free(input);
+  }
 
-	return (test_result);
+  return (test_result);
 }
 
-int main (int argc, char **argv)
-{
-	RUN_TEST(parse);
-	END_TEST;
+int main(int argc, char **argv) {
+  RUN_TEST(parse);
+  END_TEST;
 }