From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Mon, 8 Feb 2016 20:25:49 +0000 (+0000)
Subject: Unbreak function pointer passing
X-Git-Tag: 1.1.4~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a23868a7106d4ea15ebb9de5d0074e34be11a03d;p=thirdparty%2Frspamd.git

Unbreak function pointer passing
---

diff --git a/src/rspamadm/rspamadm.c b/src/rspamadm/rspamadm.c
index d91b663046..61c06c8879 100644
--- a/src/rspamadm/rspamadm.c
+++ b/src/rspamadm/rspamadm.c
@@ -46,21 +46,13 @@ static gboolean rspamadm_parse_ucl_var (const gchar *option_name,
 		const gchar *value, gpointer data,
 		GError **error);
 
-static union {
-	gboolean (*func)(const gchar *option_name,
-					const gchar *value, gpointer data,
-					GError **error);
-	const gpointer ptr;
-} rspamadm_parse_ucl_var_un = {
-	.func = &rspamadm_parse_ucl_var
-};
 
 static GOptionEntry entries[] = {
 	{"verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose,
 			"Enable verbose logging", NULL},
 	{"list-commands", 'l', 0, G_OPTION_ARG_NONE, &list_commands,
 			"List available commands", NULL},
-	{"var", 0, 0, G_OPTION_ARG_CALLBACK, &rspamadm_parse_ucl_var_un,
+	{"var", 0, 0, G_OPTION_ARG_CALLBACK, (gpointer)&rspamadm_parse_ucl_var,
 			"Redefine UCL variable", NULL},
 	{"help", 'h', 0, G_OPTION_ARG_NONE, &show_help,
 			"Show help", NULL},