Janitor: ansification, make distcheck, compiler warnings.

10 files changed, 96 insertions, 307 deletions

diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index 1c0eccc..0000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-libSM.la
-*.lo
-Makefile
-Makefile.in
diff --git a/src/Makefile.am b/src/Makefile.am
index dbfef37..188ac4d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,7 +16,6 @@ endif
 
 libSM_la_SOURCES = \
 	SMlibint.h \
-	globals.h \
 	sm_auth.c \
 	sm_client.c \
 	sm_error.c \
diff --git a/src/SMlibint.h b/src/SMlibint.h
index 387f0bd..350b970 100644
--- a/src/SMlibint.h
+++ b/src/SMlibint.h
@@ -488,6 +488,24 @@ struct _SmsConn {
 /*
  * Extern declarations
  */
+extern void
+_SmcProcessMessage(IceConn iceConn, IcePointer clientData, int opcode,
+		   unsigned long length, Bool swap,
+		   IceReplyWaitInfo *replyWait, Bool *replyReadyRet);
+
+extern void
+_SmsProcessMessage(IceConn iceConn, IcePointer clientData, int opcode,
+		   unsigned long length, Bool swap);
+
+extern void
+_SmcDefaultErrorHandler(SmcConn smcConn, Bool swap, int offendingMinorOpcode,
+			unsigned long offendingSequence, int errorClass,
+			int severity, SmPointer values);
+
+extern void
+_SmsDefaultErrorHandler(SmsConn smsConn, Bool swap, int offendingMinorOpcode,
+			unsigned long offendingSequence, int errorClass,
+			int severity, SmPointer values);
 
 extern int     _SmcOpcode;
 extern int     _SmsOpcode;
diff --git a/src/globals.h b/src/globals.h
deleted file mode 100644
index 40b0ffc..0000000
--- a/src/globals.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* $Xorg: globals.h,v 1.4 2001/02/09 02:03:30 xorgcvs Exp $ */
-
-/*
-
-Copyright 1993, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/SM/globals.h,v 1.4 2001/12/14 19:53:55 dawes Exp $ */
-
-/*
- * Author: Ralph Mor, X Consortium
- */
-
-extern void _SmcDefaultErrorHandler ();
-extern void _SmsDefaultErrorHandler ();
-
-int 	_SmcOpcode = 0;
-int 	_SmsOpcode = 0;
-
-#ifndef __UNIXOS2__
-SmsNewClientProc _SmsNewClientProc;
-SmPointer        _SmsNewClientData;
-#else
-SmsNewClientProc _SmsNewClientProc = 0;
-SmPointer        _SmsNewClientData = 0;
-#endif
-
-SmcErrorHandler _SmcErrorHandler = _SmcDefaultErrorHandler;
-SmsErrorHandler _SmsErrorHandler = _SmsDefaultErrorHandler;
diff --git a/src/sm_client.c b/src/sm_client.c
index de79452..a5c714f 100644
--- a/src/sm_client.c
+++ b/src/sm_client.c
@@ -33,29 +33,32 @@ in this Software without prior written authorization from The Open Group.
 #endif
 #include <X11/SM/SMlib.h>
 #include "SMlibint.h"
-#include "globals.h"
 
-extern IcePoAuthStatus _IcePoMagicCookie1Proc ();
-extern void _SmcProcessMessage ();
-static void set_callbacks();
+int 	_SmcOpcode = 0;
+int 	_SmsOpcode = 0;
+
+#ifndef __UNIXOS2__
+SmsNewClientProc _SmsNewClientProc;
+SmPointer        _SmsNewClientData;
+#else
+SmsNewClientProc _SmsNewClientProc = 0;
+SmPointer        _SmsNewClientData = 0;
+#endif
+
+SmcErrorHandler _SmcErrorHandler = _SmcDefaultErrorHandler;
+SmsErrorHandler _SmsErrorHandler = _SmsDefaultErrorHandler;
+
+
+static void
+set_callbacks(SmcConn smcConn, unsigned long mask, SmcCallbacks *callbacks);
 
 
 SmcConn
-SmcOpenConnection (networkIdsList, context,
-    xsmpMajorRev, xsmpMinorRev, mask, callbacks,
-    previousId, clientIdRet, errorLength, errorStringRet)
-
-char 		*networkIdsList;
-SmPointer	context;
-int		xsmpMajorRev;
-int		xsmpMinorRev;
-unsigned long   mask;
-SmcCallbacks	*callbacks;
-char 		*previousId;
-char 		**clientIdRet;
-int  		errorLength;
-char 		*errorStringRet;
-
+SmcOpenConnection(char *networkIdsList, SmPointer context,
+		  int xsmpMajorRev, int xsmpMinorRev,
+		  unsigned long mask, SmcCallbacks *callbacks,
+		  char *previousId, char **clientIdRet,
+		  int errorLength, char *errorStringRet)
 {
     SmcConn			smcConn;
     IceConn			iceConn;
@@ -283,12 +286,7 @@ char 		*errorStringRet;
 
 
 SmcCloseStatus
-SmcCloseConnection (smcConn, count, reasonMsgs)
-
-SmcConn smcConn;
-int	count;
-char    **reasonMsgs;
-
+SmcCloseConnection(SmcConn smcConn, int count, char **reasonMsgs)
 {
     IceConn			iceConn = smcConn->iceConn;
     smCloseConnectionMsg 	*pMsg;
@@ -356,12 +354,7 @@ char    **reasonMsgs;
 
 
 void
-SmcModifyCallbacks (smcConn, mask, callbacks)
-
-SmcConn    	smcConn;
-unsigned long 	mask;
-SmcCallbacks	*callbacks;
-
+SmcModifyCallbacks(SmcConn smcConn, unsigned long mask, SmcCallbacks *callbacks)
 {
     set_callbacks (smcConn, mask, callbacks);
 }
@@ -369,12 +362,7 @@ SmcCallbacks	*callbacks;
 
 
 void
-SmcSetProperties (smcConn, numProps, props)
-
-SmcConn    	smcConn;
-int      	numProps;
-SmProp       	**props;
-
+SmcSetProperties(SmcConn smcConn, int numProps, SmProp **props)
 {
     IceConn		iceConn = smcConn->iceConn;
     smSetPropertiesMsg	*pMsg;
@@ -400,12 +388,7 @@ SmProp       	**props;
 
 
 void
-SmcDeleteProperties (smcConn, numProps, propNames)
-
-SmcConn smcConn;
-int     numProps;
-char	**propNames;
-
+SmcDeleteProperties(SmcConn smcConn, int numProps, char **propNames)
 {
     IceConn			iceConn = smcConn->iceConn;
     smDeletePropertiesMsg 	*pMsg;
@@ -433,12 +416,8 @@ char	**propNames;
 
 
 Status
-SmcGetProperties (smcConn, propReplyProc, clientData)
-
-SmcConn		 smcConn;
-SmcPropReplyProc propReplyProc;
-SmPointer	 clientData;
-
+SmcGetProperties(SmcConn smcConn, SmcPropReplyProc propReplyProc,
+		 SmPointer clientData)
 {
     IceConn		iceConn = smcConn->iceConn;
     _SmcPropReplyWait 	*wait, *ptr;
@@ -471,13 +450,8 @@ SmPointer	 clientData;
 
 
 Status
-SmcInteractRequest (smcConn, dialogType, interactProc, clientData)
-
-SmcConn 	smcConn;
-int		dialogType;
-SmcInteractProc	interactProc;
-SmPointer	clientData;
-
+SmcInteractRequest(SmcConn smcConn, int dialogType,
+		   SmcInteractProc interactProc, SmPointer clientData)
 {
     IceConn			iceConn = smcConn->iceConn;
     smInteractRequestMsg	*pMsg;
@@ -515,11 +489,7 @@ SmPointer	clientData;
 
 
 void
-SmcInteractDone (smcConn, cancelShutdown)
-
-SmcConn smcConn;
-Bool 	cancelShutdown;
-
+SmcInteractDone(SmcConn smcConn, Bool cancelShutdown)
 {
     IceConn		iceConn = smcConn->iceConn;
     smInteractDoneMsg	*pMsg;
@@ -535,16 +505,8 @@ Bool 	cancelShutdown;
 
 
 void
-SmcRequestSaveYourself (smcConn, saveType, shutdown, interactStyle,
-	fast, global)
-
-SmcConn smcConn;
-int	saveType;
-Bool 	shutdown;
-int	interactStyle;
-Bool	fast;
-Bool	global;
-
+SmcRequestSaveYourself(SmcConn smcConn, int saveType, Bool shutdown,
+		       int interactStyle, Bool fast, Bool global)
 {
     IceConn			iceConn = smcConn->iceConn;
     smSaveYourselfRequestMsg	*pMsg;
@@ -564,12 +526,9 @@ Bool	global;
 
 
 Status
-SmcRequestSaveYourselfPhase2 (smcConn, saveYourselfPhase2Proc, clientData)
-
-SmcConn 			smcConn;
-SmcSaveYourselfPhase2Proc	saveYourselfPhase2Proc;
-SmPointer			clientData;
-
+SmcRequestSaveYourselfPhase2(SmcConn smcConn,
+			     SmcSaveYourselfPhase2Proc saveYourselfPhase2Proc,
+			     SmPointer clientData)
 {
     IceConn		iceConn = smcConn->iceConn;
     _SmcPhase2Wait 	*wait;
@@ -599,11 +558,7 @@ SmPointer			clientData;
 
 
 void
-SmcSaveYourselfDone (smcConn, success)
-
-SmcConn smcConn;
-Bool	success;
-
+SmcSaveYourselfDone(SmcConn smcConn, Bool success)
 {
     IceConn			iceConn = smcConn->iceConn;
     smSaveYourselfDoneMsg	*pMsg;
@@ -619,12 +574,7 @@ Bool	success;
 
 
 static void
-set_callbacks (smcConn, mask, callbacks)
-
-SmcConn    	smcConn;
-unsigned long 	mask;
-SmcCallbacks	*callbacks;
-
+set_callbacks(SmcConn smcConn, unsigned long mask, SmcCallbacks *callbacks)
 {
     if (mask & SmcSaveYourselfProcMask)
     {
diff --git a/src/sm_error.c b/src/sm_error.c
index 615cead..d5c15fc 100644
--- a/src/sm_error.c
+++ b/src/sm_error.c
@@ -45,18 +45,9 @@ in this Software without prior written authorization from The Open Group.
  */
 
 void
-_SmcDefaultErrorHandler (smcConn, swap,
-    offendingMinorOpcode, offendingSequence,
-    errorClass, severity, values)
-
-SmcConn		smcConn;
-Bool		swap;
-int 		offendingMinorOpcode;
-unsigned long 	offendingSequence;
-int 		errorClass;
-int 		severity;
-SmPointer 	values;
-
+_SmcDefaultErrorHandler(SmcConn smcConn, Bool swap, int offendingMinorOpcode,
+			unsigned long offendingSequence, int errorClass,
+			int severity, SmPointer values)
 {
     char *pData = (char *) values;
     const char *str;
@@ -177,18 +168,9 @@ SmPointer 	values;
  */
 
 void
-_SmsDefaultErrorHandler (smsConn, swap,
-    offendingMinorOpcode, offendingSequence,
-    errorClass, severity, values)
-
-SmsConn		smsConn;
-Bool		swap;
-int 		offendingMinorOpcode;
-unsigned long 	offendingSequence;
-int 		errorClass;
-int 		severity;
-SmPointer 	values;
-
+_SmsDefaultErrorHandler(SmsConn smsConn, Bool swap, int offendingMinorOpcode,
+			unsigned long offendingSequence, int errorClass,
+			int severity, SmPointer values)
 {
     char *pData = (char *) values;
     const char *str;
@@ -301,10 +283,7 @@ SmPointer 	values;
  */
  
 SmcErrorHandler
-SmcSetErrorHandler (handler)
-
-SmcErrorHandler handler;
-
+SmcSetErrorHandler(SmcErrorHandler handler)
 {
     SmcErrorHandler oldHandler = _SmcErrorHandler;
 
@@ -325,10 +304,7 @@ SmcErrorHandler handler;
  */
  
 SmsErrorHandler
-SmsSetErrorHandler (handler)
-
-SmsErrorHandler handler;
-
+SmsSetErrorHandler(SmsErrorHandler handler)
 {
     SmsErrorHandler oldHandler = _SmsErrorHandler;
 
diff --git a/src/sm_genid.c b/src/sm_genid.c
index 6f90a48..391a10e 100644
--- a/src/sm_genid.c
+++ b/src/sm_genid.c
@@ -82,8 +82,7 @@ in this Software without prior written authorization from The Open Group.
 
 
 char *
-SmsGenerateClientID (smsConn)
-    SmsConn smsConn;
+SmsGenerateClientID(SmsConn smsConn)
 {
 #if defined(HAVE_LIBUUID)
     char *id;
diff --git a/src/sm_manager.c b/src/sm_manager.c
index 51ac548..6882145 100644
--- a/src/sm_manager.c
+++ b/src/sm_manager.c
@@ -42,9 +42,6 @@ in this Software without prior written authorization from The Open Group.
 #undef shutdown
 #endif
 
-extern IcePaAuthStatus _IcePaMagicCookie1Proc ();
-extern void _SmsProcessMessage ();
-
 
 
 static Status
@@ -117,17 +114,9 @@ _SmsProtocolSetupProc (IceConn    iceConn,
 
 
 Status
-SmsInitialize (vendor, release, newClientProc, managerData,
-    hostBasedAuthProc, errorLength, errorStringRet)
-
-char 		 		*vendor;
-char 		 		*release;
-SmsNewClientProc 		newClientProc;
-SmPointer	 		managerData;
-IceHostBasedAuthProc		hostBasedAuthProc;
-int  		 		errorLength;
-char 		 		*errorStringRet;
-
+SmsInitialize(char *vendor, char *release, SmsNewClientProc newClientProc,
+	      SmPointer managerData, IceHostBasedAuthProc hostBasedAuthProc,
+	      int errorLength, char *errorStringRet)
 {
     const char *auth_names[] = {"MIT-MAGIC-COOKIE-1"};
     IcePaAuthProc auth_procs[] = {_IcePaMagicCookie1Proc};
@@ -186,10 +175,7 @@ char 		 		*errorStringRet;
 
 
 char *
-SmsClientHostName (smsConn)
-
-SmsConn smsConn;
-
+SmsClientHostName(SmsConn smsConn)
 {
     return (IceGetPeerName (smsConn->iceConn));
 }
@@ -197,11 +183,7 @@ SmsConn smsConn;
 
 
 Status
-SmsRegisterClientReply (smsConn, clientId)
-
-SmsConn smsConn;
-char	*clientId;
-
+SmsRegisterClientReply(SmsConn smsConn, char *clientId)
 {
     IceConn			iceConn = smsConn->iceConn;
     int				extra;
@@ -231,14 +213,8 @@ char	*clientId;
 
 
 void
-SmsSaveYourself (smsConn, saveType, shutdown, interactStyle, fast)
-
-SmsConn smsConn;
-int	saveType;
-Bool 	shutdown;
-int	interactStyle;
-Bool	fast;
-
+SmsSaveYourself(SmsConn smsConn, int saveType, Bool shutdown,
+		int interactStyle, Bool fast)
 {
     IceConn		iceConn = smsConn->iceConn;
     smSaveYourselfMsg	*pMsg;
@@ -274,10 +250,7 @@ Bool	fast;
 
 
 void
-SmsSaveYourselfPhase2 (smsConn)
-
-SmsConn smsConn;
-
+SmsSaveYourselfPhase2(SmsConn smsConn)
 {
     IceConn	iceConn = smsConn->iceConn;
 
@@ -288,10 +261,7 @@ SmsConn smsConn;
 
 
 void
-SmsInteract (smsConn)
-
-SmsConn smsConn;
-
+SmsInteract(SmsConn smsConn)
 {
     IceConn	iceConn = smsConn->iceConn;
 
@@ -304,10 +274,7 @@ SmsConn smsConn;
 
 
 void
-SmsDie (smsConn)
-
-SmsConn smsConn;
-
+SmsDie(SmsConn smsConn)
 {
     IceConn	iceConn = smsConn->iceConn;
 
@@ -318,10 +285,7 @@ SmsConn smsConn;
 
 
 void
-SmsSaveComplete (smsConn)
-
-SmsConn smsConn;
-
+SmsSaveComplete(SmsConn smsConn)
 {
     IceConn	iceConn = smsConn->iceConn;
 
@@ -332,10 +296,7 @@ SmsConn smsConn;
 
 
 void
-SmsShutdownCancelled (smsConn)
-
-SmsConn smsConn;
-
+SmsShutdownCancelled(SmsConn smsConn)
 {
     IceConn	iceConn = smsConn->iceConn;
 
@@ -348,12 +309,7 @@ SmsConn smsConn;
 
 
 void
-SmsReturnProperties (smsConn, numProps, props)
-
-SmsConn	smsConn;
-int	numProps;
-SmProp  **props;
-
+SmsReturnProperties(SmsConn smsConn, int numProps, SmProp **props)
 {
     IceConn			iceConn = smsConn->iceConn;
     int 			bytes;
@@ -378,10 +334,7 @@ SmProp  **props;
 
 
 void
-SmsCleanUp (smsConn)
-
-SmsConn smsConn;
-
+SmsCleanUp(SmsConn smsConn)
 {
     IceProtocolShutdown (smsConn->iceConn, _SmsOpcode);
 
diff --git a/src/sm_misc.c b/src/sm_misc.c
index 30c2c2d..a08b198 100644
--- a/src/sm_misc.c
+++ b/src/sm_misc.c
@@ -42,10 +42,7 @@ in this Software without prior written authorization from The Open Group.
  */
 
 void
-SmFreeProperty (prop)
-
-SmProp	*prop;
-
+SmFreeProperty(SmProp *prop)
 {
     if (prop)
     {
@@ -73,11 +70,7 @@ SmProp	*prop;
  */
 
 void
-SmFreeReasons (count, reasonMsgs)
-
-int 	count;
-char 	**reasonMsgs;
-
+SmFreeReasons(int count, char **reasonMsgs)
 {
     if (reasonMsgs)
     {
@@ -97,30 +90,21 @@ char 	**reasonMsgs;
  */
 
 int
-SmcProtocolVersion (smcConn)
-
-SmcConn smcConn;
-
+SmcProtocolVersion(SmcConn smcConn)
 {
     return (smcConn->proto_major_version);
 }
 
 
 int
-SmcProtocolRevision (smcConn)
-
-SmcConn smcConn;
-
+SmcProtocolRevision(SmcConn smcConn)
 {
     return (smcConn->proto_minor_version);
 }
 
 
 char *
-SmcVendor (smcConn)
-
-SmcConn smcConn;
-
+SmcVendor(SmcConn smcConn)
 {
     char *string = (char *) malloc (strlen (smcConn->vendor) + 1);
 
@@ -131,10 +115,7 @@ SmcConn smcConn;
 
 
 char *
-SmcRelease (smcConn)
-
-SmcConn smcConn;
-
+SmcRelease(SmcConn smcConn)
 {
     char *string = (char *) malloc (strlen (smcConn->release) + 1);
 
@@ -145,10 +126,7 @@ SmcConn smcConn;
 
 
 char *
-SmcClientID (smcConn)
-
-SmcConn smcConn;
-
+SmcClientID(SmcConn smcConn)
 {
     char *clientId = (char *) malloc (strlen (smcConn->client_id) + 1);
 
@@ -159,10 +137,7 @@ SmcConn smcConn;
 
 
 IceConn
-SmcGetIceConnection (smcConn)
-
-SmcConn smcConn;
-
+SmcGetIceConnection(SmcConn smcConn)
 {
     return (smcConn->iceConn);
 }
@@ -174,30 +149,21 @@ SmcConn smcConn;
  */
 
 int
-SmsProtocolVersion (smsConn)
-
-SmsConn smsConn;
-
+SmsProtocolVersion(SmsConn smsConn)
 {
     return (smsConn->proto_major_version);
 }
 
 
 int
-SmsProtocolRevision (smsConn)
-
-SmsConn smsConn;
-
+SmsProtocolRevision(SmsConn smsConn)
 {
     return (smsConn->proto_minor_version);
 }
 
 
 char *
-SmsClientID (smsConn)
-
-SmsConn smsConn;
-
+SmsClientID(SmsConn smsConn)
 {
     char *clientId = (char *) malloc (strlen (smsConn->client_id) + 1);
 
@@ -208,10 +174,7 @@ SmsConn smsConn;
 
 
 IceConn
-SmsGetIceConnection (smsConn)
-
-SmsConn smsConn;
-
+SmsGetIceConnection(SmsConn smsConn)
 {
     return (smsConn->iceConn);
 }
diff --git a/src/sm_process.c b/src/sm_process.c
index ab3ec0b..1c81020 100644
--- a/src/sm_process.c
+++ b/src/sm_process.c
@@ -68,17 +68,9 @@ in this Software without prior written authorization from The Open Group.
 
 
 void
-_SmcProcessMessage (iceConn, clientData, opcode,
-    length, swap, replyWait, replyReadyRet)
-
-IceConn		 iceConn;
-IcePointer	 clientData;
-int		 opcode;
-unsigned long	 length;
-Bool		 swap;
-IceReplyWaitInfo *replyWait;
-Bool		 *replyReadyRet;
-
+_SmcProcessMessage(IceConn iceConn, IcePointer clientData, int opcode,
+		   unsigned long length, Bool swap,
+		   IceReplyWaitInfo *replyWait, Bool *replyReadyRet)
 {
     SmcConn	smcConn = (SmcConn) clientData;
 
@@ -423,14 +415,8 @@ Bool		 *replyReadyRet;
 
 
 void
-_SmsProcessMessage (iceConn, clientData, opcode, length, swap)
-
-IceConn		 iceConn;
-IcePointer       clientData;
-int		 opcode;
-unsigned long	 length;
-Bool		 swap;
-
+_SmsProcessMessage(IceConn iceConn, IcePointer clientData, int opcode,
+		   unsigned long length, Bool swap)
 {
     SmsConn	smsConn = (SmsConn) clientData;