Fix a few "return type defaults to 'int' compiler warnings.

Force them to be int, return 0 where necessary.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

19 files changed, 91 insertions, 7 deletions

diff --git a/xts5/src/bin/mc/files.c b/xts5/src/bin/mc/files.c
index ee88a400..2c608406 100644
--- a/xts5/src/bin/mc/files.c
+++ b/xts5/src/bin/mc/files.c
@@ -236,6 +236,7 @@ char *tmpfile;
  * Combine all the files in the right order onto
  * stdout.
  */
+void
 outfile(fp)
 FILE	*fp;
 {
diff --git a/xts5/src/bin/mc/main.c b/xts5/src/bin/mc/main.c
index dc870933..022bfb3d 100644
--- a/xts5/src/bin/mc/main.c
+++ b/xts5/src/bin/mc/main.c
@@ -369,6 +369,7 @@ extern	int 	Outputon;
 /*
  * Push back a line of input.
  */
+int
 putbackline(line)
 char	*line;
 {
@@ -377,6 +378,7 @@ char	*line;
 		errexit();
 	}
 	strcpy(putbackbuf, line);
+	return 0;
 }
 
 /*
@@ -443,19 +445,23 @@ char	*np;
 /*
  * Print out an error message with preceeding line and file information.
  */
+int
 err(mess)
 char	*mess;
 {
 	fprintf(stderr, "%s: line %d: %s", Filename? Filename: "<stdin>", Lineno, mess);
+	return 0;
 }
 
 /*
  * Tidy up and exit.
  */
+int
 errexit()
 {
 	remfiles();
 	exit(EXIT_FAILURE);
+	return 0;
 }
 
 /*
diff --git a/xts5/src/bin/mc/mcproto.h b/xts5/src/bin/mc/mcproto.h
index 32dd7115..16df2949 100644
--- a/xts5/src/bin/mc/mcproto.h
+++ b/xts5/src/bin/mc/mcproto.h
@@ -105,7 +105,7 @@ void mepcomment(char *buf);
 FILE *nextfile(struct mclist *sources);
 void outcopy(char *file);
 FILE *cretmpfile(char *file, char **crefile);
-int outfile(FILE *fp);
+void outfile(FILE *fp);
 int remfiles(void);
 int includefile(char *file, char *bp);
 void filetemp(char *name);
diff --git a/xts5/src/bin/mc/sections.c b/xts5/src/bin/mc/sections.c
index 5633a388..f4da4e85 100644
--- a/xts5/src/bin/mc/sections.c
+++ b/xts5/src/bin/mc/sections.c
@@ -277,6 +277,7 @@ struct	secname {
  * Loop through all sections and branch out to the appropriate strategy
  * routines.
  */
+int
 dosections(fp, buf)
 FILE	*fp;
 char	*buf;
@@ -326,6 +327,7 @@ int 	sec;
 				break;
 		}
 	}
+	return 0;
 }
 
 /*
@@ -333,6 +335,7 @@ int 	sec;
  * and gc.  The gc type are sorted out by gccomps the others
  * branch to their own strategies.
  */
+int
 assertion(fp, buf)
 FILE	*fp;
 char	*buf;
@@ -414,6 +417,7 @@ static char	*reasons[] = {
 		}
 		free(line);
 	}
+	return 0;
 }
 
 /*
@@ -532,6 +536,7 @@ int	i;
 /*
  * Switch out to the command specific hook command.
  */
+int
 dohook(buf, hook)
 char	*buf;
 int 	hook;
@@ -547,6 +552,8 @@ int 	hook;
 
 	if (hooksw[Cmdname][hook])
 		(*hooksw[Cmdname][hook])(buf);
