aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/os
diff options
context:
space:
mode:
Diffstat (limited to 'nx-X11/programs/Xserver/os')
-rw-r--r--nx-X11/programs/Xserver/os/WaitFor.c18
-rw-r--r--nx-X11/programs/Xserver/os/access.c92
-rw-r--r--nx-X11/programs/Xserver/os/connection.c8
-rw-r--r--nx-X11/programs/Xserver/os/io.c6
-rw-r--r--nx-X11/programs/Xserver/os/k5auth.c10
-rw-r--r--nx-X11/programs/Xserver/os/log.c2
-rw-r--r--nx-X11/programs/Xserver/os/osdep.h8
-rw-r--r--nx-X11/programs/Xserver/os/rpcauth.c4
-rw-r--r--nx-X11/programs/Xserver/os/utils.c32
-rw-r--r--nx-X11/programs/Xserver/os/xalloc.c18
-rw-r--r--nx-X11/programs/Xserver/os/xdmcp.c20
11 files changed, 109 insertions, 109 deletions
diff --git a/nx-X11/programs/Xserver/os/WaitFor.c b/nx-X11/programs/Xserver/os/WaitFor.c
index 2ef474229..d97d44ab6 100644
--- a/nx-X11/programs/Xserver/os/WaitFor.c
+++ b/nx-X11/programs/Xserver/os/WaitFor.c
@@ -152,7 +152,7 @@ struct _OsTimerRec {
OsTimerPtr next;
CARD32 expires;
OsTimerCallback callback;
- pointer arg;
+ void * arg;
};
static void DoTimer(OsTimerPtr timer, CARD32 now, OsTimerPtr *prev);
@@ -254,7 +254,7 @@ WaitForSomething(int *pClientsReady)
}
SmartScheduleIdle = TRUE;
#endif
- BlockHandler((pointer)&wt, (pointer)&LastSelectMask);
+ BlockHandler((void *)&wt, (void *)&LastSelectMask);
if (NewOutputPending)
FlushAllOutput();
#ifdef XTESTEXT1
@@ -386,7 +386,7 @@ WaitForSomething(int *pClientsReady)
}
#endif
selecterr = GetErrno();
- WakeupHandler(i, (pointer)&LastSelectMask);
+ WakeupHandler(i, (void *)&LastSelectMask);
#ifdef XTESTEXT1
if (playback_on) {
i = XTestProcessInputAction (i, &waittime);
@@ -515,7 +515,7 @@ WaitForSomething(int *pClientsReady)
XFD_ANDSET(&tmp_set, &LastSelectMask, &WellKnownConnections);
if (XFD_ANYSET(&tmp_set))
QueueWorkProc(EstablishNewConnections, NULL,
- (pointer)&LastSelectMask);
+ (void *)&LastSelectMask);
#ifdef DPMSExtension
if (XFD_ANYSET (&devicesReadable) && (DPMSPowerLevel != DPMSModeOn))
DPMSSet(DPMSModeOn);
@@ -643,7 +643,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();
@@ -755,7 +755,7 @@ TimerInit(void)
}
static CARD32
-ScreenSaverTimeoutExpire(OsTimerPtr timer,CARD32 now,pointer arg)
+ScreenSaverTimeoutExpire(OsTimerPtr timer,CARD32 now,void * arg)
{
INT32 timeout = now - lastDeviceEventTime.milliseconds;
@@ -805,7 +805,7 @@ static OsTimerPtr DPMSSuspendTimer = NULL;
static OsTimerPtr DPMSOffTimer = NULL;
static CARD32
-DPMSStandbyTimerExpire(OsTimerPtr timer,CARD32 now,pointer arg)
+DPMSStandbyTimerExpire(OsTimerPtr timer,CARD32 now,void * arg)
{
INT32 timeout = now - lastDeviceEventTime.milliseconds;
@@ -820,7 +820,7 @@ DPMSStandbyTimerExpire(OsTimerPtr timer,CARD32 now,pointer arg)
}
static CARD32
-DPMSSuspendTimerExpire(OsTimerPtr timer,CARD32 now,pointer arg)
+DPMSSuspendTimerExpire(OsTimerPtr timer,CARD32 now,void * arg)
{
INT32 timeout = now - lastDeviceEventTime.milliseconds;
@@ -835,7 +835,7 @@ DPMSSuspendTimerExpire(OsTimerPtr timer,CARD32 now,pointer arg)
}
static CARD32
-DPMSOffTimerExpire(OsTimerPtr timer,CARD32 now,pointer arg)
+DPMSOffTimerExpire(OsTimerPtr timer,CARD32 now,void * arg)
{
INT32 timeout = now - lastDeviceEventTime.milliseconds;
diff --git a/nx-X11/programs/Xserver/os/access.c b/nx-X11/programs/Xserver/os/access.c
index 532a2f82e..07b460f40 100644
--- a/nx-X11/programs/Xserver/os/access.c
+++ b/nx-X11/programs/Xserver/os/access.c
@@ -226,14 +226,14 @@ Bool defeatAccessControl = FALSE;
static int ConvertAddr(struct sockaddr * /*saddr*/,
int * /*len*/,
- pointer * /*addr*/);
+ void ** /*addr*/);
static int CheckAddr(int /*family*/,
- pointer /*pAddr*/,
+ void * /*pAddr*/,
unsigned /*length*/);
static Bool NewHost(int /*family*/,
- pointer /*addr*/,
+ void * /*addr*/,
int /*len*/,
int /* addingLocalHosts */);
@@ -270,7 +270,7 @@ static int LocalHostRequested = FALSE;
static int UsingXdmcp = FALSE;
/* 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);
@@ -302,7 +302,7 @@ DisableLocalHost (void)
LocalHostEnabled = FALSE;
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) RemoveHost ((ClientPtr)NULL, self->family, self->len, (void *)self->addr);
}
}
@@ -441,7 +441,7 @@ DefineSelf (int fd)
}
len = sizeof(struct sockaddr_in);
- family = ConvertAddr (IA_SIN(&ifaddr), &len, (pointer *)&addr);
+ family = ConvertAddr (IA_SIN(&ifaddr), &len, (void **)&addr);
if (family == -1 || family == FamilyLocal)
continue;
for (host = selfhosts;
@@ -602,7 +602,7 @@ DefineSelf (int fd)
default:
goto DefineLocalHost;
}
- family = ConvertAddr ( &(saddr.sa), &len, (pointer *)&addr);
+ family = ConvertAddr ( &(saddr.sa), &len, (void **)&addr);
if ( family != -1 && family != FamilyLocal )
{
for (host = selfhosts;
@@ -812,7 +812,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)
Error ("Getting interface configuration (4)");
cplim = (char *) IFC_IFC_REQ + IFC_IFC_LEN;
@@ -822,7 +822,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);
#ifdef DNETCONN
/*
* DECnet was handled up above.
@@ -943,13 +943,13 @@ 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;
@@ -980,7 +980,7 @@ DefineSelf (int fd)
continue;
#endif /* DNETCONN */
len = sizeof(*(ifr->ifa_addr));
- family = ConvertAddr(ifr->ifa_addr, &len, (pointer *)&addr);
+ family = ConvertAddr(ifr->ifa_addr, &len, (void **)&addr);
if (family == -1 || family == FamilyLocal)
continue;
#if defined(IPv6) && defined(AF_INET6)
@@ -1104,13 +1104,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)
@@ -1175,7 +1175,7 @@ ResetHosts (char *display)
krb5_data kbuf;
#endif
int family = 0;
- pointer addr;
+ void *addr;
int len;
siTypesInitialize();
@@ -1284,7 +1284,7 @@ ResetHosts (char *display)
/* node was specified by name */
saddr.sa.sa_family = np->n_addrtype;
len = sizeof(saddr.sa);
- if (ConvertAddr (&saddr.sa, &len, (pointer *)&addr) == FamilyDECnet)
+ if (ConvertAddr (&saddr.sa, &len, (void **)&addr) == FamilyDECnet)
{
bzero ((char *) &dnaddr, sizeof (dnaddr));
dnaddr.a_len = np->n_length;
@@ -1293,7 +1293,7 @@ ResetHosts (char *display)
}
}
if (dnaddrp)
- (void) NewHost(FamilyDECnet, (pointer)dnaddrp,
+ (void) NewHost(FamilyDECnet, (void *)dnaddrp,
(int)(dnaddrp->a_len + sizeof(dnaddrp->a_len)), FALSE);
}
else
@@ -1329,7 +1329,7 @@ ResetHosts (char *display)
if (getaddrinfo(hostname, NULL, NULL, &addresses) == 0) {
for (a = addresses ; a != NULL ; a = a->ai_next) {
len = a->ai_addrlen;
- f = ConvertAddr(a->ai_addr,&len,(pointer *)&addr);
+ f = ConvertAddr(a->ai_addr,&len,(void **)&addr);
if ( (family == f) ||
((family == FamilyWild) && (f != -1)) ) {
NewHost(f, addr, len, FALSE);
@@ -1351,16 +1351,16 @@ ResetHosts (char *display)
{
saddr.sa.sa_family = hp->h_addrtype;
len = sizeof(saddr.sa);
- if ((family = ConvertAddr (&saddr.sa, &len, (pointer *)&addr)) != -1)
+ if ((family = ConvertAddr (&saddr.sa, &len, (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, FALSE);
+ (void) NewHost (family, (void *)hp->h_addr, len, FALSE);
#endif
}
}
@@ -1378,7 +1378,7 @@ Bool LocalClient(ClientPtr client)
{
int alen, family, notused;
Xtransaddr *from = NULL;
- pointer addr;
+ void *addr;
register HOST *host;
#ifdef XCSECURITY
@@ -1398,7 +1398,7 @@ Bool LocalClient(ClientPtr client)
&notused, &alen, &from))
{
family = ConvertAddr ((struct sockaddr *) from,
- &alen, (pointer *)&addr);
+ &alen, (void **)&addr);
if (family == -1)
{
xfree ((char *) from);
@@ -1546,7 +1546,7 @@ int
AddHost (ClientPtr client,
int family,
unsigned length, /* of bytes in pAddr */
- pointer pAddr)
+ void *pAddr)
{
int len;
@@ -1596,8 +1596,8 @@ ForEachHostInFamily (int family,
Bool (*func)(
unsigned char * /* addr */,
short /* len */,
- pointer /* closure */),
- pointer closure)
+ void * /* closure */),
+ void * closure)
{
HOST *host;
@@ -1611,7 +1611,7 @@ ForEachHostInFamily (int family,
* called when starting or resetting the server */
static Bool
NewHost (int family,
- pointer addr,
+ void *addr,
int len,
int addingLocalHosts)
{
@@ -1648,7 +1648,7 @@ RemoveHost (
ClientPtr client,
int family,
unsigned length, /* of bytes in pAddr */
- pointer pAddr)
+ void *pAddr)
{
int len;
register HOST *host, **prev;
@@ -1703,7 +1703,7 @@ RemoveHost (
/* Get all hosts in the access control list */
int
GetHosts (
- pointer *data,
+ void * *data,
int *pnHosts,
int *pLen,
BOOL *pEnabled)
@@ -1726,7 +1726,7 @@ GetHosts (
}
if (n)
{
- *data = ptr = (pointer) xalloc (n);
+ *data = ptr = (void *) xalloc (n);
if (!ptr)
{
return(BadAlloc);
@@ -1756,7 +1756,7 @@ GetHosts (
static int
CheckAddr (
int family,
- pointer pAddr,
+ void * pAddr,
unsigned length)
{
int len;
@@ -1813,12 +1813,12 @@ InvalidHost (
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)
@@ -1860,7 +1860,7 @@ static int
ConvertAddr (
register struct sockaddr *saddr,
int *len,
- pointer *addr)
+ void **addr)
{
if (*len == 0)
return (FamilyLocal);
@@ -1878,7 +1878,7 @@ ConvertAddr (
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:
@@ -1886,11 +1886,11 @@ ConvertAddr (
struct sockaddr_in6 *saddr6 = (struct sockaddr_in6 *) saddr;
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;
}
}
@@ -1901,7 +1901,7 @@ ConvertAddr (
{
struct sockaddr_dn *sdn = (struct sockaddr_dn *) saddr;
*len = sdn->sdn_nodeaddrl + sizeof(sdn->sdn_nodeaddrl);
- *addr = (pointer) &(sdn->sdn_add);
+ *addr = (void *) &(sdn->sdn_add);
}
return FamilyDECnet;
#endif
@@ -1953,7 +1953,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,
void *siTypePriv);
@@ -2005,7 +2005,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;
@@ -2105,7 +2105,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)
{
Bool res = FALSE;
@@ -2120,7 +2120,7 @@ siHostnameAddrMatch(int family, pointer addr, int len,
struct addrinfo *addresses;
struct addrinfo *a;
int f, hostaddrlen;
- pointer hostaddr;
+ void * hostaddr;
if (siAddrLen >= sizeof(hostname))
return FALSE;
@@ -2149,7 +2149,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))
@@ -2249,7 +2249,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)
{
struct in6_addr addr6;
@@ -2367,7 +2367,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)
{
int connUid, connGid, *connSuppGids, connNumSuppGids, siAddrId;
diff --git a/nx-X11/programs/Xserver/os/connection.c b/nx-X11/programs/Xserver/os/connection.c
index e3319b338..0f846d084 100644
--- a/nx-X11/programs/Xserver/os/connection.c
+++ b/nx-X11/programs/Xserver/os/connection.c
@@ -142,7 +142,7 @@ extern __const__ int _nfiles;
#endif
#endif
#endif /* WIN32 */
-#include "misc.h" /* for typedef of pointer */
+#include "misc.h"
#include "osdep.h"
#include <X11/Xpoll.h>
#include "opaque.h"
@@ -874,7 +874,7 @@ AllocNewConnection (XtransConnInfo trans_conn, int fd, CARD32 conn_time)
oc->Close = Close;
oc->largereq = (ConnectionInputPtr) NULL;
#endif
- if (!(client = NextAvailableClient((pointer)oc)))
+ if (!(client = NextAvailableClient((void *)oc)))
{
xfree (oc);
return NullClient;
@@ -950,7 +950,7 @@ LbxProxyConnection (ClientPtr client, LbxProxyPtr proxy)
/*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 */
@@ -1215,7 +1215,7 @@ CloseDownConnection(ClientPtr client)
FreeOsBuffers(oc);
xfree(oc);
#endif
- client->osPrivate = (pointer)NULL;
+ client->osPrivate = (void *)NULL;
if (auditTrailLevel > 1)
AuditF("client %d disconnected\n", client->index);
}
diff --git a/nx-X11/programs/Xserver/os/io.c b/nx-X11/programs/Xserver/os/io.c
index 76edbaeee..b92e7c4ae 100644
--- a/nx-X11/programs/Xserver/os/io.c
+++ b/nx-X11/programs/Xserver/os/io.c
@@ -511,7 +511,7 @@ ReadRequestFromClient(ClientPtr client)
client->req_len -= (sizeof(xBigReq) - sizeof(xReq)) >> 2;
}
#endif
- client->requestBuffer = (pointer)oci->bufptr;
+ client->requestBuffer = (void *)oci->bufptr;
#ifdef DEBUG_COMMUNICATION
{
xReq *req = client->requestBuffer;
@@ -998,7 +998,7 @@ WriteToClient (ClientPtr who, int count, char *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)
@@ -1013,7 +1013,7 @@ WriteToClient (ClientPtr who, int count, char *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/nx-X11/programs/Xserver/os/k5auth.c b/nx-X11/programs/Xserver/os/k5auth.c
index 78301ad10..3c50de032 100644
--- a/nx-X11/programs/Xserver/os/k5auth.c
+++ b/nx-X11/programs/Xserver/os/k5auth.c
@@ -79,7 +79,7 @@ static char kerror[256];
* extract session key from a credentials struct
*/
krb5_error_code tgt_keyproc(keyprocarg, principal, vno, key)
- krb5_pointer keyprocarg;
+ krb5_void * keyprocarg;
krb5_principal principal;
krb5_kvno vno;
krb5_keyblock **key;
@@ -237,15 +237,15 @@ XID K5Check(data_length, data, client, reason)
client->clientState = ClientStateAuthenticating;
if (ccname)
{
- ((OsCommPtr)client->osPrivate)->authstate.srvcreds = (pointer)creds; /* save tgt creds */
+ ((OsCommPtr)client->osPrivate)->authstate.srvcreds = (void *)creds; /* save tgt creds */
((OsCommPtr)client->osPrivate)->authstate.ktname = NULL;
((OsCommPtr)client->osPrivate)->authstate.srvname = NULL;
}
if (srvname)
{
((OsCommPtr)client->osPrivate)->authstate.srvcreds = NULL;
- ((OsCommPtr)client->osPrivate)->authstate.ktname = (pointer)ktname;
- ((OsCommPtr)client->osPrivate)->authstate.srvname = (pointer)srvname;
+ ((OsCommPtr)client->osPrivate)->authstate.ktname = (void *)ktname;
+ ((OsCommPtr)client->osPrivate)->authstate.srvname = (void *)srvname;
}
((OsCommPtr)client->osPrivate)->authstate.stageno = 1; /* next stage is 1 */
return krb5_id;
@@ -476,7 +476,7 @@ int k5_stage1(client)
/*
* Now check to see if the principal we got is one that we want to let in
*/
- if (ForEachHostInFamily(FamilyKrb5Principal, k5_cmpenc, (pointer)&buf))
+ if (ForEachHostInFamily(FamilyKrb5Principal, k5_cmpenc, (void *)&buf))
{
free(buf.data);
/*
diff --git a/nx-X11/programs/Xserver/os/log.c b/nx-X11/programs/Xserver/os/log.c
index 1b28bb141..9af39800f 100644
--- a/nx-X11/programs/Xserver/os/log.c
+++ b/nx-X11/programs/Xserver/os/log.c
@@ -531,7 +531,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/nx-X11/programs/Xserver/os/osdep.h b/nx-X11/programs/Xserver/os/osdep.h
index b837d7605..e8c2d5959 100644
--- a/nx-X11/programs/Xserver/os/osdep.h
+++ b/nx-X11/programs/Xserver/os/osdep.h
@@ -151,10 +151,10 @@ typedef struct _connectionOutput {
#ifdef K5AUTH
typedef struct _k5_state {
int stageno; /* current stage of auth protocol */
- pointer srvcreds; /* server credentials */
- pointer srvname; /* server principal name */
- pointer ktname; /* key table: principal-key pairs */
- pointer skey; /* session key */
+ void *srvcreds; /* server credentials */
+ void *srvname; /* server principal name */
+ void *ktname; /* key table: principal-key pairs */
+ void *skey; /* session key */
} k5_state;
#endif
diff --git a/nx-X11/programs/Xserver/os/rpcauth.c b/nx-X11/programs/Xserver/os/rpcauth.c
index a12931eb0..896291e59 100644
--- a/nx-X11/programs/Xserver/os/rpcauth.c
+++ b/nx-X11/programs/Xserver/os/rpcauth.c
@@ -132,7 +132,7 @@ static Bool
CheckNetName (
unsigned char *addr,
short len,
- pointer closure
+ void * closure
)
{
return (len == strlen ((char *) closure) &&
@@ -176,7 +176,7 @@ int
SecureRPCAdd (unsigned short data_length, 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/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c
index 5f189c949..b09190c4e 100644
--- a/nx-X11/programs/Xserver/os/utils.c
+++ b/nx-X11/programs/Xserver/os/utils.c
@@ -598,7 +598,7 @@ GetTimeInMillis(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;
@@ -1299,7 +1299,7 @@ ExpandCommandLine(int *pargc, char ***pargv)
/* 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)
@@ -1380,7 +1380,7 @@ set_font_authorizations(char **authorizations, int *authlen, pointer client)
void *
Xalloc(unsigned long amount)
{
- register pointer ptr;
+ register void * ptr;
if ((long)amount <= 0) {
return (unsigned long *)NULL;
@@ -1392,7 +1392,7 @@ Xalloc(unsigned long amount)
((random() % MEM_FAIL_SCALE) < Memory_fail))
return (unsigned long *)NULL;
#endif
- if ((ptr = (pointer)malloc(amount))) {
+ if ((ptr = (void *)malloc(amount))) {
return (unsigned long *)ptr;
}
if (Must_have_memory)
@@ -1408,7 +1408,7 @@ Xalloc(unsigned long amount)
void *
XNFalloc(unsigned long amount)
{
- register pointer ptr;
+ register void * ptr;
if ((long)amount <= 0)
{
@@ -1416,7 +1416,7 @@ XNFalloc(unsigned long amount)
}
/* aligned extra on long word boundary */
amount = (amount + (sizeof(long) - 1)) & ~(sizeof(long) - 1);
- ptr = (pointer)malloc(amount);
+ ptr = (void *)malloc(amount);
if (!ptr)
{
FatalError("Out of memory");
@@ -1461,7 +1461,7 @@ XNFcalloc(unsigned long amount)
*****************/
void *
-Xrealloc(pointer ptr, unsigned long amount)
+Xrealloc(void * ptr, unsigned long amount)
{
#ifdef MEMBUG
if (!Must_have_memory && Memory_fail &&
@@ -1476,9 +1476,9 @@ Xrealloc(pointer ptr, unsigned long amount)
}
amount = (amount + (sizeof(long) - 1)) & ~(sizeof(long) - 1);
if (ptr)
- ptr = (pointer)realloc((char *)ptr, amount);
+ ptr = (void *)realloc((char *)ptr, amount);
else
- ptr = (pointer)malloc(amount);
+ ptr = (void *)malloc(amount);
if (ptr)
return (unsigned long *)ptr;
if (Must_have_memory)
@@ -1492,9 +1492,9 @@ Xrealloc(pointer ptr, unsigned long amount)
*****************/
void *
-XNFrealloc(pointer ptr, unsigned long amount)
+XNFrealloc(void * ptr, unsigned long amount)
{
- if (( ptr = (pointer)Xrealloc( ptr, amount ) ) == NULL)
+ if (( ptr = (void *)Xrealloc( ptr, amount ) ) == NULL)
{
if ((long)amount > 0)
FatalError( "Out of memory" );
@@ -1508,7 +1508,7 @@ XNFrealloc(pointer ptr, unsigned long amount)
*****************/
void
-Xfree(pointer ptr)
+Xfree(void * ptr)
{
if (ptr)
free((char *)ptr);
@@ -1816,7 +1816,7 @@ static struct pid {
int pid;
} *pidlist;
-pointer
+void *
Popen(char *command, char *type)
{
struct pid *cur;
@@ -1953,7 +1953,7 @@ Popen(char *command, char *type)
}
/* fopen that drops privileges */
-pointer
+void *
Fopen(char *file, char *type)
{
FILE *iop;
@@ -2047,7 +2047,7 @@ Fopen(char *file, char *type)
}
int
-Pclose(pointer iop)
+Pclose(void * iop)
{
struct pid *cur, *last;
int pstat;
@@ -2087,7 +2087,7 @@ Pclose(pointer iop)
}
int
-Fclose(pointer iop)
+Fclose(void * iop)
{
#ifdef HAS_SAVED_IDS_AND_SETEUID
return fclose(iop);
diff --git a/nx-X11/programs/Xserver/os/xalloc.c b/nx-X11/programs/Xserver/os/xalloc.c
index e1cdbfc5b..a2487d4bc 100644
--- a/nx-X11/programs/Xserver/os/xalloc.c
+++ b/nx-X11/programs/Xserver/os/xalloc.c
@@ -466,10 +466,10 @@ Xalloc (unsigned long amount)
* "no failure" realloc, alternate interface to Xalloc w/o Must_have_memory
*****************/
-pointer
+void *
XNFalloc (unsigned long amount)
{
- register pointer ptr;
+ register void * ptr;
/* zero size requested */
if (amount == 0) {
@@ -499,10 +499,10 @@ XNFalloc (unsigned long amount)
* Xcalloc
*****************/
-pointer
+void *
Xcalloc (unsigned long amount)
{
- pointer ret;
+ void * ret;
ret = Xalloc (amount);
if (ret != 0
@@ -520,7 +520,7 @@ Xcalloc (unsigned long amount)
void *
XNFcalloc (unsigned long amount)
{
- pointer ret;
+ void * ret;
ret = XNFalloc (amount);
if (ret != 0
@@ -537,7 +537,7 @@ XNFcalloc (unsigned long amount)
*****************/
void *
-Xrealloc (pointer ptr, unsigned long amount)
+Xrealloc (void * ptr, unsigned long amount)
{
register unsigned long *new_ptr;
@@ -614,9 +614,9 @@ Xrealloc (pointer ptr, unsigned long amount)
*****************/
void *
-XNFrealloc (pointer ptr, unsigned long amount)
+XNFrealloc (void * ptr, unsigned long amount)
{
- if (( ptr = (pointer)Xrealloc( ptr, amount ) ) == NULL)
+ if (( ptr = (void *)Xrealloc( ptr, amount ) ) == NULL)
{
FatalError( "Out of memory" );
}
@@ -629,7 +629,7 @@ XNFrealloc (pointer ptr, unsigned long amount)
*****************/
void
-Xfree(pointer ptr)
+Xfree(void * ptr)
{
unsigned long size;
unsigned long *pheader;
diff --git a/nx-X11/programs/Xserver/os/xdmcp.c b/nx-X11/programs/Xserver/os/xdmcp.c
index 032d58f15..675e9c456 100644
--- a/nx-X11/programs/Xserver/os/xdmcp.c
+++ b/nx-X11/programs/Xserver/os/xdmcp.c
@@ -223,14 +223,14 @@ static void timeout(void);
static void restart(void);
static void XdmcpBlockHandler(
- pointer /*data*/,
+ void * /*data*/,
struct timeval ** /*wt*/,
- pointer /*LastSelectMask*/);
+ void * /*LastSelectMask*/);
static void XdmcpWakeupHandler(
- pointer /*data*/,
+ void * /*data*/,
int /*i*/,
- pointer /*LastSelectMask*/);
+ void * /*LastSelectMask*/);
void XdmcpRegisterManufacturerDisplayID(
char * /*name*/,
@@ -623,7 +623,7 @@ XdmcpInit(void)
XdmcpRegisterDisplayClass (defaultDisplayClass, strlen (defaultDisplayClass));
AccessUsingXdmcp();
RegisterBlockAndWakeupHandlers (XdmcpBlockHandler, XdmcpWakeupHandler,
- (pointer) 0);
+ (void *) 0);
timeOutRtx = 0;
DisplayNumber = (CARD16) atoi(display);
get_xdmcp_sock();
@@ -638,7 +638,7 @@ XdmcpReset (void)
if (state != XDM_OFF)
{
RegisterBlockAndWakeupHandlers (XdmcpBlockHandler, XdmcpWakeupHandler,
- (pointer) 0);
+ (void *) 0);
timeOutRtx = 0;
send_packet();
}
@@ -683,9 +683,9 @@ XdmcpCloseDisplay(int sock)
/*ARGSUSED*/
static void
XdmcpBlockHandler(
- pointer data, /* unused */
+ void * data, /* unused */
struct timeval **wt,
- pointer pReadmask)
+ void * pReadmask)
{
fd_set *LastSelectMask = (fd_set*)pReadmask;
CARD32 millisToGo;
@@ -714,9 +714,9 @@ XdmcpBlockHandler(
/*ARGSUSED*/
static void
XdmcpWakeupHandler(
- pointer data, /* unused */
+ void * data, /* unused */
int i,
- pointer pReadmask)
+ void * pReadmask)
{
fd_set* LastSelectMask = (fd_set*)pReadmask;
fd_set devicesReadable;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 06:25:06 +0000