external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-02-15 04:32:24 +00:00
Code Issues Releases Wiki Activity

dtlogin/xdmcp: fixup many warnings and a possible declaration bug

Browse source
This commit is contained in:
Jon Trulson 2014-12-27 13:01:26 -07:00
parent a71cde075e
commit 61e925f3c5
3 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cde/programs/dtlogin/access.c
View file

@ -709,7 +709,7 @@ ForEachMatchingIndirectHost(
#else #else
CARD16 connectionType, CARD16 connectionType,
#endif /* NeedWidePrototypes */ #endif /* NeedWidePrototypes */
int (*function)(), int (*function)(CARD16, struct _ARRAY8 *, char *),
char *closure ) char *closure )
{ {
int haveLocalhost = 0; int haveLocalhost = 0;

2
cde/programs/dtlogin/dm.h
View file

@ -556,7 +556,7 @@ extern int ForEachMatchingIndirectHost(
#else #else
CARD16 connectionType, CARD16 connectionType,
#endif /* NeedWidePrototypes */ #endif /* NeedWidePrototypes */
int (*function)(), int (*function)(CARD16, struct _ARRAY8 *, char *),
char *closure) ; char *closure) ;
extern int ScanAccessDatabase( void ) ; extern int ScanAccessDatabase( void ) ;
extern int UseChooser( extern int UseChooser(

34
cde/programs/dtlogin/xdmcp.c
View file

@ -118,7 +118,7 @@ extern Time_t time ();
extern ARRAY8Ptr ChooseAuthentication (); extern ARRAY8Ptr ChooseAuthentication ();
extern int SelectConnectionTypeIndex (); extern int SelectConnectionTypeIndex ();
void query_respond (from, fromlen, length); void query_respond (struct sockaddr *from, int fromlen, int length);
void broadcast_respond (struct sockaddr *from, int fromlen, int length); void broadcast_respond (struct sockaddr *from, int fromlen, int length);
void forward_respond (struct sockaddr *from, int fromlen, int length); void forward_respond (struct sockaddr *from, int fromlen, int length);
void request_respond (struct sockaddr *from, int fromlen, int length); void request_respond (struct sockaddr *from, int fromlen, int length);
@ -199,7 +199,7 @@ sendForward (CARD16 connectionType, ARRAY8Ptr address, char *closure)
default: default:
return 0; return 0;
} }
XdmcpFlush (xdmcpFd, &buffer, addr, addrlen); XdmcpFlush (xdmcpFd, &buffer, (XdmcpNetaddr)addr, addrlen);
return 0; return 0;
} }
@ -320,7 +320,7 @@ ProcessRequestSocket (void)
Debug ("ProcessRequestSocket\n"); Debug ("ProcessRequestSocket\n");
bzero ((char *) &addr, sizeof (addr)); bzero ((char *) &addr, sizeof (addr));
if (!XdmcpFill (xdmcpFd, &buffer, &addr, &addrlen)) { if (!XdmcpFill (xdmcpFd, &buffer, (XdmcpNetaddr)&addr, &addrlen)) {
Debug ("XdmcpFill failed\n"); Debug ("XdmcpFill failed\n");
return; return;
} }
@ -337,25 +337,25 @@ ProcessRequestSocket (void)
switch (header.opcode) switch (header.opcode)
{ {
case BROADCAST_QUERY: case BROADCAST_QUERY:
broadcast_respond (&addr, addrlen, header.length); broadcast_respond ((struct sockaddr *)&addr, addrlen, header.length);
break; break;
case QUERY: case QUERY:
query_respond (&addr, addrlen, header.length); query_respond ((struct sockaddr *)&addr, addrlen, header.length);
break; break;
case INDIRECT_QUERY: case INDIRECT_QUERY:
indirect_respond (&addr, addrlen, header.length); indirect_respond ((struct sockaddr *)&addr, addrlen, header.length);
break; break;
case FORWARD_QUERY: case FORWARD_QUERY:
forward_respond (&addr, addrlen, header.length); forward_respond ((struct sockaddr *)&addr, addrlen, header.length);
break; break;
case REQUEST: case REQUEST:
request_respond (&addr, addrlen, header.length); request_respond ((struct sockaddr *)&addr, addrlen, header.length);
break; break;
case MANAGE: case MANAGE:
manage (&addr, addrlen, header.length); manage ((struct sockaddr *)&addr, addrlen, header.length);
break; break;
case KEEPALIVE: case KEEPALIVE:
send_alive (&addr, addrlen, header.length); send_alive ((struct sockaddr *)&addr, addrlen, header.length);
break; break;
} }
} }
@ -664,7 +664,7 @@ send_willing (struct sockaddr *from, int fromlen, ARRAY8Ptr authenticationName,
XdmcpWriteARRAY8 (&buffer, authenticationName); XdmcpWriteARRAY8 (&buffer, authenticationName);
XdmcpWriteARRAY8 (&buffer, &Hostname); XdmcpWriteARRAY8 (&buffer, &Hostname);
XdmcpWriteARRAY8 (&buffer, status); XdmcpWriteARRAY8 (&buffer, status);
XdmcpFlush (xdmcpFd, &buffer, from, fromlen); XdmcpFlush (xdmcpFd, &buffer, (XdmcpNetaddr)from, fromlen);
} }
void void
@ -684,7 +684,7 @@ send_unwilling (struct sockaddr *from, int fromlen, ARRAY8Ptr authenticationName
XdmcpWriteHeader (&buffer, &header); XdmcpWriteHeader (&buffer, &header);
XdmcpWriteARRAY8 (&buffer, &Hostname); XdmcpWriteARRAY8 (&buffer, &Hostname);
XdmcpWriteARRAY8 (&buffer, status); XdmcpWriteARRAY8 (&buffer, status);
XdmcpFlush (xdmcpFd, &buffer, from, fromlen); XdmcpFlush (xdmcpFd, &buffer, (XdmcpNetaddr)from, fromlen);
} }
static unsigned long globalSessionID; static unsigned long globalSessionID;
@ -872,7 +872,7 @@ send_accept (struct sockaddr *to, int tolen, CARD32 sessionID, ARRAY8Ptr authent
XdmcpWriteARRAY8 (&buffer, authenticationData); XdmcpWriteARRAY8 (&buffer, authenticationData);
XdmcpWriteARRAY8 (&buffer, authorizationName); XdmcpWriteARRAY8 (&buffer, authorizationName);
XdmcpWriteARRAY8 (&buffer, authorizationData); XdmcpWriteARRAY8 (&buffer, authorizationData);
XdmcpFlush (xdmcpFd, &buffer, to, tolen); XdmcpFlush (xdmcpFd, &buffer, (XdmcpNetaddr)to, tolen);
} }
void void
@ -891,7 +891,7 @@ send_decline (struct sockaddr *to, int tolen, ARRAY8Ptr authenticationName, ARRA
XdmcpWriteARRAY8 (&buffer, status); XdmcpWriteARRAY8 (&buffer, status);
XdmcpWriteARRAY8 (&buffer, authenticationName); XdmcpWriteARRAY8 (&buffer, authenticationName);
XdmcpWriteARRAY8 (&buffer, authenticationData); XdmcpWriteARRAY8 (&buffer, authenticationData);
XdmcpFlush (xdmcpFd, &buffer, to, tolen); XdmcpFlush (xdmcpFd, &buffer, (XdmcpNetaddr)to, tolen);
} }
void void
@ -1071,7 +1071,7 @@ send_failed (struct sockaddr *from, int fromlen, char *name, CARD32 sessionID, c
XdmcpWriteHeader (&buffer, &header); XdmcpWriteHeader (&buffer, &header);
XdmcpWriteCARD32 (&buffer, sessionID); XdmcpWriteCARD32 (&buffer, sessionID);
XdmcpWriteARRAY8 (&buffer, &status); XdmcpWriteARRAY8 (&buffer, &status);
XdmcpFlush (xdmcpFd, &buffer, from, fromlen); XdmcpFlush (xdmcpFd, &buffer, (XdmcpNetaddr)from, fromlen);
} }
void void
@ -1085,7 +1085,7 @@ send_refuse (struct sockaddr *from, int fromlen, CARD32 sessionID)
header.length = 4; header.length = 4;
XdmcpWriteHeader (&buffer, &header); XdmcpWriteHeader (&buffer, &header);
XdmcpWriteCARD32 (&buffer, sessionID); XdmcpWriteCARD32 (&buffer, sessionID);
XdmcpFlush (xdmcpFd, &buffer, from, fromlen); XdmcpFlush (xdmcpFd, &buffer, (XdmcpNetaddr)from, fromlen);
} }
void void
@ -1123,7 +1123,7 @@ send_alive (struct sockaddr *from, int fromlen, int length)
XdmcpWriteHeader (&buffer, &header); XdmcpWriteHeader (&buffer, &header);
XdmcpWriteCARD8 (&buffer, sendRunning); XdmcpWriteCARD8 (&buffer, sendRunning);
XdmcpWriteCARD32 (&buffer, sendSessionID); XdmcpWriteCARD32 (&buffer, sendSessionID);
XdmcpFlush (xdmcpFd, &buffer, from, fromlen); XdmcpFlush (xdmcpFd, &buffer, (XdmcpNetaddr)from, fromlen);
} }
} }
} }