+
+	return 0;
 }
 
 /*
diff --git a/xts5/src/lib/XInput.c b/xts5/src/lib/XInput.c
index 35c3c95e..eba66c57 100644
--- a/xts5/src/lib/XInput.c
+++ b/xts5/src/lib/XInput.c
@@ -115,12 +115,13 @@ int NumKeys,
 extern int XInputMajorOpcode;
 extern int unexp_err();
 
+void
 Close_Extension_Display()
     {
     XCloseDisplay(dpy2);
     dpy2 = NULL;
     }
-
+int
 Setup_Extension_DeviceInfo(dmask)
     unsigned int dmask;
     {
@@ -515,6 +516,7 @@ Setup_Extension_DeviceInfo(dmask)
 	return (False);
     }
 
+void
 SuppressExtensionEvents(dpy, win)
     Display *dpy;
     Window win;
@@ -522,6 +524,7 @@ SuppressExtensionEvents(dpy, win)
     XChangeDeviceDontPropagateList(dpy, win, pclass, propclasses, AddToList);
     }
 
+void
 SelectExtensionEvents(dpy, win)
     Display *dpy;
     Window win;
@@ -529,6 +532,7 @@ SelectExtensionEvents(dpy, win)
     XSelectExtensionEvent(dpy, win, classes, nclass);
     }
 
+void
 MinMaxKeys(dpy, dev, min, max, num)
     Display *dpy;
     XDevice *dev;
@@ -559,6 +563,7 @@ MinMaxKeys(dpy, dev, min, max, num)
 	}
     }
 
+int
 SetFeedbackInfo (mask, id)
     unsigned int mask;
     XID id;
@@ -634,7 +639,7 @@ SetFeedbackInfo (mask, id)
  * This function handles X errors.
  *
  */
-
+int
 handle_x_errors (disp, err)
     Display     *disp;
     XErrorEvent *err;
@@ -665,5 +670,6 @@ handle_x_errors (disp, err)
 	    {
 	    baddev = testdev;
 	    }
+    return 0;
     }
 #endif
diff --git a/xts5/src/lib/checkevent.c b/xts5/src/lib/checkevent.c
index 3248ed84..0edbb4a4 100644
--- a/xts5/src/lib/checkevent.c
+++ b/xts5/src/lib/checkevent.c
@@ -661,6 +661,7 @@ char	tempstr[50];
 }
 
 #ifdef INPUTEXTENSION
+int
 check_ext_event(good,ev)
 XEvent *good, *ev;
 {
diff --git a/xts5/src/lib/cursor.c b/xts5/src/lib/cursor.c
index 7cff8a64..18f5be37 100644
--- a/xts5/src/lib/cursor.c
+++ b/xts5/src/lib/cursor.c
@@ -120,6 +120,7 @@ purpose.  It is provided "as is" without express or implied warranty.
 
 /* does this cursor match that of the window? */
 
+int
 curofwin(display, cursor, window)
 Display	*display;
 Cursor	cursor;
@@ -129,7 +130,7 @@ Window	window;
 }
 
 /* has this window the default cursor? */
-
+int
 defcur(display, window)
 Display	*display;
 Window	window;
diff --git a/xts5/src/lib/devcntl.c b/xts5/src/lib/devcntl.c
index a7c99286..7e3d01a2 100644
--- a/xts5/src/lib/devcntl.c
+++ b/xts5/src/lib/devcntl.c
@@ -398,6 +398,7 @@ int 	i;
 	keyind = 0;
 }
 #ifdef INPUTEXTENSION
+int
 devicerelkeys(dev)
 XDevice *dev;
 {
@@ -413,6 +414,8 @@ int 	i, id=dev->device_id;
 			devicekeyrel(dkeys[id][i].disp, dev, dkeys[id][i].key);
 	}
 	dkeyind[id] = 0;
+
+        return 0;
 }
 #endif
 
@@ -534,20 +537,24 @@ static void devmodthing(/* disp, dev, mask */);
  * function should be made of bits obtained by a previous call to wantmods,
  * to ensure that they have assigned keycodes.
  */
+int
 modpress(disp, mask)
 Display	*disp;
 unsigned int 	mask;
 {
 	modthing(disp, mask, True);
+        return 0;
 }
 
 #ifdef INPUTEXTENSION
