From 298343f5ade67ff72f5b845bbfbdbbbd1bc2aad5 Mon Sep 17 00:00:00 2001 From: Christophe CURIS Date: Sun, 13 Oct 2013 22:44:11 +0200 Subject: [PATCH] wmaker: Marked args as unused for compiler in X Error handlers When an error occurs in X, the Xlib is using a callback mechanism to execute application code to handle the problem, which means having a fixed argument list for that application function. It is then correct to not use all the arguments, so this patch adds the appropriate stuff to avoid a false report from compiler. Signed-off-by: Christophe CURIS --- src/screen.c | 6 +++++- src/startup.c | 3 +++ src/texture.c | 4 ++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/screen.c b/src/screen.c index 715894e2..c7295f33 100644 --- a/src/screen.c +++ b/src/screen.c @@ -109,6 +109,10 @@ static void make_keys(void) */ static int alreadyRunningError(Display * dpy, XErrorEvent * error) { + /* Parameter not used, but tell the compiler that it is ok */ + (void) dpy; + (void) error; + CantManageScreen = 1; return -1; } @@ -520,7 +524,7 @@ WScreen *wScreenInit(int screen_number) scr->fakeGroupLeaders = WMCreateArray(16); CantManageScreen = 0; - oldHandler = XSetErrorHandler((XErrorHandler) alreadyRunningError); + oldHandler = XSetErrorHandler(alreadyRunningError); event_mask = EVENT_MASK; diff --git a/src/startup.c b/src/startup.c index ce5a7741..78422e1a 100644 --- a/src/startup.c +++ b/src/startup.c @@ -127,6 +127,9 @@ static int catchXError(Display * dpy, XErrorEvent * error) */ static int handleXIO(Display * xio_dpy) { + /* Parameter not used, but tell the compiler that it is ok */ + (void) xio_dpy; + dpy = NULL; Exit(0); return 0; diff --git a/src/texture.c b/src/texture.c index a401fcee..c73c85a0 100644 --- a/src/texture.c +++ b/src/texture.c @@ -110,6 +110,10 @@ WTexSolid *wTextureMakeSolid(WScreen * scr, XColor * color) static int dummyErrorHandler(Display * foo, XErrorEvent * bar) { + /* Parameter not used, but tell the compiler that it is ok */ + (void) foo; + (void) bar; + return 0; }