aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/os
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/os')
-rw-r--r--xorg-server/os/WaitFor.c12
-rwxr-xr-x[-rw-r--r--]xorg-server/os/access.c74
-rw-r--r--xorg-server/os/auth.c4
-rw-r--r--xorg-server/os/connection.c6
-rw-r--r--xorg-server/os/io.c6
-rw-r--r--xorg-server/os/log.c2
-rw-r--r--xorg-server/os/rpcauth.c4
-rw-r--r--xorg-server/os/utils.c18
-rw-r--r--xorg-server/os/xdmcp.c63
9 files changed, 96 insertions, 93 deletions
diff --git a/xorg-server/os/WaitFor.c b/xorg-server/os/WaitFor.c
index ffa740fe4..ffc896176 100644
--- a/xorg-server/os/WaitFor.c
+++ b/xorg-server/os/WaitFor.c
@@ -118,7 +118,7 @@ struct _OsTimerRec {
CARD32 expires;
CARD32 delta;
OsTimerCallback callback;
- pointer arg;
+ void *arg;
};
static void DoTimer(OsTimerPtr timer, CARD32 now, OsTimerPtr *prev);
@@ -218,7 +218,7 @@ WaitForSomething(int *pClientsReady)
XFD_COPYSET(&AllSockets, &LastSelectMask);
}
- BlockHandler((pointer) &wt, (pointer) &LastSelectMask);
+ BlockHandler((void *) &wt, (void *) &LastSelectMask);
if (NewOutputPending)
FlushAllOutput();
/* keep this check close to select() call to minimize race */
@@ -232,7 +232,7 @@ WaitForSomething(int *pClientsReady)
i = Select(MaxClients, &LastSelectMask, NULL, NULL, wt);
}
selecterr = GetErrno();
- WakeupHandler(i, (pointer) &LastSelectMask);
+ WakeupHandler(i, (void *) &LastSelectMask);
if (i <= 0) { /* An error or timeout occurred */
if (dispatchException)
return 0;
@@ -309,7 +309,7 @@ WaitForSomething(int *pClientsReady)
XFD_ANDSET(&tmp_set, &LastSelectMask, &WellKnownConnections);
if (XFD_ANYSET(&tmp_set))
QueueWorkProc(EstablishNewConnections, NULL,
- (pointer) &LastSelectMask);
+ (void *) &LastSelectMask);
if (XFD_ANYSET(&devicesReadable) || XFD_ANYSET(&clientsReadable))
break;
@@ -422,7 +422,7 @@ DoTimer(OsTimerPtr timer, CARD32 now, OsTimerPtr *prev)
OsTimerPtr
TimerSet(OsTimerPtr timer, int flags, CARD32 millis,
- OsTimerCallback func, pointer arg)
+ OsTimerCallback func, void *arg)
{
register OsTimerPtr *prev;
CARD32 now = GetTimeInMillis();
@@ -570,7 +570,7 @@ NextDPMSTimeout(INT32 timeout)
#endif /* DPMSExtension */
static CARD32
-ScreenSaverTimeoutExpire(OsTimerPtr timer, CARD32 now, pointer arg)
+ScreenSaverTimeoutExpire(OsTimerPtr timer, CARD32 now, void *arg)
{
INT32 timeout = now - LastEventTime(XIAllDevices).milliseconds;
CARD32 nextTimeout = 0;
diff --git a/xorg-server/os/access.c b/xorg-server/os/access.c
index c8e15cfea..62c3d9925 100644..100755
--- a/xorg-server/os/access.c
+++ b/xorg-server/os/access.c
@@ -186,7 +186,7 @@ Bool defeatAccessControl = FALSE;
static int ConvertAddr(struct sockaddr * /*saddr */ ,
int * /*len */ ,
- pointer * /*addr */ );
+ void ** /*addr */ );
static int CheckAddr(int /*family */ ,
const void * /*pAddr */ ,
@@ -230,7 +230,7 @@ static int ActiveInterfaces = 0;
void match_interface(u_long u_lQuery);
/* FamilyServerInterpreted implementation */
-static Bool siAddrMatch(int family, pointer addr, int len, HOST * host,
+static Bool siAddrMatch(int family, void *addr, int len, HOST * host,
ClientPtr client);
static int siCheckAddr(const char *addrString, int length);
static void siTypesInitialize(void);
@@ -340,7 +340,7 @@ DisableLocalHost(void)
for (self = selfhosts; self; self = self->next) {
if (!self->requested) /* Fix for XFree86 bug #156 */
(void) RemoveHost((ClientPtr) NULL, self->family, self->len,
- (pointer) self->addr);
+ (void *) self->addr);
}
}
@@ -550,7 +550,7 @@ CarryOnTheOldWay:
else if (i == j) continue;
else memcpy ( &(inetaddr->sin_addr), hp->h_addr_list[i], hp->h_length);
len = sizeof(saddr.sa);
- family = ConvertAddr(&(saddr.sa), &len, (pointer *) &addr);
+ family = ConvertAddr(&(saddr.sa), &len, (void **) &addr);
if ( family != -1 && family != FamilyLocal ) {
for (host = selfhosts;
host && !addrEqual (family, addr, len, host);
@@ -715,7 +715,7 @@ DefineSelf(int fd)
#define IFR_IFR_NAME ifr->ifr_name
#endif
- if (ifioctl(fd, IFC_IOCTL_REQ, (pointer) &ifc) < 0)
+ if (ifioctl(fd, IFC_IOCTL_REQ, (void *) &ifc) < 0)
ErrorF("Getting interface configuration (4): %s\n", strerror(errno));
cplim = (char *) IFC_IFC_REQ + IFC_IFC_LEN;
@@ -724,7 +724,7 @@ DefineSelf(int fd)
ifr = (ifr_type *) cp;
len = ifraddr_size(IFR_IFR_ADDR);
family = ConvertAddr((struct sockaddr *) &IFR_IFR_ADDR,
- &len, (pointer *) &addr);
+ &len, (void **) &addr);
if (family == -1 || family == FamilyLocal)
continue;
#if defined(IPv6) && defined(AF_INET6)
@@ -819,12 +819,12 @@ DefineSelf(int fd)
struct ifreq broad_req;
broad_req = *ifr;
- if (ifioctl(fd, SIOCGIFFLAGS, (pointer) &broad_req) != -1 &&
+ if (ifioctl(fd, SIOCGIFFLAGS, (void *) &broad_req) != -1 &&
(broad_req.ifr_flags & IFF_BROADCAST) &&
(broad_req.ifr_flags & IFF_UP)
) {
broad_req = *ifr;
- if (ifioctl(fd, SIOCGIFBRDADDR, (pointer) &broad_req) != -1)
+ if (ifioctl(fd, SIOCGIFBRDADDR, (void *) &broad_req) != -1)
broad_addr = broad_req.ifr_addr;
else
continue;
@@ -849,7 +849,7 @@ DefineSelf(int fd)
continue;
len = sizeof(*(ifr->ifa_addr));
family = ConvertAddr((struct sockaddr *) ifr->ifa_addr, &len,
- (pointer *) &addr);
+ (void **) &addr);
if (family == -1 || family == FamilyLocal)
continue;
#if defined(IPv6) && defined(AF_INET6)
@@ -945,13 +945,13 @@ DefineSelf(int fd)
#ifdef XDMCP
void
-AugmentSelf(pointer from, int len)
+AugmentSelf(void *from, int len)
{
int family;
- pointer addr;
+ void *addr;
register HOST *host;
- family = ConvertAddr(from, &len, (pointer *) &addr);
+ family = ConvertAddr(from, &len, (void **) &addr);
if (family == -1 || family == FamilyLocal)
return;
for (host = selfhosts; host; host = host->next) {
@@ -984,7 +984,7 @@ AddLocalHosts(void)
/* Reset access control list to initial hosts */
void
-ResetHosts(char *display)
+ResetHosts(const char *display)
{
register HOST *host;
char lhostname[120], ohostname[120];
@@ -1005,7 +1005,7 @@ ResetHosts(char *display)
} saddr;
#endif
int family = 0;
- pointer addr;
+ void *addr;
int len;
siTypesInitialize();
@@ -1102,7 +1102,7 @@ ResetHosts(char *display)
for (a = addresses; a != NULL; a = a->ai_next) {
len = a->ai_addrlen;
f = ConvertAddr(a->ai_addr, &len,
- (pointer *) &addr);
+ (void **) &addr);
if ((family == f) ||
((family == FamilyWild) && (f != -1))) {
NewHost(f, addr, len, FALSE);
@@ -1125,15 +1125,15 @@ ResetHosts(char *display)
len = sizeof(saddr.sa);
if ((family =
ConvertAddr(&saddr.sa, &len,
- (pointer *) &addr)) != -1) {
+ (void **) &addr)) != -1) {
#ifdef h_addr /* new 4.3bsd version of gethostent */
char **list;
/* iterate over the addresses */
for (list = hp->h_addr_list; *list; list++)
- (void) NewHost(family, (pointer) *list, len, FALSE);
+ (void) NewHost(family, (void *) *list, len, FALSE);
#else
- (void) NewHost(family, (pointer) hp->h_addr, len,
+ (void) NewHost(family, (void *) hp->h_addr, len,
FALSE);
#endif
}
@@ -1153,7 +1153,7 @@ ComputeLocalClient(ClientPtr client)
{
int alen, family, notused;
Xtransaddr *from = NULL;
- pointer addr;
+ void *addr;
register HOST *host;
OsCommPtr oc = (OsCommPtr) client->osPrivate;
@@ -1162,7 +1162,7 @@ ComputeLocalClient(ClientPtr client)
if (!_XSERVTransGetPeerAddr(oc->trans_conn, &notused, &alen, &from)) {
family = ConvertAddr((struct sockaddr *) from,
- &alen, (pointer *) &addr);
+ &alen, (void **) &addr);
if (family == -1) {
free(from);
return FALSE;
@@ -1394,8 +1394,8 @@ AddHost(ClientPtr client, int family, unsigned length, /* of bytes in pAddr */
Bool
ForEachHostInFamily(int family, Bool (*func) (unsigned char * /* addr */ ,
short /* len */ ,
- pointer /* closure */ ),
- pointer closure)
+ void */* closure */ ),
+ void *closure)
{
HOST *host;
@@ -1441,7 +1441,7 @@ NewHost(int family, const void *addr, int len, int addingLocalHosts)
int
RemoveHost(ClientPtr client, int family, unsigned length, /* of bytes in pAddr */
- pointer pAddr)
+ void *pAddr)
{
int rc, len;
register HOST *host, **prev;
@@ -1488,7 +1488,7 @@ RemoveHost(ClientPtr client, int family, unsigned length, /* of bytes in p
/* Get all hosts in the access control list */
int
-GetHosts(pointer *data, int *pnHosts, int *pLen, BOOL * pEnabled)
+GetHosts(void **data, int *pnHosts, int *pLen, BOOL * pEnabled)
{
int len;
register int n = 0;
@@ -1563,12 +1563,12 @@ int
InvalidHost(register struct sockaddr *saddr, int len, ClientPtr client)
{
int family;
- pointer addr;
+ void *addr;
register HOST *selfhost, *host;
if (!AccessEnabled) /* just let them in */
return 0;
- family = ConvertAddr(saddr, &len, (pointer *) &addr);
+ family = ConvertAddr(saddr, &len, (void **) &addr);
if (family == -1)
return 1;
if (family == FamilyLocal) {
@@ -1604,7 +1604,7 @@ InvalidHost(register struct sockaddr *saddr, int len, ClientPtr client)
}
static int
-ConvertAddr(register struct sockaddr *saddr, int *len, pointer *addr)
+ConvertAddr(register struct sockaddr *saddr, int *len, void **addr)
{
if (*len == 0)
return FamilyLocal;
@@ -1621,7 +1621,7 @@ ConvertAddr(register struct sockaddr *saddr, int *len, pointer *addr)
return FamilyLocal;
#endif
*len = sizeof(struct in_addr);
- *addr = (pointer) &(((struct sockaddr_in *) saddr)->sin_addr);
+ *addr = (void *) &(((struct sockaddr_in *) saddr)->sin_addr);
return FamilyInternet;
#if defined(IPv6) && defined(AF_INET6)
case AF_INET6:
@@ -1630,12 +1630,12 @@ ConvertAddr(register struct sockaddr *saddr, int *len, pointer *addr)
if (IN6_IS_ADDR_V4MAPPED(&(saddr6->sin6_addr))) {
*len = sizeof(struct in_addr);
- *addr = (pointer) &(saddr6->sin6_addr.s6_addr[12]);
+ *addr = (void *) &(saddr6->sin6_addr.s6_addr[12]);
return FamilyInternet;
}
else {
*len = sizeof(struct in6_addr);
- *addr = (pointer) &(saddr6->sin6_addr);
+ *addr = (void *) &(saddr6->sin6_addr);
return FamilyInternet6;
}
}
@@ -1682,7 +1682,7 @@ GetAccessControl(void)
* future to enable loading additional host types, but that was not done for
* the initial implementation.
*/
-typedef Bool (*siAddrMatchFunc) (int family, pointer addr, int len,
+typedef Bool (*siAddrMatchFunc) (int family, void *addr, int len,
const char *siAddr, int siAddrlen,
ClientPtr client, void *siTypePriv);
typedef int (*siCheckAddrFunc) (const char *addrString, int length,
@@ -1735,7 +1735,7 @@ siTypeAdd(const char *typeName, siAddrMatchFunc addrMatch,
/* Checks to see if a host matches a server-interpreted host entry */
static Bool
-siAddrMatch(int family, pointer addr, int len, HOST * host, ClientPtr client)
+siAddrMatch(int family, void *addr, int len, HOST * host, ClientPtr client)
{
Bool matches = FALSE;
struct siType *s;
@@ -1836,7 +1836,7 @@ siCheckAddr(const char *addrString, int length)
#endif
static Bool
-siHostnameAddrMatch(int family, pointer addr, int len,
+siHostnameAddrMatch(int family, void *addr, int len,
const char *siAddr, int siAddrLen, ClientPtr client,
void *typePriv)
{
@@ -1853,7 +1853,7 @@ siHostnameAddrMatch(int family, pointer addr, int len,
struct addrinfo *a;
struct addrinfo hints;
int f, hostaddrlen;
- pointer hostaddr;
+ void *hostaddr;
if (siAddrLen >= sizeof(hostname))
return FALSE;
@@ -1885,7 +1885,7 @@ siHostnameAddrMatch(int family, pointer addr, int len,
#endif
char hostname[SI_HOSTNAME_MAXLEN];
int f, hostaddrlen;
- pointer hostaddr;
+ void *hostaddr;
const char **addrlist;
if (siAddrLen >= sizeof(hostname))
@@ -1989,7 +1989,7 @@ siHostnameCheckAddr(const char *valueString, int length, void *typePriv)
#define SI_IPv6_MAXLEN INET6_ADDRSTRLEN
static Bool
-siIPv6AddrMatch(int family, pointer addr, int len,
+siIPv6AddrMatch(int family, void *addr, int len,
const char *siAddr, int siAddrlen, ClientPtr client,
void *typePriv)
{
@@ -2115,7 +2115,7 @@ siLocalCredGetId(const char *addr, int len, siLocalCredPrivPtr lcPriv, int *id)
}
static Bool
-siLocalCredAddrMatch(int family, pointer addr, int len,
+siLocalCredAddrMatch(int family, void *addr, int len,
const char *siAddr, int siAddrlen, ClientPtr client,
void *typePriv)
{
diff --git a/xorg-server/os/auth.c b/xorg-server/os/auth.c
index b95786bee..df05a5717 100644
--- a/xorg-server/os/auth.c
+++ b/xorg-server/os/auth.c
@@ -96,12 +96,12 @@ static struct protocol protocols[] = {
* specified authorization file
*/
-static char *authorization_file = (char *) NULL;
+static const char *authorization_file = NULL;
static Bool ShouldLoadAuth = TRUE;
void
-InitAuthorization(char *file_name)
+InitAuthorization(const char *file_name)
{
authorization_file = file_name;
}
diff --git a/xorg-server/os/connection.c b/xorg-server/os/connection.c
index 99f0da06c..7c48d46b0 100644
--- a/xorg-server/os/connection.c
+++ b/xorg-server/os/connection.c
@@ -797,7 +797,7 @@ AllocNewConnection(XtransConnInfo trans_conn, int fd, CARD32 conn_time)
oc->output = (ConnectionOutputPtr) NULL;
oc->auth_id = None;
oc->conn_time = conn_time;
- if (!(client = NextAvailableClient((pointer) oc))) {
+ if (!(client = NextAvailableClient((void *) oc))) {
free(oc);
return NullClient;
}
@@ -835,7 +835,7 @@ AllocNewConnection(XtransConnInfo trans_conn, int fd, CARD32 conn_time)
*****************/
/*ARGSUSED*/ Bool
-EstablishNewConnections(ClientPtr clientUnused, pointer closure)
+EstablishNewConnections(ClientPtr clientUnused, void *closure)
{
fd_set readyconnections; /* set of listeners that are ready */
int curconn; /* fd of listener that's ready */
@@ -1093,7 +1093,7 @@ CloseDownConnection(ClientPtr client)
CloseDownFileDescriptor(oc);
FreeOsBuffers(oc);
free(client->osPrivate);
- client->osPrivate = (pointer) NULL;
+ client->osPrivate = (void *) NULL;
if (auditTrailLevel > 1)
AuditF("client %d disconnected\n", client->index);
}
diff --git a/xorg-server/os/io.c b/xorg-server/os/io.c
index 9f0842672..1303f3ab1 100644
--- a/xorg-server/os/io.c
+++ b/xorg-server/os/io.c
@@ -481,7 +481,7 @@ ReadRequestFromClient(ClientPtr client)
oci->lenLastReq -= (sizeof(xBigReq) - sizeof(xReq));
client->req_len -= bytes_to_int32(sizeof(xBigReq) - sizeof(xReq));
}
- client->requestBuffer = (pointer) oci->bufptr;
+ client->requestBuffer = (void *) oci->bufptr;
#ifdef DEBUG_COMMUNICATION
{
xReq *req = client->requestBuffer;
@@ -809,7 +809,7 @@ WriteToClient(ClientPtr who, int count, const void *__buf)
who->replyBytesRemaining -= count + padBytes;
replyinfo.startOfReply = FALSE;
replyinfo.bytesRemaining = who->replyBytesRemaining;
- CallCallbacks((&ReplyCallback), (pointer) &replyinfo);
+ CallCallbacks((&ReplyCallback), (void *) &replyinfo);
}
else if (who->clientState == ClientStateRunning && buf[0] == X_Reply) { /* start of new reply */
CARD32 replylen;
@@ -821,7 +821,7 @@ WriteToClient(ClientPtr who, int count, const void *__buf)
bytesleft = (replylen * 4) + SIZEOF(xReply) - count - padBytes;
replyinfo.startOfReply = TRUE;
replyinfo.bytesRemaining = who->replyBytesRemaining = bytesleft;
- CallCallbacks((&ReplyCallback), (pointer) &replyinfo);
+ CallCallbacks((&ReplyCallback), (void *) &replyinfo);
}
}
#ifdef DEBUG_COMMUNICATION
diff --git a/xorg-server/os/log.c b/xorg-server/os/log.c
index a85ec9c2e..b2fcae1b3 100644
--- a/xorg-server/os/log.c
+++ b/xorg-server/os/log.c
@@ -832,7 +832,7 @@ AuditF(const char *f, ...)
}
static CARD32
-AuditFlush(OsTimerPtr timer, CARD32 now, pointer arg)
+AuditFlush(OsTimerPtr timer, CARD32 now, void *arg)
{
char *prefix;
diff --git a/xorg-server/os/rpcauth.c b/xorg-server/os/rpcauth.c
index bd219acfa..d60ea3518 100644
--- a/xorg-server/os/rpcauth.c
+++ b/xorg-server/os/rpcauth.c
@@ -113,7 +113,7 @@ authdes_ezdecode(const char *inmsg, int len)
static XID rpc_id = (XID) ~0L;
static Bool
-CheckNetName(unsigned char *addr, short len, pointer closure)
+CheckNetName(unsigned char *addr, short len, void *closure)
{
return (len == strlen((char *) closure) &&
strncmp((char *) addr, (char *) closure, len) == 0);
@@ -159,7 +159,7 @@ _X_HIDDEN int
SecureRPCAdd(unsigned short data_length, const char *data, XID id)
{
if (data_length)
- AddHost((pointer) 0, FamilyNetname, data_length, data);
+ AddHost((void *) 0, FamilyNetname, data_length, data);
rpc_id = id;
return 1;
}
diff --git a/xorg-server/os/utils.c b/xorg-server/os/utils.c
index f878f28b2..aeb276fa4 100644
--- a/xorg-server/os/utils.c
+++ b/xorg-server/os/utils.c
@@ -511,7 +511,7 @@ GetTimeInMicros(void)
#endif
void
-AdjustWaitForDelay(pointer waitTime, unsigned long newdelay)
+AdjustWaitForDelay(void *waitTime, unsigned long newdelay)
{
static struct timeval delay_val;
struct timeval **wt = (struct timeval **) waitTime;
@@ -1006,7 +1006,7 @@ ProcessCommandLine(int argc, char *argv[])
/* Implement a simple-minded font authorization scheme. The authorization
name is "hp-hostname-1", the contents are simply the host name. */
int
-set_font_authorizations(char **authorizations, int *authlen, pointer client)
+set_font_authorizations(char **authorizations, int *authlen, void *client)
{
#define AUTHORIZATION_NAME "hp-hostname-1"
#if defined(TCPCONN) || defined(STREAMSCONN)
@@ -1443,7 +1443,7 @@ static struct pid {
OsSigHandlerPtr old_alarm = NULL; /* XXX horrible awful hack */
-pointer
+void *
Popen(const char *command, const char *type)
{
struct pid *cur;
@@ -1531,7 +1531,7 @@ Popen(const char *command, const char *type)
}
/* fopen that drops privileges */
-pointer
+void *
Fopen(const char *file, const char *type)
{
FILE *iop;
@@ -1626,7 +1626,7 @@ Fopen(const char *file, const char *type)
}
int
-Pclose(pointer iop)
+Pclose(void *iop)
{
struct pid *cur, *last;
int pstat;
@@ -1663,7 +1663,7 @@ Pclose(pointer iop)
}
int
-Fclose(pointer iop)
+Fclose(void *iop)
{
#ifdef HAS_SAVED_IDS_AND_SETEUID
return fclose(iop);
@@ -2004,10 +2004,10 @@ CheckUserAuthorization(void)
* Tokenize a string into a NULL terminated array of strings. Always returns
* an allocated array unless an error occurs.
*/
-char **
+const char **
xstrtokenize(const char *str, const char *separators)
{
- char **list, **nlist;
+ const char **list, **nlist;
char *tok, *tmp;
unsigned num = 0, n;
@@ -2035,7 +2035,7 @@ xstrtokenize(const char *str, const char *separators)
error:
free(tmp);
for (n = 0; n < num; n++)
- free(list[n]);
+ free((void *) list[n]);
free(list);
return NULL;
}
diff --git a/xorg-server/os/xdmcp.c b/xorg-server/os/xdmcp.c
index c18e90248..3ce2b9f6b 100644
--- a/xorg-server/os/xdmcp.c
+++ b/xorg-server/os/xdmcp.c
@@ -147,43 +147,46 @@ static void get_xdmcp_sock(void);
static void send_query_msg(void);
-static void recv_willing_msg(struct sockaddr * /*from */ ,
- int /*fromlen */ ,
- unsigned /*length */ );
+static void recv_willing_msg(struct sockaddr *from,
+ int fromlen,
+ unsigned length);
static void send_request_msg(void);
-static void recv_accept_msg(unsigned /*length */ );
+static void recv_accept_msg(unsigned length);
-static void recv_decline_msg(unsigned /*length */ );
+static void recv_decline_msg(unsigned length);
static void send_manage_msg(void);
-static void recv_refuse_msg(unsigned /*length */ );
+static void recv_refuse_msg(unsigned length);
-static void recv_failed_msg(unsigned /*length */ );
+static void recv_failed_msg(unsigned length);
static void send_keepalive_msg(void);
-static void recv_alive_msg(unsigned /*length */ );
+static void recv_alive_msg(unsigned length );
-static void XdmcpFatal(const char * /*type */ ,
- ARRAY8Ptr /*status */ );
+static void XdmcpFatal(const char *type,
+ ARRAY8Ptr status);
-static void XdmcpWarning(const char * /*str */ );
+static void XdmcpWarning(const char *str);
-static void get_manager_by_name(int /*argc */ ,
- char ** /*argv */ ,
- int /*i */ );
+static void get_manager_by_name(int argc,
+ char **argv,
+ int i);
-static void get_fromaddr_by_name(int /*argc */ , char ** /*argv */ ,
- int /*i */ );
+static void get_fromaddr_by_name(int argc,
+ char **argv,
+ int i);
#if defined(IPv6) && defined(AF_INET6)
-static int get_mcast_options(int /*argc */ , char ** /*argv */ , int /*i */ );
+static int get_mcast_options(int argc,
+ char **argv,
+ int i);
#endif
-static void receive_packet(int /*socketfd */ );
+static void receive_packet(int socketfd);
static void send_packet(void);
@@ -191,13 +194,13 @@ static void timeout(void);
static void restart(void);
-static void XdmcpBlockHandler(pointer /*data */ ,
- struct timeval ** /*wt */ ,
- pointer /*LastSelectMask */ );
+static void XdmcpBlockHandler(void *data ,
+ struct timeval **wt,
+ void *LastSelectMask);
-static void XdmcpWakeupHandler(pointer /*data */ ,
- int /*i */ ,
- pointer /*LastSelectMask */ );
+static void XdmcpWakeupHandler(void *data,
+ int i,
+ void *LastSelectMask);
#define XSERV_t
#define TRANS_SERVER
@@ -585,7 +588,7 @@ XdmcpInit(void)
strlen(defaultDisplayClass));
AccessUsingXdmcp();
RegisterBlockAndWakeupHandlers(XdmcpBlockHandler, XdmcpWakeupHandler,
- (pointer) 0);
+ (void *) 0);
timeOutRtx = 0;
DisplayNumber = (CARD16) atoi(display);
if (ConnectionTypes.length>1 && xdm_from==NULL)
@@ -625,7 +628,7 @@ XdmcpReset(void)
state = XDM_INIT_STATE;
if (state != XDM_OFF) {
RegisterBlockAndWakeupHandlers(XdmcpBlockHandler, XdmcpWakeupHandler,
- (pointer) 0);
+ (void *) 0);
timeOutRtx = 0;
send_packet();
}
@@ -668,8 +671,8 @@ XdmcpCloseDisplay(int sock)
*/
/*ARGSUSED*/ static void
-XdmcpBlockHandler(pointer data, /* unused */
- struct timeval **wt, pointer pReadmask)
+XdmcpBlockHandler(void *data, /* unused */
+ struct timeval **wt, void *pReadmask)
{
fd_set *LastSelectMask = (fd_set *) pReadmask;
CARD32 millisToGo;
@@ -696,8 +699,8 @@ XdmcpBlockHandler(pointer data, /* unused */
*/
/*ARGSUSED*/ static void
-XdmcpWakeupHandler(pointer data, /* unused */
- int i, pointer pReadmask)
+XdmcpWakeupHandler(void *data, /* unused */
+ int i, void *pReadmask)
{
fd_set *LastSelectMask = (fd_set *) pReadmask;
fd_set devicesReadable;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 17:19:11 +0000