[Rework] Use clang-format to unify formatting in all sources

No meaningful changes.

1 files changed, 56 insertions, 59 deletions

diff --git a/src/rspamadm/configtest.c b/src/rspamadm/configtest.c
index 8e6b335a9..bfad1984e 100644
--- a/src/rspamadm/configtest.c
+++ b/src/rspamadm/configtest.c
@@ -29,43 +29,42 @@ extern struct rspamd_main *rspamd_main;
 extern module_t *modules[];
 extern worker_t *workers[];
 
-static void rspamadm_configtest (gint argc, gchar **argv,
-								 const struct rspamadm_command *cmd);
-static const char *rspamadm_configtest_help (gboolean full_help,
-											 const struct rspamadm_command *cmd);
+static void rspamadm_configtest(gint argc, gchar **argv,
+								const struct rspamadm_command *cmd);
+static const char *rspamadm_configtest_help(gboolean full_help,
+											const struct rspamadm_command *cmd);
 
 struct rspamadm_command configtest_command = {
-		.name = "configtest",
-		.flags = 0,
-		.help = rspamadm_configtest_help,
-		.run = rspamadm_configtest,
-		.lua_subrs = NULL,
+	.name = "configtest",
+	.flags = 0,
+	.help = rspamadm_configtest_help,
+	.run = rspamadm_configtest,
+	.lua_subrs = NULL,
 };
 
 static GOptionEntry entries[] = {
-		{"quiet", 'q', 0, G_OPTION_ARG_NONE, &quiet,
-				"Suppress output", NULL},
-		{"config", 'c', 0, G_OPTION_ARG_STRING, &config,
-				"Config file to test",     NULL},
-		{"strict", 's', 0, G_OPTION_ARG_NONE, &strict,
-				"Stop on any error in config", NULL},
-		{"skip-template", 'T', 0, G_OPTION_ARG_NONE, &skip_template,
-				"Do not apply Jinja templates", NULL},
-		{NULL,  0,   0, G_OPTION_ARG_NONE, NULL, NULL, NULL}
-};
+	{"quiet", 'q', 0, G_OPTION_ARG_NONE, &quiet,
+	 "Suppress output", NULL},
+	{"config", 'c', 0, G_OPTION_ARG_STRING, &config,
+	 "Config file to test", NULL},
+	{"strict", 's', 0, G_OPTION_ARG_NONE, &strict,
+	 "Stop on any error in config", NULL},
+	{"skip-template", 'T', 0, G_OPTION_ARG_NONE, &skip_template,
+	 "Do not apply Jinja templates", NULL},
+	{NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL, NULL}};
 
 static const char *