+int
 devmodpress(disp, dev, mask)
 Display	*disp;
 XDevice *dev;
 unsigned int 	mask;
 {
 	devmodthing(disp, dev, mask, True);
+        return 0;
 }
 #endif
 
@@ -556,20 +563,24 @@ unsigned int 	mask;
  * function should be made of bits obtained by a previous call to wantmods,
  * to ensure that they have assigned keycodes.
  */
+int
 modrel(disp, mask)
 Display	*disp;
 unsigned int 	mask;
 {
 	modthing(disp, mask, False);
+        return 0;
 }
 
 #ifdef INPUTEXTENSION
+int
 devmodrel(disp, dev, mask)
 Display	*disp;
 XDevice *dev;
 unsigned int 	mask;
 {
 	devmodthing(disp, dev, mask, False);
+        return 0;
 }
 #endif
 
@@ -641,6 +652,7 @@ void	(*func)();
  * Check if a keycode corresponds to any of mods in a mask, returned by
  * wantmods.
  */
+int
 ismodkey(mask, kc)
 unsigned int 	mask;
 int kc;
@@ -666,6 +678,7 @@ int 	mod;
  * This routine should be called at the end of a test after any of the
  * device press routines have been called.
  */
+int
 restoredevstate()
 {
 extern	Display	*Dsp;
@@ -673,11 +686,14 @@ extern	Display	*Dsp;
 	relalldev();
 	if (origmap)
 		XSetModifierMapping(Dsp, origmap);
+
+        return 0;
 }
 
 /*
  * Returns True if we don't want to do extended testing for any reason.
  */
+int
 noext(needbutton)
 int 	needbutton;
 {
@@ -700,6 +716,7 @@ int 	needbutton;
 /*
  * Returns the number of physical buttons.
  */
+int
 nbuttons()
 {
 static int 	Nbuttons = -1;
@@ -715,6 +732,7 @@ extern	Display	*Dsp;
  * Returns a valid keycode for the server.  A different one is returned
  * every time (until it wraps round).
  */
+int
 getkeycode(display)
 Display	*display;
 {
@@ -738,6 +756,7 @@ static	int 	curkey;
  * every time (until it wraps round).
  */
 #ifdef INPUTEXTENSION
+int
 getdevkeycode(display,dev)
 Display	*display;
 XDevice *dev;
diff --git a/xts5/src/lib/pfcount.c b/xts5/src/lib/pfcount.c
index c7f2343a..be22313f 100644
--- a/xts5/src/lib/pfcount.c
+++ b/xts5/src/lib/pfcount.c
@@ -115,6 +115,7 @@ static	int 	failcount;
  * use at all because there is no guarantee that pfcount is actually
  * called.
  */
+int
 pfcount(pass, fail)
 int 	pass;
 int 	fail;
@@ -123,6 +124,7 @@ int 	fail;
 	failcount += failcount;
 }
 
+int
 rptcounts()
 {
 	trace("passcount=%d, failcount=%d", passcount, failcount);
diff --git a/xts5/src/lib/regid.c b/xts5/src/lib/regid.c
index dca60e6e..b81daa53 100644
--- a/xts5/src/lib/regid.c
+++ b/xts5/src/lib/regid.c
@@ -309,11 +309,16 @@ struct	regid	*rp;
  * Functions to enable and disable resource registration.  After disabling
  * it then resources can be freed explicitly.
  */
+int
 regenable()
 {
 	Regenabled = 1;
+        return 0;
 }
+
+int
 regdisable()
 {
 	Regenabled = 0;
+        return 0;
 }
diff --git a/xts5/src/lib/xthost.c b/xts5/src/lib/xthost.c
index 2103c518..f4244029 100644
--- a/xts5/src/lib/xthost.c
+++ b/xts5/src/lib/xthost.c
@@ -192,6 +192,7 @@ int 	nxtbadhosts = sizeof(xtbadhosts)/sizeof(xtbadhosts[0]);
  * comparison of the address field is not the correct way to compare
  * them.
  */
+int
 samehost(h1, h2)
 XHostAddress	*h1;
 XHostAddress	*h2;
diff --git a/xts5/src/libproto/ClientMng.c b/xts5/src/libproto/ClientMng.c
index c22afcf2..fc37deae 100644
--- a/xts5/src/libproto/ClientMng.c
+++ b/xts5/src/libproto/ClientMng.c
@@ -788,7 +788,7 @@ static  void ReleaseMemory (dpy, setup)
  * XstOpenDisplay must be sure to initialize all the pointers to NULL
  * before the first possible call on this.
  */
-
+int
 XstFreeDisplayStructure (dpy)
 register    XstDisplay * dpy;
 {
@@ -841,6 +841,7 @@ register    XstDisplay * dpy;
 
 
     free ((char *) dpy);
+    return 0;
 }
 
 static
diff --git a/xts5/src/libproto/Expect.c b/xts5/src/libproto/Expect.c
index 6c738fad..77d84bf0 100644
--- a/xts5/src/libproto/Expect.c
+++ b/xts5/src/libproto/Expect.c
@@ -586,6 +586,7 @@ unsigned long   size;
     return;
 }
 
+int
 Poll_Server (client)
 int     client;
 {
@@ -605,6 +606,8 @@ int     client;
     Xst_clients[client].cl_pollout = dpy -> request;
     Free_Req (req);
     Set_Test_Type(client, tt);
+
+    return 0;
 }
 
 static char
diff --git a/xts5/src/libproto/SendEvt.c b/xts5/src/libproto/SendEvt.c
index 64fe3d2f..dac3530e 100644
--- a/xts5/src/libproto/SendEvt.c
+++ b/xts5/src/libproto/SendEvt.c
@@ -158,6 +158,7 @@ SOFTWARE.
  *     NOTE: this code has only been tested down the ClientMessage leg
  */    
 
+int
 Send_Evt(client,event_ptr,event_type)
 int client;
 xEvent *event_ptr;
@@ -574,4 +575,5 @@ int event_type;
 		break;
 	}
 
+        return 0;
 }
