Ansification and compile warning fixes.

  This also uses XORG_CHANGELOG and XORG_CWARNFLAGS, corrects
make distcheck and most gcc 4.3 and sparse warnings.

4 files changed, 42 insertions, 77 deletions

diff --git a/.gitignore b/.gitignore
index abe65f9..865fa25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,7 @@ stamp-h1
 xconfig.h
 xconfig.h.in
 *~
+*.o
+proxymngr-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index e4367ec..4d5ec45 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,8 +23,8 @@ bin_PROGRAMS = proxymngr
 
 CONFIG_DIR = $(libdir)/X11/proxymngr
 
-proxymngr_CFLAGS =					\
-	$(PROXYMNGR_CFLAGS)					\
+AM_CFLAGS =						\
+	$(PROXYMNGR_CFLAGS)				\
 	-DXVENDORNAME=\"The\ X\.Org\ Foundation\"	\
 	-DXORG_RELEASE=\"Release\ $(VERSION)\"		\
 	-DCONFIG_FILE=\"$(CONFIG_DIR)/proxymngr/pmconfig\"
@@ -88,6 +88,6 @@ MAINTAINERCLEANFILES = ChangeLog
 .PHONY: ChangeLog
 
 ChangeLog:
-	(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+	$(CHANGELOG_CMD)
 
 dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index 0cd977c..22067ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,6 +26,10 @@ AC_INIT(proxymngr,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=x
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 
+# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
+
 # The program itself has a header called config.h so 
 # we have to choose a different name
 AM_CONFIG_HEADER(xconfig.h)
@@ -34,6 +38,8 @@ AC_PROG_CPP
 AC_PROG_CC
 AC_PROG_INSTALL
 
+XORG_CWARNFLAGS
+
 AC_PATH_PROG(LBXPROXY, lbxproxy)
 if [[ -z $LBXPROXY ]] ; then
    AC_MSG_ERROR([lbxproxy is needed])
@@ -46,17 +52,19 @@ fi
 
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(PROXYMNGR, ice xt x11 xproxymngproto)
+PROXYMNGR_CFLAGS="$CWARNFLAGS $PROXYMNGR_CFLAGS"
 AC_SUBST(PROXYMNGR_CFLAGS)
 AC_SUBST(PROXYMNGR_LIBS)
 
 AC_CHECK_FUNC(strcasecmp, [], 
 	AC_DEFINE([NEED_STRCASECMP],1,
-		  [Define to 1 if you do not have the `strcasecmp' function.]))
+		  [Define to 1 if you do not have the "strcasecmp" function.]))
 
 # Needed to check for IPv6 support and set flags appropriately
 XTRANS_TCP_FLAGS
 
 XORG_MANPAGE_SECTIONS
 XORG_RELEASE_VERSION
+XORG_CHANGELOG
 
 AC_OUTPUT([Makefile])
diff --git a/main.c b/main.c
index 34040be..fd891f7 100644
--- a/main.c
+++ b/main.c
@@ -56,10 +56,10 @@ static void SendGetProxyAddr ( PMconn *pmConn, char *serviceName,
 static int PMAcceptorOpcode;
 static int PMOriginatorOpcode;
 
-int PMversionCount = 1;
-IcePaVersionRec	PMReplyVersions[] = {{PM_MAJOR_VERSION, PM_MINOR_VERSION,
+static int PMversionCount = 1;
+static IcePaVersionRec	PMReplyVersions[] = {{PM_MAJOR_VERSION, PM_MINOR_VERSION,
 				      PMReplyProcessMessages}};
-IcePoVersionRec	PMSetupVersions[] = {{PM_MAJOR_VERSION, PM_MINOR_VERSION,
+static IcePoVersionRec	PMSetupVersions[] = {{PM_MAJOR_VERSION, PM_MINOR_VERSION,
 				      PMSetupProcessMessages}};
 
 char *PM_VENDOR_STRING = XVENDORNAME;
@@ -67,22 +67,21 @@ char *PM_VENDOR_RELEASE = XORG_RELEASE;
 
 int verbose = 0;
 
-XtAppContext	appContext;
+static XtAppContext	appContext;
 
 #define PM_PORT "6500"
 
-char *configFile = NULL;
+static char *configFile = NULL;
 
 void
-Usage ()
+Usage(void)
 {
     fprintf (stderr, "Usage: proxymngr [-config file] [-verbose]\n");
     exit (1);
 }
 
 void 
-SetCloseOnExec (fd)
-    int	fd;
+SetCloseOnExec(int fd)
 {
 #ifdef F_SETFD
 #ifdef FD_CLOEXEC
@@ -216,12 +215,7 @@ main (int argc, char *argv[])
 
 /* ARGSUSED */
 void
-NewConnectionXtProc (client_data, source, id)
-
-XtPointer	client_data;
-int 		*source;
-XtInputId	*id;
-
+NewConnectionXtProc(XtPointer client_data, int *source, XtInputId *id)
 {
     IceConn 	ice_conn;
     char	*connstr;
@@ -271,17 +265,9 @@ XtInputId	*id;
  * See ConnectToProxy() if you change any of the pmConn structure
  */
 static Status
-PMprotocolSetupProc (iceConn,
-    majorVersion, minorVersion, vendor, release,
-    clientDataRet, failureReasonRet)
-
-IceConn    iceConn;
-int	   majorVersion;
-int	   minorVersion;
-char  	   *vendor;
-char 	   *release;
-IcePointer *clientDataRet;
-char	   **failureReasonRet;
+PMprotocolSetupProc(IceConn iceConn, int majorVersion, int minorVersion,
+		    char *vendor, char *release, IcePointer *clientDataRet,
+		    char **failureReasonRet)
 
 {
     /*
@@ -405,13 +391,8 @@ SendGetProxyAddrReply (
 
 
 void
-PMReplyProcessMessages (iceConn, clientData, opcode, length, swap)
-
-IceConn		 iceConn;
-IcePointer       clientData;
-int		 opcode;
-unsigned long	 length;
-Bool		 swap;
+PMReplyProcessMessages(IceConn iceConn, IcePointer clientData, int opcode,
+		       unsigned long length, Bool swap)
 
 {
     PMconn *pmConn = (PMconn *) clientData;
@@ -907,16 +888,9 @@ Bool		 swap;
 }
 
 void
-PMSetupProcessMessages (iceConn, clientData, opcode, length, swap,
-			replyWait, replyReadyRet)
-
-IceConn		 iceConn;
-IcePointer       clientData;
-int		 opcode;
-unsigned long	 length;
-Bool		 swap;
-IceReplyWaitInfo *replyWait;
-Bool		 *replyReadyRet;
+PMSetupProcessMessages(IceConn iceConn, IcePointer clientData, int opcode,
+		       unsigned long length, Bool swap,
+		       IceReplyWaitInfo *replyWait, Bool *replyReadyRet)
 
 {
     assert (replyWait == NULL);
@@ -926,12 +900,9 @@ Bool		 *replyReadyRet;
 
 
 void
-ForwardRequest( requestor, serviceName, serverAddress, hostAddress,
-		startOptions, authLen, authName, authData )
-    PMconn *requestor;
-    char *serviceName, *serverAddress, *hostAddress, *startOptions;
-    int authLen;
-    char *authName, *authData;
+ForwardRequest(PMconn *requestor, char *serviceName, char *serverAddress,
+	       char *hostAddress, char *startOptions, int authLen,
+	       char *authName, char *authData)
 {
     running_proxy_list	*proxyList;
     running_proxy	*runningProxy = NULL;
@@ -1025,12 +996,7 @@ ForwardRequest( requestor, serviceName, serverAddress, hostAddress,
 
 /* ARGSUSED */
 void
-_XtProcessIceMsgProc (client_data, source, id)
-
-XtPointer	client_data;
-int 		*source;
-XtInputId	*id;
-
+_XtProcessIceMsgProc(XtPointer client_data, int *source, XtInputId *id)
 {
     IceConn			ice_conn = (IceConn) client_data;
     IceProcessMessagesStatus	status;
@@ -1049,12 +1015,8 @@ XtInputId	*id;
 
 
 void
-_XtIceWatchProc (ice_conn, client_data, opening, watch_data)
-
-IceConn 	ice_conn;
-IcePointer	client_data;
-Bool		opening;
-IcePointer	*watch_data;
+_XtIceWatchProc(IceConn ice_conn, IcePointer client_data,
+		Bool opening, IcePointer *watch_data)
 
 {
     if (opening)
@@ -1076,9 +1038,7 @@ IcePointer	*watch_data;
 
 
 Status
-InitWatchProcs (appContext)
-
-XtAppContext appContext;
+InitWatchProcs(XtAppContext appContext)
 
 {
     return (IceAddConnectionWatch (_XtIceWatchProc, (IcePointer) appContext));
@@ -1106,18 +1066,14 @@ XtAppContext appContext;
 static IceIOErrorHandler prev_handler;
 
 void
-MyIoErrorHandler (ice_conn)
-
-IceConn ice_conn;
-
+MyIoErrorHandler(IceConn ice_conn)
 {
     if (prev_handler)
 	(*prev_handler) (ice_conn);
 }    
 
 void
-InstallIOErrorHandler ()
-
+InstallIOErrorHandler(void)
 {
     IceIOErrorHandler default_handler;
 
@@ -1134,10 +1090,7 @@ InstallIOErrorHandler ()
  */
 
 Bool
-HostBasedAuthProc (hostname)
-
-char *hostname;
-
+HostBasedAuthProc(char *hostname)
 {
     return (1);
 }