-rspamadm_configtest_help (gboolean full_help, const struct rspamadm_command *cmd)
+rspamadm_configtest_help(gboolean full_help, const struct rspamadm_command *cmd)
 {
 	const char *help_str;
 
 	if (full_help) {
 		help_str = "Perform configuration file test\n\n"
-				"Usage: rspamadm configtest [-q -c <config_name>]\n"
-				"Where options are:\n\n"
-				"-q: quiet output\n"
-				"-c: config file to test\n"
-				"--help: shows available options and commands";
+				   "Usage: rspamadm configtest [-q -c <config_name>]\n"
+				   "Where options are:\n\n"
+				   "-q: quiet output\n"
+				   "-c: config file to test\n"
+				   "--help: shows available options and commands";
 	}
 	else {
 		help_str = "Perform configuration file test";
@@ -75,12 +74,12 @@ rspamadm_configtest_help (gboolean full_help, const struct rspamadm_command *cmd
 }
 
 static void
-config_logger (rspamd_mempool_t *pool, gpointer ud)
+config_logger(rspamd_mempool_t *pool, gpointer ud)
 {
 }
 
 static void
-rspamadm_configtest (gint argc, gchar **argv, const struct rspamadm_command *cmd)
+rspamadm_configtest(gint argc, gchar **argv, const struct rspamadm_command *cmd)
 {
 	GOptionContext *context;
 	GError *error = NULL;
@@ -90,41 +89,39 @@ rspamadm_configtest (gint argc, gchar **argv, const struct rspamadm_command *cmd
 	worker_t **pworker;
 	const guint64 *log_cnt;
 
-	context = g_option_context_new (
-			"configtest - perform configuration file test");
-	g_option_context_set_summary (context,
-			"Summary:\n  Rspamd administration utility version "
-					RVERSION
-					"\n  Release id: "
-					RID);
-	g_option_context_add_main_entries (context, entries, NULL);
-
-	if (!g_option_context_parse (context, &argc, &argv, &error)) {
-		fprintf (stderr, "option parsing failed: %s\n", error->message);
-		g_error_free (error);
-		g_option_context_free (context);
-		exit (EXIT_FAILURE);
+	context = g_option_context_new(
+		"configtest - perform configuration file test");
+	g_option_context_set_summary(context,
+								 "Summary:\n  Rspamd administration utility version " RVERSION
+								 "\n  Release id: " RID);
+	g_option_context_add_main_entries(context, entries, NULL);
+
+	if (!g_option_context_parse(context, &argc, &argv, &error)) {
+		fprintf(stderr, "option parsing failed: %s\n", error->message);
+		g_error_free(error);
+		g_option_context_free(context);
+		exit(EXIT_FAILURE);
 	}
 
-	g_option_context_free (context);
+	g_option_context_free(context);
 
 	if (config == NULL) {
 		static gchar fbuf[PATH_MAX];
 
-		if ((confdir = g_hash_table_lookup (ucl_vars, "CONFDIR")) == NULL) {
+		if ((confdir = g_hash_table_lookup(ucl_vars, "CONFDIR")) == NULL) {
 			confdir = RSPAMD_CONFDIR;
 		}
 
-		rspamd_snprintf (fbuf, sizeof (fbuf), "%s%c%s",
-				confdir, G_DIR_SEPARATOR,
-				"rspamd.conf");
+		rspamd_snprintf(fbuf, sizeof(fbuf), "%s%c%s",
+						confdir, G_DIR_SEPARATOR,
+						"rspamd.conf");
 		config = fbuf;
 	}
 
 	pworker = &workers[0];
 	while (*pworker) {
 		/* Init string quarks */
-		(void) g_quark_from_static_string ((*pworker)->name);
+		(void) g_quark_from_static_string((*pworker)->name);
 		pworker++;
 	}
 
@@ -132,45 +129,45 @@ rspamadm_configtest (gint argc, gchar **argv, const struct rspamadm_command *cmd
 	cfg->compiled_workers = workers;
 	cfg->cfg_name = config;
 
-	if (!rspamd_config_read (cfg, cfg->cfg_name, config_logger, rspamd_main,
-			ucl_vars, skip_template, lua_env)) {
+	if (!rspamd_config_read(cfg, cfg->cfg_name, config_logger, rspamd_main,
+							ucl_vars, skip_template, lua_env)) {
 		ret = FALSE;
 	}
 	else {
 		/* Do post-load actions */
-		rspamd_lua_post_load_config (cfg);
+		rspamd_lua_post_load_config(cfg);
 
-		if (!rspamd_init_filters (rspamd_main->cfg, false, strict)) {
+		if (!rspamd_init_filters(rspamd_main->cfg, false, strict)) {
 			ret = FALSE;
 		}
 
 		if (ret) {
-			ret = rspamd_config_post_load (cfg, RSPAMD_CONFIG_INIT_SYMCACHE);
+			ret = rspamd_config_post_load(cfg, RSPAMD_CONFIG_INIT_SYMCACHE);
 		}
 
-		if (ret && !rspamd_symcache_validate (cfg->cache,
-				cfg,
-				FALSE)) {
+		if (ret && !rspamd_symcache_validate(cfg->cache,
+											 cfg,
+											 FALSE)) {
 			ret = FALSE;
 		}
 	}
 
 	if (strict && ret) {
-		log_cnt = rspamd_log_counters (rspamd_main->logger);
+		log_cnt = rspamd_log_counters(rspamd_main->logger);
 
 		if (log_cnt && log_cnt[0] > 0) {
 			if (!quiet) {
-				rspamd_printf ("%L errors found\n", log_cnt[0]);
+				rspamd_printf("%L errors found\n", log_cnt[0]);
 			}
 			ret = FALSE;
 		}
 	}
 
 	if (!quiet) {
-		rspamd_printf ("syntax %s\n", ret ? "OK" : "BAD");
+		rspamd_printf("syntax %s\n", ret ? "OK" : "BAD");
 	}
 
 	if (!ret) {
-		exit (EXIT_FAILURE);
+		exit(EXIT_FAILURE);
 	}
 }