Attachment 930509 Details for Bug 1108522 – Fix compiler warning introduced by previous patch

[patch] Fix compiler warning introduced by previous patch

tmp.y9xa6hcpOj (text/plain), 1.79 KB, created by Jan Friesse on 2014-08-25 14:36:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Friesse

Created: 2014-08-25 14:36:00 UTC

Size: 1.79 KB

patch

obsolete

>From dfaca4b10a005681230a81e229384b6cd239b4f6 Mon Sep 17 00:00:00 2001
>From: Jan Friesse <jfriesse@redhat.com>
>Date: Wed, 9 Jul 2014 15:52:14 +0200
>Subject: [PATCH] Fix compiler warning introduced by previous patch
>
>QB loop signal handler prototype differs from signal(2) prototype.
>Solution is to create wrapper functions.
>
>Signed-off-by: Jan Friesse <jfriesse@redhat.com>
>---
> exec/main.c |   26 ++++++++++++++++++++++++--
> 1 files changed, 24 insertions(+), 2 deletions(-)
>
>diff --git a/exec/main.c b/exec/main.c
>index fca9575..be765de 100644
>--- a/exec/main.c
>+++ b/exec/main.c
>@@ -252,6 +252,17 @@ static void sigsegv_handler (int num)
> 	raise (SIGSEGV);
> }
> 
>+/*
>+ * QB wrapper for real signal handler
>+ */
>+static int32_t sig_segv_handler (int num, void *data)
>+{
>+
>+	sigsegv_handler(num);
>+
>+	return 0;
>+}
>+
> static void sigabrt_handler (int num)
> {
> 	(void)signal (SIGABRT, SIG_DFL);
>@@ -260,6 +271,17 @@ static void sigabrt_handler (int num)
> 	raise (SIGABRT);
> }
> 
>+/*
>+ * QB wrapper for real signal handler
>+ */
>+static int32_t sig_abrt_handler (int num, void *data)
>+{
>+
>+	sigabrt_handler(num);
>+
>+	return 0;
>+}
>+
> #define LOCALHOST_IP inet_addr("127.0.0.1")
> 
> static void *corosync_group_handle;
>@@ -1351,9 +1373,9 @@ int main (int argc, char **argv, char **envp)
> 	qb_loop_signal_add(corosync_poll_handle, QB_LOOP_HIGH,
> 		SIGINT, NULL, sig_exit_handler, NULL);
> 	qb_loop_signal_add(corosync_poll_handle, QB_LOOP_HIGH,
>-		SIGSEGV, NULL, sigsegv_handler, NULL);
>+		SIGSEGV, NULL, sig_segv_handler, NULL);
> 	qb_loop_signal_add(corosync_poll_handle, QB_LOOP_HIGH,
>-		SIGABRT, NULL, sigabrt_handler, NULL);
>+		SIGABRT, NULL, sig_abrt_handler, NULL);
> 	qb_loop_signal_add(corosync_poll_handle, QB_LOOP_HIGH,
> 		SIGQUIT, NULL, sig_exit_handler, NULL);
> 	qb_loop_signal_add(corosync_poll_handle, QB_LOOP_HIGH,
>-- 
>1.7.1
>

Actions: View | Diff

Attachments on bug 1108522: 907995 | 907996 | 907997 | 907998 | 907999 | 908004 | 908111 | 930505 | 930506 | 930507 | 930509 | 930510 | 930511 | 930512 | 930513 | 930514 | 930515 | 930516 | 930517 | 930518 | 930519 | 930527 | 930528 | 930529 | 930530 | 930531 | 930535 | 930536 | 930537 | 930538 | 930539 | 930540 | 931024