diff --git a/xts5/src/libproto/SendXIReq.c b/xts5/src/libproto/SendXIReq.c
index 80aa3ac6..a5820401 100644
--- a/xts5/src/libproto/SendXIReq.c
+++ b/xts5/src/libproto/SendXIReq.c
@@ -722,6 +722,7 @@ int pollreq;
 
 }
 
+int
 Send_Feedback_Control (client, class, ptr)
     int client;
     XID class;
@@ -797,8 +798,11 @@ Send_Feedback_Control (client, class, ptr)
 	default:
 	    break;
 	}
+
+    return 0;
     }
 
+int
 Send_Extension_Event (client, num_ev, num_classes, ptr)
     int client;
     int num_ev, num_classes;
@@ -845,5 +849,7 @@ Send_Extension_Event (client, num_ev, num_classes, ptr)
 	    }
     for (i=0; i<num_classes; i++)
 	send4(client,(long) *cptr++);
+
+    return 0;
     }
 #endif
diff --git a/xts5/src/libproto/ShowSup.c b/xts5/src/libproto/ShowSup.c
index 01941220..08686504 100644
--- a/xts5/src/libproto/ShowSup.c
+++ b/xts5/src/libproto/ShowSup.c
@@ -160,6 +160,7 @@ static char scratchbuf[PRTBUFSIZ];  /* ? */
                  
 */
 
+int
 Show_Value_List_Req (rp, size, format)
 xReq * rp;
 int     size;
@@ -288,6 +289,8 @@ int	format;
 	default:
 		DEFAULT_ERROR;
 	}
+
+	return 0;
 }
 
 
@@ -321,6 +324,7 @@ int	format;
                  
 */
 
+int
 Show_Value_List_Rep (rp, size, format)
 xReply  *rp;
 int     size;
@@ -462,6 +466,8 @@ int	format;
 	default:
 		DEFAULT_ERROR;
 	}
+
+	return 0;
 }
 
 
