Fix return types.


(joerg)

$NetBSD: patch-events.c,v 1.1 2013/03/28 21:40:11 joerg Exp $

--- events.c.orig	2013-03-28 19:14:44.000000000 +0000
+++ events.c
@@ -38,6 +38,8 @@
 
 /* ===== externs ========================================================== */
 
+void CheckOlvwmRC(Display *dpy);
+
 extern void	ReapChildren();
 
 /* ===== globals ========================================================== */

$NetBSD: patch-olwm.h,v 1.1 2013/03/28 21:40:11 joerg Exp $

--- olwm.h.orig	2013-03-28 19:18:35.000000000 +0000
+++ olwm.h
@@ -107,7 +107,6 @@ extern struct _wingeneric *NoFocusWinInf
 extern struct _wingeneric *MakeNoFocus();
 extern void NoFocusTakeFocus();
 extern void NoFocusInit();
-extern int NoFocusEventBeep();
 
 /* client information and functions */
 extern struct _List *ActiveClientList;
@@ -147,8 +146,6 @@ extern int GFrameSetConfigFunc();
 extern void GFrameSetStack();
 extern void GFrameSetConfig();
 extern int GFrameEventButtonPress();
-extern int GFrameEventMotionNotify();
-extern int GFrameEventButtonRelease();
 extern int GFrameEventFocus();
 extern int GFrameEventEnterNotify();
 
@@ -187,7 +184,6 @@ extern void ColormapTransmogrify();
 extern Bool IsSelected();
 extern struct _client *EnumSelections();
 extern Time TimeFresh();
-extern int AddSelection();
 extern Bool RemoveSelection();
 extern Bool ToggleSelection();
 extern void ClearSelections();

$NetBSD: patch-selection.c,v 1.1 2013/03/28 21:40:11 joerg Exp $

--- selection.c.orig	2013-03-28 19:18:31.000000000 +0000
+++ selection.c
@@ -299,10 +299,8 @@ IsSelected(cli)
  * Add this client to the list of clients on the PRIMARY selection and mark
  * the client as being selected.  Acquires the PRIMARY selection if necessary.
  */
