dtlogin: Change to ANSI function definitions

diff --git a/cde/programs/dtlogin/auth.c b/cde/programs/dtlogin/auth.c
index 21974abde067f148dfc41ac215ba9e125cf79369..a1c88dd156e5836ddbfbbc8588619f9cd239611b 100644 (file)
--- a/cde/programs/dtlogin/auth.c
+++ b/cde/programs/dtlogin/auth.c
@@ -697,9 +697,7 @@ checkEntry (Xauth *auth)
 static int  doWrite;
 
 static
-writeAuth (file, auth)
-    FILE       *file;
-    Xauth      *auth;
+writeAuth (FILE *file, Xauth *auth)
 {
     if (debugLevel >= 15) {    /* normally too verbose */
         Debug ("writeAuth: doWrite = %d\n", doWrite);
@@ -864,10 +862,7 @@ DefineSelf (int fd, FILE *file, Xauth *auth)
  * for this fd and add them to the selfhosts list.
  */
 static void
-DefineSelf (fd, file, auth)
-    int fd;
-    FILE       *file;
-    Xauth      *auth;
+DefineSelf (int fd, FILE *file, Xauth *auth)
 {
     char               buf[2048];
     struct ifconf      ifc;
@@ -940,8 +935,7 @@ DefineSelf (fd, file, auth)
  * for this fd and add them to the selfhosts list.
  */
 static void
-DefineSelf (fd, file, auth)
-    int fd;
+DefineSelf (int fd, int file, int auth)
 {
     register int n;
     int        len;
@@ -984,9 +978,7 @@ DefineSelf (fd, file, auth)
 
 
 static void
-setAuthNumber (auth, name)
-    Xauth   *auth;
-    char    *name;
+setAuthNumber (Xauth *auth, char *name)
 {
     char       *colon;
     char       *dot, *number;

diff --git a/cde/programs/dtlogin/dm.c b/cde/programs/dtlogin/dm.c
index b34bdb7406b274dab02fc2eae19174ade0827a5a..166695ee56e134fdb136080d4ebae4ef23d57e1b 100644 (file)
--- a/cde/programs/dtlogin/dm.c
+++ b/cde/programs/dtlogin/dm.c
@@ -1287,7 +1287,8 @@ CloseOnFork( void )
 }
 #endif
 
-CloseOnFork ()
+int
+CloseOnFork (void)
 {
     int        fd;
 
@@ -1296,6 +1297,8 @@ CloseOnFork ()
            close (fd);
     FD_ZERO (&CloseMask);
     max = 0;
+    
+    return 0;
 }
 
 static int  pidFd;

diff --git a/cde/programs/dtlogin/mitauth.c b/cde/programs/dtlogin/mitauth.c
index 5e15625fb33bcfe38ca389e3a6b07fb9602df944..e16a9fd8233f4ba728bd5963e36dd7e104b98ef1 100644 (file)
--- a/cde/programs/dtlogin/mitauth.c
+++ b/cde/programs/dtlogin/mitauth.c
@@ -92,13 +92,11 @@ from the X Consortium.
 static char    auth_name[256];
 static int     auth_name_len;
 
-int MitInitAuth (name_len, name)
 #if NeedWidePrototypes
-    unsigned int name_len;
+int MitInitAuth (unsigned int name_len, char *name)
 #else
-    unsigned short name_len;
+int MitInitAuth (unsigned short name_len, char *name)
 #endif /* NeedWidePrototypes */
-    char *name;
 {
     if (name_len > 256)
        name_len = 256;
@@ -107,14 +105,13 @@ int MitInitAuth (name_len, name)
     return(0);
 }
 
-Xauth *
-MitGetAuth (namelen, name)
 #if NeedWidePrototypes
-    unsigned int namelen;
+Xauth *
+MitGetAuth (unsigned int namelen, char *name)
 #else
-    unsigned short namelen;
+Xauth *
+MitGetAuth (unsigned short namelen, char *name)
 #endif /* NeedWidePrototypes */
-    char *name;
 {
     Xauth   *new;
     new = (Xauth *) malloc (sizeof (Xauth));

diff --git a/cde/programs/dtlogin/netaddr.c b/cde/programs/dtlogin/netaddr.c
index 85f853284ba2291039c553930d96f3ccecad2829..aa63541220183faf202acd3a601fbc34846fda70 100644 (file)
--- a/cde/programs/dtlogin/netaddr.c
+++ b/cde/programs/dtlogin/netaddr.c
@@ -96,8 +96,7 @@ from the X Consortium.
 /* given an XdmcpNetaddr, returns the socket protocol family used,
    e.g., AF_INET */
 
-int NetaddrFamily(netaddrp)
-    XdmcpNetaddr netaddrp;
+int NetaddrFamily(XdmcpNetaddr netaddrp)
 {
 #ifdef STREAMSCONN
     short family = *(short *)netaddrp;
@@ -112,9 +111,7 @@ int NetaddrFamily(netaddrp)
    and sets *lenp to the length of the address
    or 0 if not using TCP or UDP. */
 
-char * NetaddrPort(netaddrp, lenp)
-    XdmcpNetaddr netaddrp;
-    int *lenp;                 /* return */
+char * NetaddrPort(XdmcpNetaddr netaddrp, int *lenp)
 {
 #ifdef STREAMSCONN
     *lenp = 2;
@@ -136,9 +133,7 @@ char * NetaddrPort(netaddrp, lenp)
 /* given an XdmcpNetaddr, returns a pointer to the network address
    and sets *lenp to the length of the address */
 
-char * NetaddrAddress(netaddrp, lenp)
-    XdmcpNetaddr netaddrp;
-    int *lenp;                 /* return */
+char * NetaddrAddress(XdmcpNetaddr netaddrp, int *lenp)
 {
 #ifdef STREAMSCONN
     *lenp = 4;
@@ -175,10 +170,7 @@ char * NetaddrAddress(netaddrp, lenp)
    sets *len to the number of bytes in addr.
    Returns the X protocol family used, e.g., FamilyInternet */
 
-int ConvertAddr (saddr, len, addr)
-    XdmcpNetaddr saddr;
-    int *len;                  /* return */
-    char **addr;               /* return */
+int ConvertAddr (XdmcpNetaddr saddr, int *len, char **addr)
 {
     int retval;
 
@@ -229,9 +221,7 @@ int ConvertAddr (saddr, len, addr)
     return retval;
 }
 
-addressEqual (a1, len1, a2, len2)
-    XdmcpNetaddr a1, a2;
-    int                 len1, len2;
+addressEqual (XdmcpNetaddr a1, int len1, XdmcpNetaddr a2, int len2)
 {
     int partlen1, partlen2;
     char *part1, *part2;
@@ -261,9 +251,7 @@ addressEqual (a1, len1, a2, len2)
 
 #ifdef DEBUG
 /*ARGSUSED*/
-PrintSockAddr (a, len)         /* Debugging routine */
-    struct sockaddr *a;
-    int                    len;
+PrintSockAddr (struct sockaddr *a, int len)
 {
     unsigned char    *t, *p;
 

diff --git a/cde/programs/dtlogin/session.c b/cde/programs/dtlogin/session.c
index 090e1394ca594566ab2d745e75996430edad9250..c5b587fe2e15de995db7ab3d52946dbaf7436220 100644 (file)
--- a/cde/programs/dtlogin/session.c
+++ b/cde/programs/dtlogin/session.c
@@ -257,12 +257,12 @@ catchAlrm( int arg )
     longjmp (pingTime, 1);
 }
 
-static int
-FileNameCompare (a, b)
 #if defined(__STDC__)
-       const void *a, *b;
+static int
+FileNameCompare (const char *a, const char *b)
 #else
-       char *a, *b;
+static int
+FileNameCompare (char *a, char *b)
 #endif
 {
     return strcoll (*(char **)a, *(char **)b);

diff --git a/cde/programs/dtlogin/socket.c b/cde/programs/dtlogin/socket.c
index 37e32be3059d5f839c1d3378c984d03795884644..5f3044ba51d6b8ceebce6b3bdc715f9279974b86 100644 (file)
--- a/cde/programs/dtlogin/socket.c
+++ b/cde/programs/dtlogin/socket.c
@@ -105,7 +105,7 @@ extern int  chooserFd;
 extern FD_TYPE WellKnownSocketsMask;
 extern int     WellKnownSocketsMax;
 
-CreateWellKnownSockets ()
+CreateWellKnownSockets (void)
 {
     struct sockaddr_in sock_addr;
     char               *name, *localHostname();
@@ -154,9 +154,7 @@ CreateWellKnownSockets ()
     FD_SET (chooserFd, &WellKnownSocketsMask);
 }
 
-GetChooserAddr (addr, lenp)
-    char       *addr;
-    int                *lenp;
+GetChooserAddr (char *addr, int *lenp)
 {
     struct sockaddr_in in_addr;
     int                        len;

diff --git a/cde/programs/dtlogin/util.c b/cde/programs/dtlogin/util.c
index e78273ffb2049acb441b9cd0867d4748b4518275..ee253386a873c82165b0951ff917deedf1be5edc 100644 (file)
--- a/cde/programs/dtlogin/util.c
+++ b/cde/programs/dtlogin/util.c
@@ -980,7 +980,7 @@ static char localHostbuf[256];
 static int  gotLocalHostname;
 
 char *
-localHostname ()
+localHostname (void)
 {
     if (!gotLocalHostname)
     {

diff --git a/cde/programs/dtlogin/vgcallback.c b/cde/programs/dtlogin/vgcallback.c
index f9412be407368dd891d869eb150e297dc111bf49..69461c18a602534031b2fd8618f5a4c9b48a3b3a 100644 (file)
--- a/cde/programs/dtlogin/vgcallback.c
+++ b/cde/programs/dtlogin/vgcallback.c
@@ -1676,7 +1676,7 @@ SetDefaultDt(Widget w)
  *  the logo to display in logo_pixmap 
  **************************************************************************/
 void
-SetDtLabelAndIcon()
+SetDtLabelAndIcon(void)
 {
   static XmString      blanks = NULL;
   int                  i;

diff --git a/cde/programs/dtlogin/vgutil.c b/cde/programs/dtlogin/vgutil.c
index 602ebb8015655749636e1cc6f5b0f8a4d53d951c..6f2256f2854b393024116d5d3832f9151475f5ca 100644 (file)
--- a/cde/programs/dtlogin/vgutil.c
+++ b/cde/programs/dtlogin/vgutil.c
@@ -732,7 +732,7 @@ LogError( unsigned char *fmt, ...)
  ***************************************************************************/
 
 void
-CloseCatalog()
+CloseCatalog(void)
 {
     catclose(nl_fd);
 }
@@ -744,7 +744,7 @@ CloseCatalog()
  ***************************************************************************/
 
 void
-OpenCatalog()
+OpenCatalog(void)
 {
     static int initialized = 0;
     char *nlspath, *newnlspath;

diff --git a/cde/programs/dtlogin/xdmauth.c b/cde/programs/dtlogin/xdmauth.c
index 720d4b567055b8822f5132cedac59f5403b45cee..375d53b381cc1349c8eb7110027ea85a706a2db7 100644 (file)
--- a/cde/programs/dtlogin/xdmauth.c
+++ b/cde/programs/dtlogin/xdmauth.c
@@ -122,14 +122,13 @@ XdmPrintArray8Hex(const char *s, ARRAY8Ptr a)
 }
 #endif
 
-void
-XdmInitAuth (name_len, name)
 #if NeedWidePrototypes
-    unsigned int name_len;
+void
+XdmInitAuth (unsigned int name_len, char *name)
 #else
-    unsigned short name_len;
+void
+XdmInitAuth (unsigned short name_len, char *name)
 #endif /* NeedWidePrototypes */
-    char           *name;
 {
     if (name_len > 256)
        name_len = 256;
@@ -147,10 +146,7 @@ XdmInitAuth (name_len, name)
  */
 
 Xauth *
-XdmGetAuthHelper (namelen, name, includeRho)
-    unsigned short  namelen;
-    char           *name;
-    int            includeRho;
+XdmGetAuthHelper (unsigned short namelen, char *name, int includeRho)
 {
     Xauth   *new;
     new = (Xauth *) malloc (sizeof (Xauth));
@@ -192,28 +188,24 @@ XdmGetAuthHelper (namelen, name, includeRho)
     return new;
 }
 
-Xauth *
-XdmGetAuth (namelen, name)
 #if NeedWidePrototypes
-    unsigned int namelen;
+Xauth *
+XdmGetAuth (unsigned int namelen, char *name)
 #else
-    unsigned short namelen;
+Xauth *
+XdmGetAuth (unsigned short namelen, char *name)
 #endif /* NeedWidePrototypes */
-    char           *name;
 {
     return XdmGetAuthHelper (namelen, name, TRUE);
 }
 
 #ifdef XDMCP
 
-void XdmGetXdmcpAuth (pdpy,authorizationNameLen, authorizationName)
-    struct protoDisplay        *pdpy;
 #if NeedWidePrototypes
-    unsigned int authorizationNameLen;
+void XdmGetXdmcpAuth (struct protoDisplay *pdpy, unsigned int authorizationNameLen, char *authorizationName)
 #else
-    unsigned short authorizationNameLen;
+void XdmGetXdmcpAuth (struct protoDisplay *pdpy, unsigned short authorizationNameLen, char *authorizationName)
 #endif /* NeedWidePrototypes */
-    char               *authorizationName;
 {
     Xauth   *fileauth, *xdmcpauth;
 
@@ -264,8 +256,7 @@ void XdmGetXdmcpAuth (pdpy,authorizationNameLen, authorizationName)
                 'A' <= c && c <= 'F' ? c - 'A' + 10 : -1)
 
 static
-HexToBinary (key)
-    char    *key;
+HexToBinary (char *key)
 {
     char    *out, *in;
     int            top, bottom;
@@ -294,9 +285,7 @@ HexToBinary (key)
  * routine accepts either plain ascii strings for keys, or hex-encoded numbers
  */
 
-XdmGetKey (pdpy, displayID)
-    struct protoDisplay        *pdpy;
-    ARRAY8Ptr          displayID;
+XdmGetKey (struct protoDisplay *pdpy, ARRAY8Ptr displayID)
 {
     FILE    *keys;
     char    line[1024], id[1024], key[1024];
@@ -335,9 +324,8 @@ XdmGetKey (pdpy, displayID)
 }
 
 /*ARGSUSED*/
-XdmCheckAuthentication (pdpy, displayID, authenticationName, authenticationData)
-    struct protoDisplay        *pdpy;
-    ARRAY8Ptr          displayID, authenticationName, authenticationData;
+XdmCheckAuthentication (struct protoDisplay *pdpy, ARRAY8Ptr displayID,
+                        ARRAY8Ptr authenticationName, ARRAY8Ptr authenticationData)
 {
     XdmAuthKeyPtr   incoming;