@@ -480,6 +486,7 @@ int	format;
                  it's done now, since it's a little silly.
 */
 
+int
 Show_String8 (rp, size, length)
 xReq * rp;
 int     size;
@@ -496,6 +503,8 @@ int	length;
 		valuePtr++;
 	}
 	Log_Some("\"\n");
+
+	return 0;
 }
 
 /* 
@@ -568,6 +577,7 @@ char *label;
    methods:	 Bytes per item is implicit in FORMAT type.
 */
 
+int
 Show_Value_List_nRep (rp, nval, size, format)
 xReply  *rp;
 int     nval;
@@ -613,4 +623,5 @@ int	format;
 		DEFAULT_ERROR;
 	}
     }
+	return 0;
 }
diff --git a/xts5/src/libproto/Timer.c b/xts5/src/libproto/Timer.c
index 24d44ea8..28ce733a 100644
--- a/xts5/src/libproto/Timer.c
+++ b/xts5/src/libproto/Timer.c
@@ -161,8 +161,8 @@ static struct timer {
     struct timer   *next;	/* keeps a linked list in expiration order */
 }                   head;
 
-static  init = 0;		/* Have we set the ALRM signal handler? */
-static  inwork = 0;		/* Are we fussing with the queue? */
+static  int init = 0;		/* Have we set the ALRM signal handler? */
+static  int inwork = 0;		/* Are we fussing with the queue? */
 
 /*ARGSUSED*/
 static void
diff --git a/xts5/src/libproto/XlibXtst.c b/xts5/src/libproto/XlibXtst.c
index 5a88d381..fe56b03b 100644
--- a/xts5/src/libproto/XlibXtst.c
+++ b/xts5/src/libproto/XlibXtst.c
@@ -274,6 +274,7 @@ int XstDisconnectDisplay (server)
     return close(server);
 }
 
+int
 _XstWaitForReadable(dpy)
   XstDisplay *dpy;
 {
@@ -288,6 +289,8 @@ _XstWaitForReadable(dpy)
 	    XstIOError(dpy,"_XstWaitForReadable",1);
 	}
     } while (result <= 0);
+
+    return 0;
 }
 
 static unsigned int padlength[4] = {0, 3, 2, 1};
@@ -440,6 +443,7 @@ Bad_Open_Timeout_Func() {
     Timeout_Func(PASS_action);
 }
 
+int
 GetConnSetupPrefix (client, prefixp, needswap)
 int client;
 xConnSetupPrefix * prefixp;
@@ -477,6 +481,8 @@ int     needswap;
     BPRINTF2 ("\tminorVersion = %d\n", prefixp->minorVersion);
     prefixp -> length = unpack2 (&bptr, needswap);
     BPRINTF2 ("\tlength = %d\n", prefixp->length);
+
+    return 0;
 }
 
 /* 
@@ -651,6 +657,7 @@ typedef struct {
 
 #define bignamelen (sizeof(XBigReqExtensionName) - 1)
 
+int
 BigRequestsSetup(client, dpy, needswap)
 int client;
 XstDisplay  *dpy;
@@ -786,5 +793,7 @@ int     needswap;
     }
     else
       	BPRINTF1 ("Big Requests not supported\n");
+
+    return 0;
 }
 
diff --git a/xts5/src/xim/ic.c b/xts5/src/xim/ic.c
index 3c406253..03b7eeef 100644
--- a/xts5/src/xim/ic.c
+++ b/xts5/src/xim/ic.c
@@ -631,6 +631,7 @@ void ic_close(ic)
 		XDestroyIC(ic);
 }
 
+int
 ic_get_cb(pe_cb,status_cb,geom_cb)
 	XIMCallback pe_cb[];
 	XIMCallback status_cb[];
@@ -660,4 +661,6 @@ ic_get_cb(pe_cb,status_cb,geom_cb)
 
     geom_cb->callback = iccb_geom;
     geom_cb->client_data = (XPointer)IM_GEOM_CALLBACKS;
+
+    return 0;
 }