-int
-AddSelection(cli, timestamp)
-	Client *cli;
-	Time timestamp;
+void
+AddSelection(Client *cli, Time timestamp)
 {
 	List *l = selectList;
 	Client *tc;

$NetBSD: patch-selection.h,v 1.1 2013/03/28 21:40:11 joerg Exp $

--- selection.h.orig	2013-03-28 19:20:53.000000000 +0000
+++ selection.h
@@ -17,7 +17,6 @@
 extern	Time	SelectionTime;
 
 extern	Bool	IsSelected(/*  client  */);
-extern	int	AddSelection(/*  client, time  */);
 extern	Bool	RemoveSelection(/*  client  */);
 extern	Bool	ToggleSelection(/*  client, time  */);
 extern	void	ClearSelections(/*  dpy  */);

$NetBSD: patch-slots.c,v 1.1 2013/03/28 21:40:11 joerg Exp $

--- slots.c.orig	2013-03-28 19:21:20.000000000 +0000
+++ slots.c
@@ -535,8 +535,7 @@ Bool snaptogrid;
  * Note that if this code is changed, the similar code in SlotSetLocations
  * may need to be changed also.
  */
-SlotFree(winicon)
-WinIconFrame *winicon;
+void SlotFree(WinIconFrame *winicon)
 {
 	IconGrid	*iconGrid = winicon->core.client->scrInfo->iconGrid;
 
@@ -566,9 +565,7 @@ WinIconFrame *winicon;
  * in the new order.
  */
 /*ARGSUSED*/
-SlotSetLocations(dpy,iconGrid)
-Display *dpy;
-IconGrid *iconGrid;
+void SlotSetLocations(Display *dpy, IconGrid *iconGrid)
 {
 	List *lauto, *lpos;
 	List **l;

$NetBSD: patch-slots.h,v 1.1 2013/03/28 21:40:11 joerg Exp $

--- slots.h.orig	2013-03-28 19:21:57.000000000 +0000
+++ slots.h
@@ -45,12 +45,12 @@ extern struct _iconSlot *SlotAlloc();	/*
 	 * parameter; False should be passed otherwise.
 	 */
 
-extern Bool SlotFree();		/* WinIcon * */
+void SlotFree(WinIconFrame *winicon);
  	/* An icon is going away, so its references to slots should also go
 	 * away. 
 	 */
 
-extern Bool SlotSetLocations();	/* Display *dpy */
+void SlotSetLocations(Display *dpy, IconGrid *iconGrid);
 	/* sets the order in which slots are allocated for icons which are
 	 * not explicitly positioned.  The new order is obtained from the
 	 * global resource vector.

$NetBSD: patch-st.h,v 1.1 2013/03/28 21:40:11 joerg Exp $

--- st.h.orig	2013-03-28 19:24:02.000000000 +0000
+++ st.h
@@ -40,7 +40,8 @@ struct st_table {
 
 enum st_retval {ST_CONTINUE, ST_STOP, ST_DELETE};
 
-int st_delete(), st_insert(), st_foreach(), st_free_table();
+void st_foreach(st_table *table, enum st_retval (*func)(), char *arg);
+int st_delete(), st_insert(), st_free_table();
 int st_lookup(), st_find_or_add(), st_add_direct();
 st_table *st_init_table(), *st_init_table_with_params();
 

$NetBSD: patch-win.h,v 1.1 2013/03/28 21:40:12 joerg Exp $

--- win.h.orig	2013-03-28 19:19:40.000000000 +0000
+++ win.h
@@ -573,4 +573,9 @@ extern int  ShapeErrorBase;
 
 extern Client *CurrentClient;
 
+void AddSelection(Client *cli, Time timestamp);
+void GFrameEventButtonRelease(Display *dpy, XEvent *event, WinGenericFrame *frameInfo);
+void GFrameEventMotionNotify(Display *dpy, XEvent *event, WinGenericFrame *frameInfo);
+void NoFocusEventBeep(Display *dpy, XEvent *event, WinGeneric *winInfo);
+
 #endif /* _OLWM_WIN_H */

$NetBSD: patch-winbusy.c,v 1.1 2013/03/28 21:40:12 joerg Exp $

--- winbusy.c.orig	2013-03-28 19:26:50.000000000 +0000
+++ winbusy.c
@@ -30,6 +30,8 @@
 #include "win.h"
 #include "globals.h"
 
+void PaintVirtualWindow(WinGenericFrame *win);
+
 /***************************************************************************
 * global data
 ***************************************************************************/

$NetBSD: patch-winbutton.c,v 1.1 2013/03/28 21:40:12 joerg Exp $

--- winbutton.c.orig	2013-03-28 19:29:18.000000000 +0000
+++ winbutton.c
@@ -81,11 +81,8 @@ doUnhilite(act, mode, winInfo)
 /* 
  * eventButtonPress - handle button press events on the close button window.  
  */
-static int
-eventButtonPress(dpy, event, winInfo)
-Display	*dpy;
-XEvent	*event;
-WinButton	*winInfo;
+static void
+eventButtonPress(Display *dpy, XEvent *event, WinButton *winInfo)
 {
 	Client *cli = winInfo->core.client;
 	WinPaneFrame *winFrame = cli->framewin;
@@ -139,11 +136,8 @@ WinButton	*winInfo;
  * stop ignore events.  This is so that double-clicking on the button doesn't
  * close and then reopen the window (or perform the default action twice).
  */
-static int
-eventButtonRelease(dpy, event, winInfo)
-Display	*dpy;
-XEvent	*event;
-WinButton	*winInfo;
+static void
+eventButtonRelease(Display *dpy, XEvent *event, WinButton *winInfo)
 {
 	Client *cli = winInfo->core.client;
 	int x,y;
@@ -187,11 +181,8 @@ WinButton	*winInfo;
 /* 
  * eventMotionNotify - handle motion notify events on the close button window.  
  */
-static int
-eventMotionNotify(dpy, event, winInfo)
-Display	*dpy;
-XEvent	*event;
-WinButton	*winInfo;
+static void
+eventMotionNotify(Display *dpy, XEvent *event, WinButton *winInfo)
 {
 	int 	x,y;
 	Client *cli = winInfo->core.client;

$NetBSD: patch-wingframe.c,v 1.1 2013/03/28 21:40:12 joerg Exp $

--- wingframe.c.orig	2013-03-28 19:57:02.000000000 +0000
+++ wingframe.c
@@ -275,11 +275,8 @@ int x,y,w,h;
  * GFrameEventButtonRelease -- a button has been released
  *
  */
-int
-GFrameEventButtonRelease(dpy, event, frameInfo)
-Display *dpy;
-XEvent  *event;
-WinGenericFrame *frameInfo;
+void
+GFrameEventButtonRelease(Display *dpy, XEvent *event, WinGenericFrame *frameInfo)
 {
         WinGenericPane	*winPane = (WinGenericPane*)frameInfo->fcore.panewin;
         Client *cli = frameInfo->core.client;
@@ -344,11 +341,8 @@ WinGenericFrame *frameInfo;
 /*
  * GFrameEventMotionNotify -- a button is down and the pointer is moving
  */
-int
-GFrameEventMotionNotify(dpy, event, frameInfo)
-Display *dpy;
-XEvent  *event;
-WinGenericFrame *frameInfo;
+void
+GFrameEventMotionNotify(Display *dpy, XEvent *event, WinGenericFrame *frameInfo)
 {
         /* We get this only after a Select press */
         if (hadSelect == False) /* watch for erroneous motions */

$NetBSD: patch-winipane.c,v 1.1 2013/03/28 21:40:12 joerg Exp $

--- winipane.c.orig	2013-03-28 19:45:55.000000000 +0000
+++ winipane.c
@@ -72,10 +72,8 @@ static ClassPane classIconPane;
  * drawIPane -- draw the pane window
  */
 /*ARGSUSED*/	/* dpy arg will be used when multiple Displays supported */
-static int
-drawIPane(dpy, winInfo)
-Display	*dpy;
-WinIconPane *winInfo;
+static void
+drawIPane(Display *dpy, WinIconPane *winInfo)
 {
     Window 	pane = winInfo->core.self;
     GC 		gc;

$NetBSD: patch-winnofoc.c,v 1.1 2013/03/28 21:40:12 joerg Exp $

--- winnofoc.c.orig	2013-03-28 19:46:38.000000000 +0000
+++ winnofoc.c
@@ -230,11 +230,8 @@ ScreenInfo *scrInfo;
  * NoFocusEventBeep -- beep on keyboard/mouse events for the no-focus window
  *	Also used by busy windows
  */
-int
-NoFocusEventBeep(dpy, event, winInfo)
-Display	*dpy;
-XEvent	*event;
-WinGeneric *winInfo;
+void
+NoFocusEventBeep(Display *dpy, XEvent *event, WinGeneric *winInfo)
 {
         XEvent dummy;
 

$NetBSD: patch-winpane.c,v 1.1 2013/03/28 21:40:12 joerg Exp $

--- winpane.c.orig	2013-03-28 19:47:39.000000000 +0000
+++ winpane.c
@@ -156,12 +156,9 @@ WinPane	*winInfo;
 /*
  * eventExtension - handle extension events
  */
-static int
+static void
 /* ARGSUSED */
-eventExtension(dpy, event, winInfo)
-    Display	*dpy;
-    XEvent	*event;
-    WinPane	*winInfo;
+eventExtension(Display *dpy, XEvent *event, WinPane *winInfo)
 {
 #ifdef SHAPE
     XShapeEvent *se;

$NetBSD: patch-winpinmenu.c,v 1.1 2013/03/28 21:40:12 joerg Exp $

--- winpinmenu.c.orig	2013-03-28 19:48:07.000000000 +0000
+++ winpinmenu.c
@@ -84,11 +84,8 @@ afterMenuShow(win)
 /* 
  * eventButtonPress  - a button has gone down.
  */
-static int
-eventButtonPress(dpy, event, winInfo)
-    Display		*dpy;
-    XEvent		*event;
-    WinPinMenu		*winInfo;
+static void
+eventButtonPress(Display *dpy, XEvent *event, WinPinMenu *winInfo)
 {
     if (! StartMenuGrabs(dpy, winInfo))
 	return;
@@ -99,11 +96,8 @@ eventButtonPress(dpy, event, winInfo)
 }
 
 
-static int
-eventKeyEvent(dpy, event, winInfo)
-    Display		*dpy;
-    XEvent		*event;
-    WinPinMenu		*winInfo;
+static void
+eventKeyEvent(Display *dpy, XEvent *event, WinPinMenu *winInfo)
 {
     MenuMakeFirst(winInfo->menuInfo, afterMenuShow, winInfo);
 

$NetBSD: patch-winpush.c,v 1.1 2013/03/28 21:40:12 joerg Exp $

--- winpush.c.orig	2013-03-28 19:49:07.000000000 +0000
+++ winpush.c
@@ -95,11 +95,8 @@ WinPushPin	*winInfo;
 /* 
  * eventButtonRelease - handle button release events on the pushpin window 
  */
-static int
-eventButtonRelease(dpy, event, winInfo)
-Display	*dpy;
-XEvent	*event;
-WinPushPin	*winInfo;
+static void
+eventButtonRelease(Display *dpy, XEvent *event, WinPushPin *winInfo)
 {
 	FrameAllowEvents(winInfo->core.client, event->xbutton.time);
 	if (!AllButtonsUp(event))
@@ -121,11 +118,8 @@ WinPushPin	*winInfo;
 /* 
  * eventMotionNotify - handle pointer moves
  */
-static int
-eventMotionNotify(dpy, event, winInfo)
-Display	*dpy;
-XEvent	*event;
-WinPushPin	*winInfo;
+static void
+eventMotionNotify(Display *dpy, XEvent *event, WinPushPin *winInfo)
 {
 	Bool 	fInWindow;
 	Graphics_info	*gisNormal = WinGI(winInfo,NORMAL_GINFO);

$NetBSD: patch-winresize.c,v 1.1 2013/03/28 21:40:12 joerg Exp $

--- winresize.c.orig	2013-03-28 19:49:55.000000000 +0000
+++ winresize.c
@@ -70,11 +70,8 @@ resizeCallback(dpy, winInfo)
 /* 
  * eventButtonPress - handle button press events on the resize window 
  */
-static int
-eventButtonPress(dpy, event, winInfo)
-Display	*dpy;
-XEvent	*event;
-WinResize	*winInfo;
+static void
+eventButtonPress(Display *dpy, XEvent *event, WinResize *winInfo)
 {
 	unsigned int ignoremask =
 	    ModMaskMap[MOD_CONSTRAIN] | ModMaskMap[MOD_INVERT];

$NetBSD: patch-winroot.c,v 1.1 2013/03/28 21:40:12 joerg Exp $

--- winroot.c.orig	2013-03-28 19:50:18.000000000 +0000
+++ winroot.c
@@ -190,11 +190,8 @@ matchKeystrokeToSpec(event,spec)
  * crossed through the root window into a child window, and we will get the
  * EnterNotify for that child window.
  */
-static int
-eventEnterNotify(dpy, pEvent, winInfo)
-	Display		*dpy;
-	XEvent		*pEvent;
-	WinRoot		*winInfo;
+static void
+eventEnterNotify(Display *dpy, XEvent *pEvent, WinRoot *winInfo)
 {
         if (pEvent->xcrossing.detail == NotifyNonlinearVirtual)
             return;
@@ -282,11 +279,8 @@ selectInBox(dpy, winInfo, boxX, boxY, bo
 /* 
  * eventMotionNotify - the pointer is moving
  */
-static int
-eventMotionNotify(dpy, pEvent, winInfo)
-	Display		*dpy;
-	XEvent		*pEvent;
-	WinRoot		*winInfo;
+static void
+eventMotionNotify(Display *dpy, XEvent *pEvent, WinRoot *winInfo)
 {
 	int			(*selectFunc)();
 
@@ -336,11 +330,8 @@ eventMotionNotify(dpy, pEvent, winInfo)
  * If the user clicks in the window, the focus is set to the no-focus window, 
  * and the PRIMARY and SECONDARY selections are acquired and nulled.
  */
-static int
-eventButtonRelease(dpy, pEvent, winInfo)
-	Display		*dpy;
-	XEvent		*pEvent;
-	WinRoot		*winInfo;
+static void
+eventButtonRelease(Display *dpy, XEvent *pEvent, WinRoot *winInfo)
 {
 	if (!AllButtonsUp(pEvent))
 	    return;
@@ -368,11 +359,8 @@ eventButtonRelease(dpy, pEvent, winInfo)
  * or by issuing an AllowEvents request, and (3) ungrab the pointer if the
  * child's handler didn't issue a grab of its own.
  */
-static int
-eventButtonPress(dpy, pEvent, winInfo)
-	Display		*dpy;
-	XEvent		*pEvent;
-	WinRoot		*winInfo;
+static void
+eventButtonPress(Display *dpy, XEvent *pEvent, WinRoot *winInfo)
 {
 	SemanticAction a;
 	WinGeneric *child;
@@ -442,12 +430,9 @@ eventKeyPressRelease(dpy, pEvent, winInf
 /* 
  * eventPropertyNotify - a root property has changed
  */
-static int
+static void
 /* ARGSUSED */
-eventPropertyNotify(dpy, pEvent, winInfo)
-	Display		*dpy;
-	XEvent		*pEvent;
-	WinRoot		*winInfo;
+eventPropertyNotify(Display *dpy, XEvent *pEvent, WinRoot *winInfo)
 {
 	unsigned long	nitems, remain;
 	char		*resourceString;