Janitor: ansification, make distcheck, compiler warnings.

  Only convert to use "ansi prototypes" the functions warned from
compilation with "./autogen.sh --prefix=/usr", on a Linux computer.

  Also, only address "trivial" compiler warning fixes in this commit.

  The new .gitignore is the output of a command like:
% find . -name .gitignore -exec cat {} \; | sort | uniq
and only the toplevel .gitignore file was kept.

15 files changed, 43 insertions, 135 deletions

diff --git a/modules/im/ximcp/.gitignore b/modules/im/ximcp/.gitignore
deleted file mode 100644
index 288d1a0..0000000
--- a/modules/im/ximcp/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-*.lo
-*.o
-*.la
-.libs
-.deps
-Makefile
-Makefile.in
diff --git a/modules/im/ximcp/imDefLkup.c b/modules/im/ximcp/imDefLkup.c
index 7909e93..33c431a 100644
--- a/modules/im/ximcp/imDefLkup.c
+++ b/modules/im/ximcp/imDefLkup.c
@@ -893,13 +893,8 @@ _Ximctsconvert(
 }
 
 Public int
-_Ximctstombs(xim, from, from_len, to, to_len, state)
-    XIM		 xim;
-    char	*from;
-    int		 from_len;
-    char	*to;
-    int		 to_len;
-    Status	*state;
+_Ximctstombs(XIM xim, char *from, int from_len,
+	     char *to, int to_len, Status *state)
 {
     return _Ximctsconvert(((Xim)xim)->private.proto.ctom_conv,
 			  from, from_len, to, to_len, state);
diff --git a/modules/im/ximcp/imDispch.c b/modules/im/ximcp/imDispch.c
index b79df4a..6b87788 100644
--- a/modules/im/ximcp/imDispch.c
+++ b/modules/im/ximcp/imDispch.c
@@ -63,8 +63,7 @@ _XimRegProtoIntrCallback(
 }
 
 Public void
-_XimFreeProtoIntrCallback(im)
-    Xim		im;
+_XimFreeProtoIntrCallback(Xim im)
 {
     register XimProtoIntrRec *rec, *next;
 
@@ -99,8 +98,7 @@ _XimTransportIntr(
 }
 
 Public Bool
-_XimDispatchInit(im)
-    Xim		 im;
+_XimDispatchInit(Xim im)
 {
     if (_XimRegisterDispatcher(im, _XimTransportIntr, (XPointer)im))
 	return True;
diff --git a/modules/im/ximcp/imInsClbk.c b/modules/im/ximcp/imInsClbk.c
index ac39f9d..3f384f4 100644
--- a/modules/im/ximcp/imInsClbk.c
+++ b/modules/im/ximcp/imInsClbk.c
@@ -271,8 +271,7 @@ _XimUnRegisterIMInstantiateCallback(
 
 
 Public void
-_XimResetIMInstantiateCallback( xim )
-    Xim		xim;
+_XimResetIMInstantiateCallback(Xim xim)
 {
     char		 locale[XIM_MAXLCNAMELEN];
     XimInstCallback	 icb;
diff --git a/modules/im/ximcp/imInt.c b/modules/im/ximcp/imInt.c
index c4b177b..6ca7a1c 100644
--- a/modules/im/ximcp/imInt.c
+++ b/modules/im/ximcp/imInt.c
@@ -75,8 +75,7 @@ _XimSetIMStructureList(
 }
 
 Public void
-_XimDestroyIMStructureList(im)
-    Xim		  im;
+_XimDestroyIMStructureList(Xim im)
 {
     register int  i;
 
@@ -90,8 +89,7 @@ _XimDestroyIMStructureList(im)
 }
 
 Public void
-_XimServerDestroy(im_2_destroy)
-    Xim		  im_2_destroy;
+_XimServerDestroy(Xim im_2_destroy)
 {
     register int  i;
     Xim		  im;
@@ -125,7 +123,7 @@ _XimServerDestroy(im_2_destroy)
 
 #ifdef XIM_CONNECTABLE
 Public void
-_XimServerReconectableDestroy()
+_XimServerReconectableDestroy(void)
 {
     register int  i;
     Xim		  im;
@@ -259,8 +257,7 @@ Error1:
 }
 
 Public Bool
-_XInitIM(lcd)
-    XLCd	 lcd;
+_XInitIM(XLCd lcd)
 {
     if(lcd == (XLCd)NULL)
 	return False;
diff --git a/modules/im/ximcp/imLcFlt.c b/modules/im/ximcp/imLcFlt.c
index 6c05163..04f5b43 100644
--- a/modules/im/ximcp/imLcFlt.c
+++ b/modules/im/ximcp/imLcFlt.c
@@ -40,11 +40,7 @@ PERFORMANCE OF THIS SOFTWARE.
 #include "Ximint.h"
 
 Bool
-_XimLocalFilter(d, w, ev, client_data)
-    Display	*d;
-    Window	 w;
-    XEvent	*ev;
-    XPointer	 client_data;
+_XimLocalFilter(Display *d, Window w, XEvent *ev, XPointer client_data)
 {
     Xic		 ic = (Xic)client_data;
     KeySym	 keysym;
diff --git a/modules/im/ximcp/imLcGIc.c b/modules/im/ximcp/imLcGIc.c
index 59ea833..b90a070 100644
--- a/modules/im/ximcp/imLcGIc.c
+++ b/modules/im/ximcp/imLcGIc.c
@@ -36,9 +36,7 @@ PERFORMANCE OF THIS SOFTWARE.
 #include "Ximint.h"
 
 Public char *
-_XimLocalGetICValues(xic, values)
-    XIC			 xic;
-    XIMArg		*values;
+_XimLocalGetICValues(XIC xic, XIMArg *values)
 {
     Xic			 ic = (Xic)xic;
     XimDefICValues	 ic_values;
diff --git a/modules/im/ximcp/imLcIm.c b/modules/im/ximcp/imLcIm.c
index 3744e7e..5af08c0 100644
--- a/modules/im/ximcp/imLcIm.c
+++ b/modules/im/ximcp/imLcIm.c
@@ -96,8 +96,7 @@ Private int     _XimCachedDefaultTreeRefcount = 0;
 
 
 Public Bool
-_XimCheckIfLocalProcessing(im)
-    Xim          im;
+_XimCheckIfLocalProcessing(Xim im)
 {
     FILE        *fp;
     char        *name;
diff --git a/modules/im/ximcp/imLcLkup.c b/modules/im/ximcp/imLcLkup.c
index e952b5b..b4ecdc3 100644
--- a/modules/im/ximcp/imLcLkup.c
+++ b/modules/im/ximcp/imLcLkup.c
@@ -46,13 +46,8 @@ PERFORMANCE OF THIS SOFTWARE.
 #include "Ximint.h"
 
 Public int
-_XimLocalMbLookupString(xic, ev, buffer, bytes, keysym, status)
-    XIC		 xic;
-    XKeyEvent	*ev;
-    char	*buffer;
-    int		 bytes;
-    KeySym	 *keysym;
-    Status	 *status;
+_XimLocalMbLookupString(XIC xic, XKeyEvent *ev, char *buffer, int bytes,
+			KeySym *keysym, Status *status)
 {
     Xic		 ic = (Xic)xic;
     int		 ret;
@@ -125,13 +120,8 @@ _XimLocalMbLookupString(xic, ev, buffer, bytes, keysym, status)
 }
 
 Public int
-_XimLocalWcLookupString(xic, ev, buffer, wlen, keysym, status)
-    XIC		  xic;
-    XKeyEvent	 *ev;
-    wchar_t	 *buffer;
-    int		  wlen;
-    KeySym	 *keysym;
-    Status	 *status;
+_XimLocalWcLookupString(XIC xic, XKeyEvent *ev, wchar_t *buffer, int wlen,
+			KeySym *keysym, Status *status)
 {
     Xic		 ic = (Xic)xic;
     int		 ret;
@@ -202,13 +192,8 @@ _XimLocalWcLookupString(xic, ev, buffer, wlen, keysym, status)
 }
 
 Public int
-_XimLocalUtf8LookupString(xic, ev, buffer, bytes, keysym, status)
-    XIC		  xic;
-    XKeyEvent	 *ev;
-    char	 *buffer;
-    int		  bytes;
-    KeySym	 *keysym;
-    Status	 *status;
+_XimLocalUtf8LookupString(XIC xic, XKeyEvent *ev, char *buffer, int bytes,
+			  KeySym *keysym, Status *status)
 {
     Xic		 ic = (Xic)xic;
     int		 ret;
@@ -341,26 +326,16 @@ _XimLcctsconvert(
 }
 
 Public int
-_XimLcctstombs(xim, from, from_len, to, to_len, state)
-    XIM		 xim;
-    char	*from;
-    int		 from_len;
-    char	*to;
-    int		 to_len;
-    Status	*state;
+_XimLcctstombs(XIM xim, char *from, int from_len,
+	       char *to, int to_len, Status *state)
 {
     return _XimLcctsconvert(((Xim)xim)->private.local.ctom_conv,
 			    from, from_len, to, to_len, state);
 }
 
 Public int
-_XimLcctstowcs(xim, from, from_len, to, to_len, state)
-    XIM		 xim;
-    char	*from;
-    int		 from_len;
-    wchar_t	*to;
-    int		 to_len;
-    Status	*state;
+_XimLcctstowcs(XIM xim, char *from, int from_len,
+	       wchar_t *to, int to_len, Status *state)
 {
     Xim		 im = (Xim)xim;
     XlcConv	 conv = im->private.local.ctow_conv;
@@ -422,13 +397,8 @@ _XimLcctstowcs(xim, from, from_len, to, to_len, state)
 }
 
 Public int
-_XimLcctstoutf8(xim, from, from_len, to, to_len, state)
-    XIM		 xim;
-    char	*from;
-    int		 from_len;
-    char	*to;
-    int		 to_len;
-    Status	*state;
+_XimLcctstoutf8(XIM xim, char *from, int from_len,
+		char *to, int to_len, Status *state)
 {
     return _XimLcctsconvert(((Xim)xim)->private.local.ctoutf8_conv,
 			    from, from_len, to, to_len, state);
diff --git a/modules/im/ximcp/imLcSIc.c b/modules/im/ximcp/imLcSIc.c
index 6a7a0be..f91eb6d 100644
--- a/modules/im/ximcp/imLcSIc.c
+++ b/modules/im/ximcp/imLcSIc.c
@@ -39,9 +39,7 @@ PERFORMANCE OF THIS SOFTWARE.
 #include "Ximint.h"
 
 Public char *
-_XimLocalSetICValues(xic, values)
-    XIC			 xic;
-    XIMArg		*values;
+_XimLocalSetICValues(XIC xic, XIMArg *values)
 {
     XimDefICValues	 ic_values;
     Xic			 ic = (Xic)xic;
diff --git a/modules/im/ximcp/imRm.c b/modules/im/ximcp/imRm.c
index e6ca30f..73f6020 100644
--- a/modules/im/ximcp/imRm.c
+++ b/modules/im/ximcp/imRm.c
@@ -2380,10 +2380,7 @@ Public int
 }
 
 Public void
-_XimSetICMode(res_list, list_num, style)
-    XIMResourceList	res_list;
-    unsigned int	list_num;
-    XIMStyle		style;
+_XimSetICMode(XIMResourceList res_list, unsigned int list_num, XIMStyle style)
 {
     XIMResourceList	res;
     unsigned int	n = XIMNumber(ic_mode);
@@ -3018,13 +3015,8 @@ _XimDecodeLocalICAttr(
 }
 
 Public char *
-_XimGetICValueData(ic, top, res_list, list_num, values, mode)
-    Xic			 ic;
-    XPointer		 top;
-    XIMResourceList	 res_list;
-    unsigned int	 list_num;
-    XIMArg		*values;
-    unsigned long	 mode;
+_XimGetICValueData(Xic ic, XPointer top, XIMResourceList res_list,
+		   unsigned int	 list_num, XIMArg *values, unsigned long mode)
 {
     register  XIMArg	*p;
     XIMResourceList	 res;
@@ -3072,9 +3064,7 @@ _XimGetICValueData(ic, top, res_list, list_num, values, mode)
 }
 
 Public void
-_XimGetCurrentIMValues(im, im_values)
-    Xim			 im;
-    XimDefIMValues	*im_values;
+_XimGetCurrentIMValues(Xim im, XimDefIMValues *im_values)
 {
     bzero((char *)im_values, sizeof(XimDefIMValues));
 
@@ -3088,9 +3078,7 @@ _XimGetCurrentIMValues(im, im_values)
 }
 
 Public void
-_XimSetCurrentIMValues(im, im_values)
-    Xim			 im;
-    XimDefIMValues	*im_values;
+_XimSetCurrentIMValues(Xim im, XimDefIMValues *im_values)
 {
     im->core.styles		= im_values->styles;
     im->core.im_values_list	= im_values->im_values_list;
@@ -3102,9 +3090,7 @@ _XimSetCurrentIMValues(im, im_values)
 }
 
 Public void
-_XimGetCurrentICValues(ic, ic_values)
-    Xic			 ic;
-    XimDefICValues	*ic_values;
+_XimGetCurrentICValues(Xic ic, XimDefICValues *ic_values)
 {
     bzero((char *)ic_values, sizeof(XimDefICValues));
 
diff --git a/modules/im/ximcp/imThaiFlt.c b/modules/im/ximcp/imThaiFlt.c
index 77da54e..368ea5c 100644
--- a/modules/im/ximcp/imThaiFlt.c
+++ b/modules/im/ximcp/imThaiFlt.c
@@ -1240,11 +1240,7 @@ ThaiFltReplaceInput(Xic ic, unsigned char new_char, KeySym symbol)
  * Filter function for TACTIS
  */
 Bool
-_XimThaiFilter(d, w, ev, client_data)
-Display		*d;
-Window		w;
-XEvent		*ev;
-XPointer	client_data;
+_XimThaiFilter(Display *d, Window w, XEvent *ev, XPointer client_data)
 {
     Xic		    ic = (Xic)client_data;
     KeySym 	    symbol;
diff --git a/modules/im/ximcp/imThaiIm.c b/modules/im/ximcp/imThaiIm.c
index a80a02a..61b5337 100644
--- a/modules/im/ximcp/imThaiIm.c
+++ b/modules/im/ximcp/imThaiIm.c
@@ -61,8 +61,7 @@ Private XIMMethodsRec      Xim_im_thai_methods = {
 #define THAI_LANGUAGE_NAME 	"th"
 
 Bool
-_XimCheckIfThaiProcessing(im)
-    Xim          im;
+_XimCheckIfThaiProcessing(Xim im)
 {
     char *language;
 
@@ -80,8 +79,7 @@ _XimCheckIfThaiProcessing(im)
 }
 
 Public Bool
-_XimThaiOpenIM(im)
-    Xim		 im;
+_XimThaiOpenIM(Xim im)
 {
     XLCd		 lcd = im->core.lcd;
     XlcConv		 conv;
@@ -150,8 +148,7 @@ Open_Error :
 }
 
 Public void
-_XimThaiIMFree(im)
-    Xim		im;
+_XimThaiIMFree(Xim im)
 {
     if(im->core.im_resources) {
 	Xfree(im->core.im_resources);
@@ -221,8 +218,7 @@ _XimThaiIMFree(im)
 }
 
 Public Status
-_XimThaiCloseIM(xim)
-    XIM		xim;
+_XimThaiCloseIM(XIM xim)
 {
     Xim		im = (Xim)xim;
     XIC		ic;
diff --git a/modules/im/ximcp/imTrX.c b/modules/im/ximcp/imTrX.c
index c5e50a4..2b08596 100644
--- a/modules/im/ximcp/imTrX.c
+++ b/modules/im/ximcp/imTrX.c
@@ -465,9 +465,7 @@ _XimXFlush(Xim im)
 }
 
 Public Bool
-_XimXConf(im, address)
-    Xim		 im;
-    char	*address;
+_XimXConf(Xim im, char *address)
 {
     XSpecRec	*spec;
 
diff --git a/modules/im/ximcp/imTransR.c b/modules/im/ximcp/imTransR.c
index 44d043f..54663dc 100644
--- a/modules/im/ximcp/imTransR.c
+++ b/modules/im/ximcp/imTransR.c
@@ -57,15 +57,13 @@ Public TransportSW _XimTransportRec[] = {
 };
 
 Public Bool
-_XimConnect(im)
-    Xim		 im;
+_XimConnect(Xim im)
 {
     return im->private.proto.connect(im);
 }
 
 Public Bool
-_XimShutdown(im)
-    Xim		 im;
+_XimShutdown(Xim im)
 {
     return im->private.proto.shutdown(im);
 }
@@ -214,15 +212,8 @@ _XimCallDispatcher(
 }
 
 Public int
-_XimRead(im, len, buf, buf_size, predicate, arg)
-    Xim		 im;
-    INT16	*len;
-    XPointer	 buf;
-    int		 buf_size;
-    Bool	 (*predicate)(
-			      Xim, INT16, XPointer, XPointer
-			      );
-    XPointer	 arg;
+_XimRead(Xim im, INT16 *len, XPointer buf, int buf_size,
+	 Bool (*predicate)(Xim, INT16, XPointer, XPointer), XPointer arg)
 {
     INT16	 read_len;
     int		 ret_code;
@@ -254,16 +245,14 @@ _XimRegisterDispatcher(
 }
 
 Public void
-_XimFlush(im)
-    Xim		 im;
+_XimFlush(Xim im)
 {
     im->private.proto.flush(im);
     return;
 }
 
 Public Bool
-_XimFilterWaitEvent(im)
-    Xim		 im;
+_XimFilterWaitEvent(Xim im)
 {
     INT16	 read_len;
     CARD32	 reply32[BUFSIZE/4];