Skip to content

N
nx-libs
Unverified Commit 1dbd3c88 authored by Mike Gabriel's avatar Mike Gabriel
Browse files
Options

Merge branch 'sunweaver-pr/backport-Xorg-memory-handling' into 3.6.x

Attributes GH PR #159: https://github.com/ArcticaProject/nx-libs/pull/159 Reviewed by: Vadim Troshchinskiy <vadim@qindel.com> -- Fri, 01 Jul 2016 12:47:46 -0700
parents 279d3712 e8580824
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 668 additions and 711 deletions
debian/patches/016_nx-X11_install-location.debian.patch
View file @ 1dbd3c88
......@@ -6,7 +6,7 @@ Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Last-Update: 2012-12-31
--- a/nx-X11/config/cf/Imake.tmpl
+++ b/nx-X11/config/cf/Imake.tmpl
@@ -776,7 +776,7 @@
@@ -749,7 +749,7 @@
#define AlternateUsrLibDir YES
#endif
#else
......
debian/patches/102_xserver-xext_set-securitypolicy-path.debian.patch
View file @ 1dbd3c88
......@@ -8,7 +8,7 @@ Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Last-Update: 2012-01-12
--- a/nx-X11/programs/Xserver/Xext/security.c
+++ b/nx-X11/programs/Xserver/Xext/security.c
@@ -78,7 +78,7 @@
@@ -79,7 +79,7 @@
#ifdef NXAGENT_SERVER
......
doc/nx-X11_vs_XOrg69_patches/nx-X11_lib_xtrans_Xtranssock.c.X.original
View file @ 1dbd3c88
......@@ -312,7 +312,7 @@
+ fprintf(stderr, "SocketCreateConnInfo: Going to create the NX connection info.\n");
+#endif
+
+ if ((ciptr = (XtransConnInfo) xcalloc (1, sizeof(struct _XtransConnInfo))) == NULL)
+ if ((ciptr = (XtransConnInfo) calloc (1, sizeof(struct _XtransConnInfo))) == NULL)
+ {
+ PRMSG (1, "SocketCreateConnInfo: malloc failed\n", 0, 0, 0);
+ return NULL;
......
doc/nx-X11_vs_XOrg69_patches/randr.NX.diff
View file @ 1dbd3c88
......@@ -565,7 +565,7 @@ diff -u ./nx-X11/programs/Xserver/randr.X.original/randr.c ./nx-X11/programs/Xse
+ return FALSE;
- pScrPriv = (rrScrPrivPtr) xalloc (sizeof (rrScrPrivRec));
+ pScrPriv = (rrScrPrivPtr) xcalloc (1, sizeof (rrScrPrivRec));
+ pScrPriv = (rrScrPrivPtr) calloc (1, sizeof (rrScrPrivRec));
if (!pScrPriv)
return FALSE;
......
nx-X11/config/cf/X11.tmpl
View file @ 1dbd3c88
......@@ -336,15 +336,6 @@ XORGRELSTRING = XorgManVersionString
#ifndef UseMemLeak
#define UseMemLeak NO
#endif
#ifndef SpecialMalloc
#define SpecialMalloc NO
#endif
#ifndef UseInternalMalloc
#define UseInternalMalloc NO
#endif
#ifndef XallocDefines
#define XallocDefines /**/
#endif
#ifndef ServerErrorDefines
#define ServerErrorDefines /**/
#endif
......
nx-X11/config/cf/host.def
View file @ 1dbd3c88
......@@ -291,12 +291,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
*/
/*
* To enable the internal Xserver malloc, uncomment this
*
#define UseInternalMalloc YES
*/
/*
* Some Linux releases don't have a libtermcap. In this case you may need
* to uncomment the following
*
......
nx-X11/config/cf/lnxLib.rules
View file @ 1dbd3c88
......@@ -17,17 +17,6 @@ XCOMM $XFree86: xc/config/cf/lnxLib.rules,v 3.52 2003/10/31 20:49:03 herrb Exp $
#if UseElfFormat
# if (LinuxCLibMajorVersion >= 5 && LinuxCLibMinorVersion >= 4) || LinuxCLibMajorVersion >= 6
# ifndef SpecialMalloc
# define SpecialMalloc NO
# endif
#if 0
# ifndef UseInternalMalloc
# define UseInternalMalloc NO
# endif
#endif
# endif
# if LinuxCLibMajorVersion <= 5
/*
* #define BaseShLibReqs -lc
......
nx-X11/config/cf/xorg.cf
View file @ 1dbd3c88
......@@ -512,10 +512,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
# endif
#endif
#ifndef UseInternalMalloc
# define UseInternalMalloc NO
#endif
#ifndef HasDlsymBug
# define HasDlsymBug NO
#endif
......
nx-X11/config/cf/xorgsite.def
View file @ 1dbd3c88
......@@ -163,25 +163,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
*/
/*
* If you want to use the GNU malloc library, uncomment this
*
#define UseGnuMalloc YES
*/
/*
* Set this to whatever is required to access the GNU malloc library.
* The default is '-lgmalloc' unless is specified in the OS's .cf file.
*
#define GnuMallocLibrary -L/usr/local/lib -lgmalloc
*/
/*
* To enable the internal Xserver malloc, uncomment this
*
#define UseInternalMalloc YES
*/
/*
* Some Linux releases don't have a libtermcap. In this case you may need
* to uncomment the following
*
......
nx-X11/include/Xthreads.h
View file @ 1dbd3c88
......@@ -33,12 +33,6 @@ in this Software without prior written authorization from The Open Group.
/* Redefine these to XtMalloc/XtFree or whatever you want before including
* this header file.
*/
#ifndef xmalloc
#define xmalloc malloc
#endif
#ifndef xfree
#define xfree free
#endif
#ifdef CTHREADS
#include <cthreads.h>
......@@ -282,16 +276,16 @@ static xthread_t _X_no_thread_id;
typedef xcondition_rec *xcondition_t;
typedef xmutex_rec *xmutex_t;
#ifndef xcondition_malloc
#define xcondition_malloc() (xcondition_t)xmalloc(sizeof(xcondition_rec))
#define xcondition_malloc() (xcondition_t)malloc(sizeof(xcondition_rec))
#endif
#ifndef xcondition_free
#define xcondition_free(c) xfree((char *)c)
#define xcondition_free(c) free((char *)c)
#endif
#ifndef xmutex_malloc
#define xmutex_malloc() (xmutex_t)xmalloc(sizeof(xmutex_rec))
#define xmutex_malloc() (xmutex_t)malloc(sizeof(xmutex_rec))
#endif
#ifndef xmutex_free
#define xmutex_free(m) xfree((char *)m)
#define xmutex_free(m) free((char *)m)
#endif
#ifndef xthread_have_id
#define xthread_have_id(id) id
......
nx-X11/include/extensions/XKBsrv.h
View file @ 1dbd3c88
......@@ -299,16 +299,32 @@ extern void * XkbLastRepeatEvent;
extern CARD32 xkbDebugFlags;
extern CARD32 xkbDebugCtrls;
#define _XkbAlloc(s) xalloc((s))
#ifndef XKB_IN_SERVER
#define _XkbAlloc(s) Xalloc((s))
#define _XkbCalloc(n,s) Xcalloc((n)*(s))
#define _XkbRealloc(o,s) Xrealloc((o),(s))
#define _XkbTypedAlloc(t) ((t *)xalloc(sizeof(t)))
#define _XkbTypedAlloc(t) ((t *)Xalloc(sizeof(t)))
#define _XkbTypedCalloc(n,t) ((t *)Xcalloc((n)*sizeof(t)))
#define _XkbTypedRealloc(o,n,t) \
((o)?(t *)Xrealloc((o),(n)*sizeof(t)):_XkbTypedCalloc(n,t))
#define _XkbClearElems(a,f,l,t) bzero(&(a)[f],((l)-(f)+1)*sizeof(t))
#define _XkbFree(p) Xfree(p)
#else
#define _XkbAlloc(s) malloc((s))
#define _XkbCalloc(n,s) calloc((n), (s))
#define _XkbRealloc(o,s) realloc((o),(s))
#define _XkbTypedAlloc(t) ((t *)malloc(sizeof(t)))
#define _XkbTypedCalloc(n,t) ((t *)calloc((n), sizeof(t)))
#define _XkbTypedRealloc(o,n,t) \
((o)?(t *)realloc((o),(n)*sizeof(t)):_XkbTypedCalloc(n,t))
#define _XkbClearElems(a,f,l,t) bzero(&(a)[f],((l)-(f)+1)*sizeof(t))
#define _XkbFree(p) free(p)
#endif /* !XKB_IN_SERVER */
#define _XkbLibError(c,l,d) \
{ _XkbErrCode= (c); _XkbErrLocation= (l); _XkbErrData= (d); }
#define _XkbErrCode2(a,b) ((XID)((((unsigned int)(a))<<24)|((b)&0xffffff)))
......
nx-X11/lib/xtrans/Xtrans.c
View file @ 1dbd3c88
......@@ -145,15 +145,15 @@ TRANS(FreeConnInfo) (XtransConnInfo ciptr)
PRMSG (3,"FreeConnInfo(%p)\n", ciptr, 0, 0);
if (ciptr->addr)
xfree (ciptr->addr);
free (ciptr->addr);
if (ciptr->peeraddr)
xfree (ciptr->peeraddr);
free (ciptr->peeraddr);
if (ciptr->port)
xfree (ciptr->port);
free (ciptr->port);
xfree ((char *) ciptr);
free ((char *) ciptr);
}
......@@ -221,7 +221,7 @@ TRANS(ParseAddress) (char *address, char **protocol, char **host, char **port)
/* Copy the string so it can be changed */
tmpptr = mybuf = (char *) xalloc (strlen (address) + 1);
tmpptr = mybuf = (char *) malloc (strlen (address) + 1);
strcpy (mybuf, address);
/* Parse the string to get each component */
......@@ -238,7 +238,7 @@ TRANS(ParseAddress) (char *address, char **protocol, char **host, char **port)
*protocol = NULL;
*host = NULL;
*port = NULL;
xfree (tmpptr);
free (tmpptr);
return 0;
}
......@@ -288,7 +288,7 @@ TRANS(ParseAddress) (char *address, char **protocol, char **host, char **port)
*protocol = NULL;
*host = NULL;
*port = NULL;
xfree (tmpptr);
free (tmpptr);
return 0;
}
......@@ -362,46 +362,46 @@ TRANS(ParseAddress) (char *address, char **protocol, char **host, char **port)
* string space for them.
*/
if ((*protocol = (char *) xalloc(strlen (_protocol) + 1)) == NULL)
if ((*protocol = (char *) malloc(strlen (_protocol) + 1)) == NULL)
{
/* Malloc failed */
*port = NULL;
*host = NULL;
*protocol = NULL;
xfree (tmpptr);
free (tmpptr);
return 0;
}
else
strcpy (*protocol, _protocol);
if ((*host = (char *) xalloc (strlen (_host) + 1)) == NULL)
if ((*host = (char *) malloc (strlen (_host) + 1)) == NULL)
{
/* Malloc failed */
*port = NULL;
*host = NULL;
xfree (*protocol);
free (*protocol);
*protocol = NULL;
xfree (tmpptr);
free (tmpptr);
return 0;
}
else
strcpy (*host, _host);
if ((*port = (char *) xalloc (strlen (_port) + 1)) == NULL)
if ((*port = (char *) malloc (strlen (_port) + 1)) == NULL)
{
/* Malloc failed */
*port = NULL;
xfree (*host);
free (*host);
*host = NULL;
xfree (*protocol);
free (*protocol);
*protocol = NULL;
xfree (tmpptr);
free (tmpptr);
return 0;
}
else
strcpy (*port, _port);
xfree (tmpptr);
free (tmpptr);
return 1;
}
......@@ -446,9 +446,9 @@ TRANS(Open) (int type, char *address)
PRMSG (1,"Open: Unable to find transport for %s\n",
protocol, 0, 0);
xfree (protocol);
xfree (host);
xfree (port);
free (protocol);
free (host);
free (port);
return NULL;
}
......@@ -487,17 +487,17 @@ TRANS(Open) (int type, char *address)
PRMSG (1,"Open: transport open failed for %s/%s:%s\n",
protocol, host, port);
}
xfree (protocol);
xfree (host);
xfree (port);
free (protocol);
free (host);
free (port);
return NULL;
}
ciptr->transptr = thistrans;
ciptr->port = port; /* We need this for TRANS(Reopen) */
xfree (protocol);
xfree (host);
free (protocol);
free (host);
return ciptr;
}
......@@ -539,7 +539,7 @@ TRANS(Reopen) (int type, int trans_id, int fd, char *port)
return NULL;
}
if ((save_port = (char *) xalloc (strlen (port) + 1)) == NULL)
if ((save_port = (char *) malloc (strlen (port) + 1)) == NULL)
{
PRMSG (1,"Reopen: Unable to malloc port string\n", 0, 0, 0);
......@@ -668,7 +668,7 @@ TRANS(GetReopenInfo) (XtransConnInfo ciptr,
*trans_id = Xtransports[i].transport_id;
*fd = ciptr->fd;
if ((*port = (char *) xalloc (strlen (ciptr->port) + 1)) == NULL)
if ((*port = (char *) malloc (strlen (ciptr->port) + 1)) == NULL)
return 0;
else
{
......@@ -859,16 +859,16 @@ TRANS(Connect) (XtransConnInfo ciptr, char *address)
{
PRMSG (1,"Connect: Missing port specification in %s\n",
address, 0, 0);
if (protocol) xfree (protocol);
if (host) xfree (host);
if (protocol) free (protocol);
if (host) free (host);
return -1;
}
ret = ciptr->transptr->Connect (ciptr, host, port);
if (protocol) xfree (protocol);
if (host) xfree (host);
if (port) xfree (port);
if (protocol) free (protocol);
if (host) free (host);
if (port) free (port);
return ret;
}
......@@ -966,7 +966,7 @@ TRANS(GetMyAddr) (XtransConnInfo ciptr, int *familyp, int *addrlenp,
*familyp = ciptr->family;
*addrlenp = ciptr->addrlen;
if ((*addrp = (Xtransaddr *) xalloc (ciptr->addrlen)) == NULL)
if ((*addrp = (Xtransaddr *) malloc (ciptr->addrlen)) == NULL)
{
PRMSG (1,"GetMyAddr: malloc failed\n", 0, 0, 0);
return -1;
......@@ -986,7 +986,7 @@ TRANS(GetPeerAddr) (XtransConnInfo ciptr, int *familyp, int *addrlenp,
*familyp = ciptr->family;
*addrlenp = ciptr->peeraddrlen;
if ((*addrp = (Xtransaddr *) xalloc (ciptr->peeraddrlen)) == NULL)
if ((*addrp = (Xtransaddr *) malloc (ciptr->peeraddrlen)) == NULL)
{
PRMSG (1,"GetPeerAddr: malloc failed\n", 0, 0, 0);
return -1;
......@@ -1141,7 +1141,7 @@ TRANS(MakeAllCOTSServerListeners) (char *port, int *partial, int *count_ret,
if (*count_ret > 0)
{
if ((*ciptrs_ret = (XtransConnInfo *) xalloc (
if ((*ciptrs_ret = (XtransConnInfo *) malloc (
*count_ret * sizeof (XtransConnInfo))) == NULL)
{
return -1;
......@@ -1239,7 +1239,7 @@ TRANS(MakeAllCLTSServerListeners) (char *port, int *partial, int *count_ret,
if (*count_ret > 0)
{
if ((*ciptrs_ret = (XtransConnInfo *) xalloc (
if ((*ciptrs_ret = (XtransConnInfo *) malloc (
*count_ret * sizeof (XtransConnInfo))) == NULL)
{
return -1;
......
nx-X11/lib/xtrans/Xtransdnet.c
View file @ 1dbd3c88
......@@ -121,7 +121,7 @@ TRANS(DNETGetAddr) (XtransConnInfo ciptr)
* Everything looks good: fill in the XtransConnInfo structure.
*/
if ((ciptr->addr = (char *) xalloc (namelen)) == NULL)
if ((ciptr->addr = (char *) malloc (namelen)) == NULL)
{
PRMSG (1, "DNETGetAddr: Can't allocate space for the addr\n",
0, 0, 0);
......@@ -161,7 +161,7 @@ TRANS(DNETGetPeerAddr) (XtransConnInfo ciptr)
* Everything looks good: fill in the XtransConnInfo structure.
*/
if ((ciptr->peeraddr = (char *) xalloc (namelen)) == NULL)
if ((ciptr->peeraddr = (char *) malloc (namelen)) == NULL)
{
PRMSG (1,
"DNETGetPeerAddr: Can't allocate space for the addr\n",
......@@ -187,7 +187,7 @@ TRANS(DNETOpenCOTSClient) (Xtransport *thistrans, char *protocol,
PRMSG (2,"DNETOpenCOTSClient(%s,%s,%s)\n", protocol, host, port);
if ((ciptr = (XtransConnInfo) xcalloc (
if ((ciptr = (XtransConnInfo) calloc (
1, sizeof(struct _XtransConnInfo))) == NULL)
{
PRMSG (1, "DNETOpenCOTSClient: malloc failed\n", 0, 0, 0);
......@@ -215,7 +215,7 @@ TRANS(DNETOpenCOTSServer) (Xtransport *thistrans, char *protocol,
PRMSG (2,"DNETOpenCOTSServer(%s,%s,%s)\n", protocol, host, port);
if ((ciptr = (XtransConnInfo) xcalloc (
if ((ciptr = (XtransConnInfo) calloc (
1, sizeof(struct _XtransConnInfo))) == NULL)
{
PRMSG (1, "DNETOpenCOTSServer: malloc failed\n", 0, 0, 0);
......@@ -224,7 +224,7 @@ TRANS(DNETOpenCOTSServer) (Xtransport *thistrans, char *protocol,
if ((ciptr->fd = socket (AF_DECnet, SOCK_STREAM, 0)) < 0)
{
xfree ((char *) ciptr);
free ((char *) ciptr);
return NULL;
}
......@@ -247,7 +247,7 @@ TRANS(DNETOpenCLTSClient) (Xtransport *thistrans, char *protocol,
PRMSG (2,"DNETOpenCLTSClient(%s,%s,%s)\n", protocol, host, port);
if ((ciptr = (XtransConnInfo) xcalloc (
if ((ciptr = (XtransConnInfo) calloc (
1, sizeof (struct _XtransConnInfo))) == NULL)
{
PRMSG (1, "DNETOpenCLTSClient: malloc failed\n", 0, 0, 0);
......@@ -290,7 +290,7 @@ TRANS(DNETReopenCOTSServer) (Xtransport *thistrans, int fd, char *port)
PRMSG (2,"DNETReopenCOTSServer(%d,%s)\n", fd, port, 0);
if ((ciptr = (XtransConnInfo) xcalloc (
if ((ciptr = (XtransConnInfo) calloc (
1, sizeof(struct _XtransConnInfo))) == NULL)
{
PRMSG (1, "DNETReopenCOTSServer: malloc failed\n", 0, 0, 0);
......@@ -311,7 +311,7 @@ TRANS(DNETReopenCLTSServer) (Xtransport *thistrans, int fd, char *port)
PRMSG (2,"DNETReopenCLTSServer(%d,%s)\n", fd, port, 0);
if ((ciptr = (XtransConnInfo) xcalloc (
if ((ciptr = (XtransConnInfo) calloc (
1, sizeof(struct _XtransConnInfo))) == NULL)
{
PRMSG (1, "DNETReopenCLTSServer: malloc failed\n", 0, 0, 0);
......@@ -393,7 +393,7 @@ TRANS(DNETAccept) (XtransConnInfo ciptr, int *status)
PRMSG (2, "DNETAccept(%x,%d)\n", ciptr, ciptr->fd, 0);
if ((newciptr = (XtransConnInfo) xcalloc(
if ((newciptr = (XtransConnInfo) calloc(
1, sizeof (struct _XtransConnInfo))) == NULL)
{
PRMSG (1, "DNETAccept: malloc failed\n", 0, 0, 0);
......@@ -406,7 +406,7 @@ TRANS(DNETAccept) (XtransConnInfo ciptr, int *status)
{
PRMSG (1, "DNETAccept: accept() failed\n", 0, 0, 0);
xfree (newciptr);
free (newciptr);
*status = TRANS_ACCEPT_FAILED;
return NULL;
}
......@@ -421,7 +421,7 @@ TRANS(DNETAccept) (XtransConnInfo ciptr, int *status)
PRMSG(1,
"DNETAccept: ...DNETGetAddr() failed:\n", 0, 0, 0);
close (newciptr->fd);
xfree (newciptr);
free (newciptr);
*status = TRANS_ACCEPT_MISC_ERROR;
return NULL;
}
......@@ -432,8 +432,8 @@ TRANS(DNETAccept) (XtransConnInfo ciptr, int *status)
"DNETAccept: ...DNETGetPeerAddr() failed:\n", 0, 0, 0);
close (newciptr->fd);
if (newciptr->addr) xfree (newciptr->addr);
xfree (newciptr);
if (newciptr->addr) free (newciptr->addr);
free (newciptr);
*status = TRANS_ACCEPT_MISC_ERROR;
return NULL;
}
......
nx-X11/lib/xtrans/Xtranslcl.c
View file @ 1dbd3c88
......@@ -144,7 +144,7 @@ TRANS(FillAddrInfo)(XtransConnInfo ciptr, char *sun_path, char *peer_sun_path)
ciptr->family = AF_UNIX;
ciptr->addrlen = sizeof (struct sockaddr_un);
if ((sunaddr = (struct sockaddr_un *) xalloc (ciptr->addrlen)) == NULL)
if ((sunaddr = (struct sockaddr_un *) malloc (ciptr->addrlen)) == NULL)
{
PRMSG(1,"FillAddrInfo: failed to allocate memory for addr\n", 0, 0, 0);
return 0;
......@@ -165,13 +165,13 @@ TRANS(FillAddrInfo)(XtransConnInfo ciptr, char *sun_path, char *peer_sun_path)
ciptr->peeraddrlen = sizeof (struct sockaddr_un);
if ((p_sunaddr = (struct sockaddr_un *) xalloc (
if ((p_sunaddr = (struct sockaddr_un *) malloc (
ciptr->peeraddrlen)) == NULL)
{
PRMSG(1,
"FillAddrInfo: failed to allocate memory for peer addr\n",
0,0,0);
xfree ((char *) sunaddr);
free ((char *) sunaddr);
ciptr->addr = NULL;
return 0;
......@@ -596,7 +596,7 @@ TRANS(PTSAccept)(XtransConnInfo ciptr, XtransConnInfo newciptr, int *status)
*/
newciptr->addrlen=ciptr->addrlen;
if( (newciptr->addr=(char *)xalloc(newciptr->addrlen)) == NULL ) {
if( (newciptr->addr=(char *)malloc(newciptr->addrlen)) == NULL ) {
PRMSG(1,"PTSAccept: failed to allocate memory for peer addr\n",
0,0,0);
close(newfd);
......@@ -607,10 +607,10 @@ TRANS(PTSAccept)(XtransConnInfo ciptr, XtransConnInfo newciptr, int *status)
memcpy(newciptr->addr,ciptr->addr,newciptr->addrlen);
newciptr->peeraddrlen=sizeof(struct sockaddr_un);
if( (sunaddr=(struct sockaddr_un *)xalloc(newciptr->peeraddrlen)) == NULL ) {
if( (sunaddr=(struct sockaddr_un *)malloc(newciptr->peeraddrlen)) == NULL ) {
PRMSG(1,"PTSAccept: failed to allocate memory for peer addr\n",
0,0,0);
xfree(newciptr->addr);
free(newciptr->addr);
close(newfd);
*status = TRANS_ACCEPT_BAD_MALLOC;
return -1;
......@@ -818,7 +818,7 @@ TRANS(NAMEDAccept)(XtransConnInfo ciptr, XtransConnInfo newciptr, int *status)
*/
newciptr->addrlen=ciptr->addrlen;
if( (newciptr->addr=(char *)xalloc(newciptr->addrlen)) == NULL ) {
if( (newciptr->addr=(char *)malloc(newciptr->addrlen)) == NULL ) {
PRMSG(1,
"NAMEDAccept: failed to allocate memory for peer addr\n",
0,0,0);
......@@ -830,11 +830,11 @@ TRANS(NAMEDAccept)(XtransConnInfo ciptr, XtransConnInfo newciptr, int *status)
memcpy(newciptr->addr,ciptr->addr,newciptr->addrlen);
newciptr->peeraddrlen=newciptr->addrlen;
if( (newciptr->peeraddr=(char *)xalloc(newciptr->peeraddrlen)) == NULL ) {
if( (newciptr->peeraddr=(char *)malloc(newciptr->peeraddrlen)) == NULL ) {
PRMSG(1,
"NAMEDAccept: failed to allocate memory for peer addr\n",
0,0,0);
xfree(newciptr->addr);
free(newciptr->addr);
close(str.fd);
*status = TRANS_ACCEPT_BAD_MALLOC;
return -1;
......@@ -1162,7 +1162,7 @@ TRANS(ISCAccept)(XtransConnInfo ciptr, XtransConnInfo newciptr, int *status)
*/
newciptr->addrlen=ciptr->addrlen;
if( (newciptr->addr=(char *)xalloc(newciptr->addrlen)) == NULL ) {
if( (newciptr->addr=(char *)malloc(newciptr->addrlen)) == NULL ) {
PRMSG(1,
"ISCAccept: failed to allocate memory for peer addr\n",
0,0,0);
......@@ -1174,11 +1174,11 @@ TRANS(ISCAccept)(XtransConnInfo ciptr, XtransConnInfo newciptr, int *status)
memcpy(newciptr->addr,ciptr->addr,newciptr->addrlen);
newciptr->peeraddrlen=newciptr->addrlen;
if( (newciptr->peeraddr=(char *)xalloc(newciptr->peeraddrlen)) == NULL ) {
if( (newciptr->peeraddr=(char *)malloc(newciptr->peeraddrlen)) == NULL ) {
PRMSG(1,
"ISCAccept: failed to allocate memory for peer addr\n",
0,0,0);
xfree(newciptr->addr);
free(newciptr->addr);
close(str.fd);
*status = TRANS_ACCEPT_BAD_MALLOC;
return -1;
......@@ -1436,7 +1436,7 @@ TRANS(SCOAccept)(XtransConnInfo ciptr, XtransConnInfo newciptr, int *status)
*/
newciptr->addrlen=ciptr->addrlen;
if( (newciptr->addr=(char *)xalloc(newciptr->addrlen)) == NULL ) {
if( (newciptr->addr=(char *)malloc(newciptr->addrlen)) == NULL ) {
PRMSG(1,
"SCOAccept: failed to allocate memory for peer addr\n",
0,0,0);
......@@ -1451,11 +1451,11 @@ TRANS(SCOAccept)(XtransConnInfo ciptr, XtransConnInfo newciptr, int *status)
#endif
newciptr->peeraddrlen=newciptr->addrlen;
if( (newciptr->peeraddr=(char *)xalloc(newciptr->peeraddrlen)) == NULL ) {
if( (newciptr->peeraddr=(char *)malloc(newciptr->peeraddrlen)) == NULL ) {
PRMSG(1,
"SCOAccept: failed to allocate memory for peer addr\n",
0,0,0);
xfree(newciptr->addr);
free(newciptr->addr);
close(fd);
*status = TRANS_ACCEPT_BAD_MALLOC;
return -1;
......@@ -1894,7 +1894,7 @@ TRANS(LocalInitTransports)(char *protocol)
if( strcmp(protocol,"local") && strcmp(protocol,"LOCAL") )
{
workingXLOCAL=freeXLOCAL=(char *)xalloc (strlen (protocol) + 1);
workingXLOCAL=freeXLOCAL=(char *)malloc (strlen (protocol) + 1);
if (workingXLOCAL)
strcpy (workingXLOCAL, protocol);
}
......@@ -1902,7 +1902,7 @@ TRANS(LocalInitTransports)(char *protocol)
XLOCAL=(char *)getenv("XLOCAL");
if(XLOCAL==NULL)
XLOCAL=DEF_XLOCAL;
workingXLOCAL=freeXLOCAL=(char *)xalloc (strlen (XLOCAL) + 1);
workingXLOCAL=freeXLOCAL=(char *)malloc (strlen (XLOCAL) + 1);
if (workingXLOCAL)
strcpy (workingXLOCAL, XLOCAL);
}
......@@ -1913,7 +1913,7 @@ TRANS(LocalEndTransports)(void)
{
PRMSG(3,"LocalEndTransports()\n", 0,0,0 );
xfree(freeXLOCAL);
free(freeXLOCAL);
}
#define TYPEBUFSIZE 32
......@@ -2038,7 +2038,7 @@ TRANS(LocalOpenClient)(int type, char *protocol, char *host, char *port)
*/
#endif /* X11_t */
if( (ciptr=(XtransConnInfo)xcalloc(1,sizeof(struct _XtransConnInfo))) == NULL )
if( (ciptr=(XtransConnInfo)calloc(1,sizeof(struct _XtransConnInfo))) == NULL )
{
PRMSG(1,"LocalOpenClient: calloc(1,%d) failed\n",
sizeof(struct _XtransConnInfo),0,0 );
......@@ -2080,7 +2080,7 @@ TRANS(LocalOpenClient)(int type, char *protocol, char *host, char *port)
if( ciptr->fd < 0 )
{
xfree(ciptr);
free(ciptr);
return NULL;
}
......@@ -2113,7 +2113,7 @@ TRANS(LocalOpenServer)(int type, char *protocol, char *host, char *port)
*/
#endif /* X11_t */
if( (ciptr=(XtransConnInfo)xcalloc(1,sizeof(struct _XtransConnInfo))) == NULL )
if( (ciptr=(XtransConnInfo)calloc(1,sizeof(struct _XtransConnInfo))) == NULL )
{
PRMSG(1,"LocalOpenServer: calloc(1,%d) failed\n",
sizeof(struct _XtransConnInfo),0,0 );
......@@ -2150,7 +2150,7 @@ TRANS(LocalOpenServer)(int type, char *protocol, char *host, char *port)
}
}
xfree(ciptr);
free(ciptr);
return NULL;
}
......@@ -2168,7 +2168,7 @@ TRANS(LocalReopenServer)(int type, int index, int fd, char *port)
PRMSG(2,"LocalReopenServer(%d,%d,%d)\n", type, index, fd);
if( (ciptr=(XtransConnInfo)xcalloc(1,sizeof(struct _XtransConnInfo))) == NULL )
if( (ciptr=(XtransConnInfo)calloc(1,sizeof(struct _XtransConnInfo))) == NULL )
{
PRMSG(1,"LocalReopenServer: calloc(1,%d) failed\n",
sizeof(struct _XtransConnInfo),0,0 );
......@@ -2197,7 +2197,7 @@ TRANS(LocalReopenServer)(int type, int index, int fd, char *port)
return ciptr;
}
xfree(ciptr);
free(ciptr);
return NULL;
}
......@@ -2384,7 +2384,7 @@ TRANS(LocalAccept)(XtransConnInfo ciptr, int *status)
transptr=(LOCALtrans2dev *)ciptr->priv;
if( (newciptr=(XtransConnInfo)xcalloc(1,sizeof(struct _XtransConnInfo)))==NULL )
if( (newciptr=(XtransConnInfo)calloc(1,sizeof(struct _XtransConnInfo)))==NULL )
{
PRMSG(1,"LocalAccept: calloc(1,%d) failed\n",
sizeof(struct _XtransConnInfo),0,0 );
......@@ -2396,7 +2396,7 @@ TRANS(LocalAccept)(XtransConnInfo ciptr, int *status)
if( newciptr->fd < 0 )
{
xfree(newciptr);
free(newciptr);
return NULL;
}
......
nx-X11/lib/xtrans/Xtranssock.c
View file @ 1dbd3c88
......@@ -601,7 +601,7 @@ static XtransConnInfo TRANS(SocketCreateConnInfo) ()
fprintf(stderr, "SocketCreateConnInfo: Going to create the NX connection info.\n");
#endif
if ((ciptr = (XtransConnInfo) xcalloc (1, sizeof(struct _XtransConnInfo))) == NULL)
if ((ciptr = (XtransConnInfo) calloc (1, sizeof(struct _XtransConnInfo))) == NULL)
{
PRMSG (1, "SocketCreateConnInfo: malloc failed\n", 0, 0, 0);
return NULL;
......@@ -619,7 +619,7 @@ static XtransConnInfo TRANS(SocketCreateConnInfo) ()
if (socketpair(PF_LOCAL, SOCK_STREAM, 0, fds) < 0)
{
PRMSG (1, "SocketCreateConnInfo: socketpair() failed.\n", 0, 0, 0);
xfree ((char *) ciptr);
free ((char *) ciptr);
return NULL;
}
......@@ -643,7 +643,7 @@ static XtransConnInfo TRANS(SocketCreateConnInfo) ()
{
PRMSG (1, "SocketCreateConnInfo: No space for a new _NXProxyConnInfo for [%d].\n",
ciptr->fd, 0, 0);
xfree ((char *) ciptr);
free ((char *) ciptr);
return NULL;
}
else if (_NXProxyConnInfoTab[ciptr->fd] != NULL)
......@@ -653,12 +653,12 @@ static XtransConnInfo TRANS(SocketCreateConnInfo) ()
exit(1);
}
_NXProxyConnInfoTab[ciptr->fd] = (_NXProxyConnInfo *) xcalloc(1, sizeof(_NXProxyConnInfo));
_NXProxyConnInfoTab[ciptr->fd] = (_NXProxyConnInfo *) calloc(1, sizeof(_NXProxyConnInfo));
if (_NXProxyConnInfoTab[ciptr->fd] == NULL)
{
PRMSG (1, "SocketCreateConnInfo: Alloc of _NXProxyConnInfo failed.\n", 0, 0, 0);
xfree ((char *) ciptr);
free ((char *) ciptr);
return NULL;
}
......@@ -812,7 +812,7 @@ static void TRANS(SocketCloseConnInfo) (XtransConnInfo ciptr)
ciptr->fd);
#endif
xfree((char *) _NXProxyConnInfoTab[ciptr->fd]);
free((char *) _NXProxyConnInfoTab[ciptr->fd]);
_NXProxyConnInfoTab[ciptr->fd] = NULL;
......@@ -957,7 +957,7 @@ TRANS(SocketINETGetAddr) (XtransConnInfo ciptr)
* Everything looks good: fill in the XtransConnInfo structure.
*/
if ((ciptr->addr = (char *) xalloc (namelen)) == NULL)
if ((ciptr->addr = (char *) malloc (namelen)) == NULL)
{
PRMSG (1,
"SocketINETGetAddr: Can't allocate space for the addr\n",
......@@ -1032,7 +1032,7 @@ TRANS(SocketINETGetPeerAddr) (XtransConnInfo ciptr)
* Everything looks good: fill in the XtransConnInfo structure.
*/
if ((ciptr->peeraddr = (char *) xalloc (namelen)) == NULL)
if ((ciptr->peeraddr = (char *) malloc (namelen)) == NULL)
{
PRMSG (1,
"SocketINETGetPeerAddr: Can't allocate space for the addr\n",
......@@ -1063,7 +1063,7 @@ TRANS(SocketOpen) (int i, int type)
return NULL;
#endif
if ((ciptr = (XtransConnInfo) xcalloc (
if ((ciptr = (XtransConnInfo) calloc (
1, sizeof(struct _XtransConnInfo))) == NULL)
{
PRMSG (1, "SocketOpen: malloc failed\n", 0, 0, 0);
......@@ -1084,7 +1084,7 @@ TRANS(SocketOpen) (int i, int type)
PRMSG (2, "SocketOpen: socket() failed for %s\n",
Sockettrans2devtab[i].transname, 0, 0);
xfree ((char *) ciptr);
free ((char *) ciptr);
return NULL;
}
......@@ -1119,7 +1119,7 @@ TRANS(SocketReopen) (int i, int type, int fd, char *port)
PRMSG (3,"SocketReopen(%d,%d,%s)\n", type, fd, port);
if ((ciptr = (XtransConnInfo) xcalloc (
if ((ciptr = (XtransConnInfo) calloc (
1, sizeof(struct _XtransConnInfo))) == NULL)
{
PRMSG (1, "SocketReopen: malloc failed\n", 0, 0, 0);
......@@ -1834,7 +1834,7 @@ TRANS(SocketUNIXCreateListener) (XtransConnInfo ciptr, char *port,
namelen = sizeof (sockname); /* this will always make it the same size */
if ((ciptr->addr = (char *) xalloc (namelen)) == NULL)
if ((ciptr->addr = (char *) malloc (namelen)) == NULL)
{
PRMSG (1,
"SocketUNIXCreateListener: Can't allocate space for the addr\n",
......@@ -1953,7 +1953,7 @@ TRANS(SocketINETAccept) (XtransConnInfo ciptr, int *status)
PRMSG (2, "SocketINETAccept(%p,%d)\n", ciptr, ciptr->fd, 0);
if ((newciptr = (XtransConnInfo) xcalloc (
if ((newciptr = (XtransConnInfo) calloc (
1, sizeof(struct _XtransConnInfo))) == NULL)
{
PRMSG (1, "SocketINETAccept: malloc failed\n", 0, 0, 0);
......@@ -1968,7 +1968,7 @@ TRANS(SocketINETAccept) (XtransConnInfo ciptr, int *status)
errno = WSAGetLastError();
#endif
PRMSG (1, "SocketINETAccept: accept() failed\n", 0, 0, 0);
xfree (newciptr);
free (newciptr);
*status = TRANS_ACCEPT_FAILED;
return NULL;
}
......@@ -1996,7 +1996,7 @@ TRANS(SocketINETAccept) (XtransConnInfo ciptr, int *status)
"SocketINETAccept: ...SocketINETGetAddr() failed:\n",
0, 0, 0);
close (newciptr->fd);
xfree (newciptr);
free (newciptr);
*status = TRANS_ACCEPT_MISC_ERROR;
return NULL;
}
......@@ -2007,8 +2007,8 @@ TRANS(SocketINETAccept) (XtransConnInfo ciptr, int *status)
"SocketINETAccept: ...SocketINETGetPeerAddr() failed:\n",
0, 0, 0);
close (newciptr->fd);
if (newciptr->addr) xfree (newciptr->addr);
xfree (newciptr);
if (newciptr->addr) free (newciptr->addr);
free (newciptr);
*status = TRANS_ACCEPT_MISC_ERROR;
return NULL;
}
......@@ -2036,7 +2036,7 @@ TRANS(SocketUNIXAccept) (XtransConnInfo ciptr, int *status)
PRMSG (2, "SocketUNIXAccept(%p,%d)\n", ciptr, ciptr->fd, 0);
if ((newciptr = (XtransConnInfo) xcalloc (
if ((newciptr = (XtransConnInfo) calloc (
1, sizeof(struct _XtransConnInfo))) == NULL)
{
PRMSG (1, "SocketUNIXAccept: malloc() failed\n", 0, 0, 0);
......@@ -2048,7 +2048,7 @@ TRANS(SocketUNIXAccept) (XtransConnInfo ciptr, int *status)
(struct sockaddr *) &sockname, (void *)&namelen)) < 0)
{
PRMSG (1, "SocketUNIXAccept: accept() failed\n", 0, 0, 0);
xfree (newciptr);
free (newciptr);
*status = TRANS_ACCEPT_FAILED;
return NULL;
}
......@@ -2058,13 +2058,13 @@ TRANS(SocketUNIXAccept) (XtransConnInfo ciptr, int *status)
* since this is unix domain.
*/
if ((newciptr->addr = (char *) xalloc (ciptr->addrlen)) == NULL)
if ((newciptr->addr = (char *) malloc (ciptr->addrlen)) == NULL)
{
PRMSG (1,
"SocketUNIXAccept: Can't allocate space for the addr\n",
0, 0, 0);
close (newciptr->fd);
xfree (newciptr);
free (newciptr);
*status = TRANS_ACCEPT_BAD_MALLOC;
return NULL;
}
......@@ -2078,14 +2078,14 @@ TRANS(SocketUNIXAccept) (XtransConnInfo ciptr, int *status)
newciptr->addrlen = ciptr->addrlen;
memcpy (newciptr->addr, ciptr->addr, newciptr->addrlen);
if ((newciptr->peeraddr = (char *) xalloc (ciptr->addrlen)) == NULL)
if ((newciptr->peeraddr = (char *) malloc (ciptr->addrlen)) == NULL)
{
PRMSG (1,
"SocketUNIXAccept: Can't allocate space for the addr\n",
0, 0, 0);
close (newciptr->fd);
if (newciptr->addr) xfree (newciptr->addr);
xfree (newciptr);
if (newciptr->addr) free (newciptr->addr);
free (newciptr);
*status = TRANS_ACCEPT_BAD_MALLOC;
return NULL;
}
......@@ -2263,7 +2263,7 @@ TRANS(SocketINETConnect) (XtransConnInfo ciptr, char *host, char *port)
" socketfor IPv4 address\n", 0,0,0);
}
if (newciptr)
xfree(newciptr);
free(newciptr);
} else {
socketaddr = NULL;
PRMSG (4,"SocketINETConnect Skipping IPv4 address\n",
......@@ -2301,7 +2301,7 @@ TRANS(SocketINETConnect) (XtransConnInfo ciptr, char *host, char *port)
"socket for IPv6 address\n", 0,0,0);
}
if (newciptr)
xfree(newciptr);
free(newciptr);
}
else
{
......@@ -2827,8 +2827,8 @@ SocketUNIXConnectPost:
* since this is unix domain.
*/
if ((ciptr->addr = (char *) xalloc(namelen)) == NULL ||
(ciptr->peeraddr = (char *) xalloc(namelen)) == NULL)
if ((ciptr->addr = (char *) malloc(namelen)) == NULL ||
(ciptr->peeraddr = (char *) malloc(namelen)) == NULL)
{
PRMSG (1,
"SocketUNIXCreateListener: Can't allocate space for the addr\n",
......
nx-X11/lib/xtrans/Xtranstli.c
View file @ 1dbd3c88
......@@ -171,9 +171,9 @@ TRANS(TLIGetAddr)(XtransConnInfo ciptr)
*/
if( ciptr->addr )
xfree(ciptr->addr);
free(ciptr->addr);
if( (ciptr->addr=(char *)xalloc(netbuf.len)) == NULL )
if( (ciptr->addr=(char *)malloc(netbuf.len)) == NULL )
{
PRMSG(1, "TLIGetAddr: Can't allocate space for the addr\n",
0,0,0);
......@@ -221,9 +221,9 @@ TRANS(TLIGetPeerAddr)(XtransConnInfo ciptr)
*/
if( ciptr->peeraddr )
xfree(ciptr->peeraddr);
free(ciptr->peeraddr);
if( (ciptr->peeraddr=(char *)xalloc(netbuf.len)) == NULL )
if( (ciptr->peeraddr=(char *)malloc(netbuf.len)) == NULL )
{
PRMSG(1,
"TLIGetPeerAddr: Can't allocate space for the addr\n",
......@@ -320,7 +320,7 @@ TRANS(TLIOpen)(char *device)
PRMSG(3,"TLIOpen(%s)\n", device, 0,0 );
if( (ciptr=(XtransConnInfo)xcalloc(1,sizeof(struct _XtransConnInfo))) == NULL )
if( (ciptr=(XtransConnInfo)calloc(1,sizeof(struct _XtransConnInfo))) == NULL )
{
PRMSG(1, "TLIOpen: calloc failed\n", 0,0,0 );
return NULL;
......@@ -353,7 +353,7 @@ TRANS(TLIReopen)(char *device, int fd, char *port)
return NULL;
}
if( (ciptr=(XtransConnInfo)xcalloc(1,sizeof(struct _XtransConnInfo))) == NULL )
if( (ciptr=(XtransConnInfo)calloc(1,sizeof(struct _XtransConnInfo))) == NULL )
{
PRMSG(1, "TLIReopen: calloc failed\n", 0,0,0 );
return NULL;
......@@ -457,7 +457,7 @@ TRANS(TLIOpenCOTSClient)(Xtransport *thistrans, char *protocol,
"TLIOpenCOTSClient: ...TLITLIBindLocal() failed: %d\n",
errno, 0,0 );
t_close(ciptr->fd);
xfree(ciptr);
free(ciptr);
return NULL;
}
......@@ -467,7 +467,7 @@ TRANS(TLIOpenCOTSClient)(Xtransport *thistrans, char *protocol,
"TLIOpenCOTSClient: ...TLIGetAddr() failed: %d\n",
errno, 0,0 );
t_close(ciptr->fd);
xfree(ciptr);
free(ciptr);
return NULL;
}
......@@ -557,7 +557,7 @@ TRANS(TLIOpenCLTSClient)(Xtransport *thistrans, char *protocol,
"TLIOpenCLTSClient: ...TLITLIBindLocal() failed: %d\n",
errno, 0,0 );
t_close(ciptr->fd);
xfree(ciptr);
free(ciptr);
return NULL;
}
......@@ -567,7 +567,7 @@ TRANS(TLIOpenCLTSClient)(Xtransport *thistrans, char *protocol,
"TLIOpenCLTSClient: ...TLIGetPeerAddr() failed: %d\n",
errno, 0,0 );
t_close(ciptr->fd);
xfree(ciptr);
free(ciptr);
return NULL;
}
......@@ -730,7 +730,7 @@ TRANS(TLICreateListener)(XtransConnInfo ciptr, struct t_bind *req)
* Everything looks good: fill in the XtransConnInfo structure.
*/
if( (ciptr->addr=(char *)xalloc(ret->addr.len)) == NULL )
if( (ciptr->addr=(char *)malloc(ret->addr.len)) == NULL )
{
PRMSG(1,
"TLICreateListener: Unable to allocate space for the address\n",
......@@ -917,7 +917,7 @@ TRANS(TLIAccept)(XtransConnInfo ciptr, int *status)
errno, 0,0 );
t_free((char *)call,T_CALL);
t_close(newciptr->fd);
xfree(newciptr);
free(newciptr);
*status = TRANS_ACCEPT_MISC_ERROR;
return NULL;
}
......@@ -961,7 +961,7 @@ TRANS(TLIAccept)(XtransConnInfo ciptr, int *status)
"TLIAccept: TRANS(TLIGetPeerAddr)() failed: %d\n",
errno, 0,0 );
t_close(newciptr->fd);
xfree(newciptr);
free(newciptr);
*status = TRANS_ACCEPT_MISC_ERROR;
return NULL;
}
......@@ -972,8 +972,8 @@ TRANS(TLIAccept)(XtransConnInfo ciptr, int *status)
"TLIAccept: TRANS(TLIGetPeerAddr)() failed: %d\n",
errno, 0,0 );
t_close(newciptr->fd);
xfree(newciptr->addr);
xfree(newciptr);
free(newciptr->addr);
free(newciptr);
*status = TRANS_ACCEPT_MISC_ERROR;
return NULL;
}
......@@ -983,8 +983,8 @@ TRANS(TLIAccept)(XtransConnInfo ciptr, int *status)
PRMSG(1, "TLIAccept() ioctl(I_POP, \"timod\") failed %d\n",
errno,0,0 );
t_close(newciptr->fd);
xfree(newciptr->addr);
xfree(newciptr);
free(newciptr->addr);
free(newciptr);
*status = TRANS_ACCEPT_MISC_ERROR;
return NULL;
}
......@@ -994,8 +994,8 @@ TRANS(TLIAccept)(XtransConnInfo ciptr, int *status)
PRMSG(1, "TLIAccept() ioctl(I_PUSH,\"tirdwr\") failed %d\n",
errno,0,0 );
t_close(newciptr->fd);
xfree(newciptr->addr);
xfree(newciptr);
free(newciptr->addr);
free(newciptr);
*status = TRANS_ACCEPT_MISC_ERROR;
return NULL;
}
......
nx-X11/lib/xtrans/Xtransutil.c
View file @ 1dbd3c88
......@@ -211,11 +211,11 @@ TRANS(ConvertAddress)(int *familyp, int *addrlenp, Xtransaddr **addrp)
if (len > 0) {
if (*addrp && *addrlenp < (len + 1))
{
xfree ((char *) *addrp);
free ((char *) *addrp);
*addrp = NULL;
}
if (!*addrp)
*addrp = (Xtransaddr *) xalloc (len + 1);
*addrp = (Xtransaddr *) malloc (len + 1);
if (*addrp) {
strcpy ((char *) *addrp, hostnamebuf);
*addrlenp = len;
......@@ -226,7 +226,7 @@ TRANS(ConvertAddress)(int *familyp, int *addrlenp, Xtransaddr **addrp)
else
{
if (*addrp)
xfree ((char *) *addrp);
free ((char *) *addrp);
*addrp = NULL;
*addrlenp = 0;
}
......@@ -262,7 +262,7 @@ TRANS(GetMyNetworkId) (XtransConnInfo ciptr)
case AF_UNIX:
{
struct sockaddr_un *saddr = (struct sockaddr_un *) addr;
networkId = (char *) xalloc (3 + strlen (transName) +
networkId = (char *) malloc (3 + strlen (transName) +
strlen (hostnamebuf) + strlen (saddr->sun_path));
sprintf (networkId, "%s/%s:%s", transName,
hostnamebuf, saddr->sun_path);
......@@ -292,7 +292,7 @@ TRANS(GetMyNetworkId) (XtransConnInfo ciptr)
portnum = ntohs (saddr->sin_port);
sprintf (portnumbuf, "%d", portnum);
networkId = (char *) xalloc (3 + strlen (transName) +
networkId = (char *) malloc (3 + strlen (transName) +
strlen (hostnamebuf) + strlen (portnumbuf));
sprintf (networkId, "%s/%s:%s", transName, hostnamebuf, portnumbuf);
break;
......@@ -304,7 +304,7 @@ TRANS(GetMyNetworkId) (XtransConnInfo ciptr)
{
struct sockaddr_dn *saddr = (struct sockaddr_dn *) addr;
networkId = (char *) xalloc (
networkId = (char *) malloc (
13 + strlen (hostnamebuf) + saddr->sdn_objnamel);
sprintf (networkId, "dnet/%s::%s",
hostnamebuf, saddr->sdn_objname);
......@@ -453,7 +453,7 @@ TRANS(GetPeerNetworkId) (XtransConnInfo ciptr)
}
hostname = (char *) xalloc (
hostname = (char *) malloc (
strlen (ciptr->transptr->TransName) + strlen (addr) + 2);
strcpy (hostname, ciptr->transptr->TransName);
strcat (hostname, "/");
......
nx-X11/lib/xtrans/transport.c
View file @ 1dbd3c88
......@@ -59,10 +59,6 @@ from The Open Group.
#include "os.h"
#else
#include <stdlib.h>
#define xalloc(_size) malloc(_size)
#define xcalloc(_num,_size) calloc(_num,_size)
#define xrealloc(_ptr,_size) realloc(_ptr,_size)
#define xfree(_ptr) free(_ptr)
#endif
#include "Xtransint.h"
......
nx-X11/programs/Xserver/GL/glx/glxcmds.c
View file @ 1dbd3c88
......@@ -2138,7 +2138,7 @@ int __glXQueryServerString(__GLXclientState *cl, GLbyte *pc)
reply.length = length;
reply.n = n;
if ((buf = (char *) Xalloc(length << 2)) == NULL) {
if ((buf = (char *) malloc(length << 2)) == NULL) {
return BadAlloc;
}
__glXStrncpy(buf, ptr, n);
......
nx-X11/programs/Xserver/GL/glx/glximports.c
View file @ 1dbd3c88
......@@ -50,7 +50,7 @@ void *__glXImpMalloc(__GLcontext *gc, size_t size)
if (size == 0) {
return NULL;
}
addr = xalloc(size);
addr = malloc(size);
if (addr == NULL) {
/* XXX: handle out of memory error */
return NULL;
......@@ -67,7 +67,7 @@ void *__glXImpCalloc(__GLcontext *gc, size_t numElements, size_t elementSize)
return NULL;
}
size = numElements * elementSize;
addr = xalloc(size);
addr = malloc(size);
if (addr == NULL) {
/* XXX: handle out of memory error */
return NULL;
......@@ -81,7 +81,7 @@ void *__glXImpCalloc(__GLcontext *gc, size_t numElements, size_t elementSize)
void __glXImpFree(__GLcontext *gc, void *addr)
{
if (addr) {
xfree(addr);
free(addr);
}
}
......@@ -91,15 +91,15 @@ void *__glXImpRealloc(__GLcontext *gc, void *addr, size_t newSize)
if (addr) {
if (newSize == 0) {
xfree(addr);
free(addr);
return NULL;
}
newAddr = xrealloc(addr, newSize);
newAddr = realloc(addr, newSize);
} else {
if (newSize == 0) {
return NULL;
}
newAddr = xalloc(newSize);
newAddr = malloc(newSize);
}
if (newAddr == NULL) {
return NULL; /* XXX: out of memory error */
......
nx-X11/programs/Xserver/GL/glx/glxscreens.c
View file @ 1dbd3c88
......@@ -366,9 +366,9 @@ void __glXScreenReset(void)
__glXFree(__glXActiveScreens[i].GLXextensions);
__glXFree(__glXActiveScreens[i].GLextensions);
}
xfree(__glXActiveScreens);
xfree(__glXHyperpipeFuncs);
xfree(__glXSwapBarrierFuncs);
free(__glXActiveScreens);
free(__glXHyperpipeFuncs);
free(__glXSwapBarrierFuncs);
__glXNumHyperpipeFuncs = 0;
__glXNumSwapBarrierFuncs = 0;
__glXHyperpipeFuncs = NULL;
......
nx-X11/programs/Xserver/GL/glx/glxutil.c
View file @ 1dbd3c88
......@@ -68,7 +68,7 @@ __glXMalloc(size_t size)
if (size == 0) {
return NULL;
}
addr = (void *) xalloc(size);
addr = (void *) malloc(size);
if (addr == NULL) {
/* XXX: handle out of memory error */
return NULL;
......@@ -86,7 +86,7 @@ __glXCalloc(size_t numElements, size_t elementSize)
return NULL;
}
size = numElements * elementSize;
addr = (void *) xalloc(size);
addr = (void *) malloc(size);
if (addr == NULL) {
/* XXX: handle out of memory error */
return NULL;
......@@ -102,16 +102,16 @@ __glXRealloc(void *addr, size_t newSize)
if (addr) {
if (newSize == 0) {
xfree(addr);
free(addr);
return NULL;
} else {
newAddr = xrealloc(addr, newSize);
newAddr = realloc(addr, newSize);
}
} else {
if (newSize == 0) {
return NULL;
} else {
newAddr = xalloc(newSize);
newAddr = malloc(newSize);
}
}
if (newAddr == NULL) {
......@@ -125,7 +125,7 @@ void
__glXFree(void *addr)
{
if (addr) {
xfree(addr);
free(addr);
}
}
......
nx-X11/programs/Xserver/GL/glx/unpack.h
View file @ 1dbd3c88
......@@ -93,7 +93,7 @@ extern xGLXSingleReply __glXReply;
else if ((size) > sizeof(answerBuffer)) { \
int bump; \
if ((cl)->returnBufSize < (size)+(align)) { \
(cl)->returnBuf = (GLbyte*)Xrealloc((cl)->returnBuf, \
(cl)->returnBuf = (GLbyte*)realloc((cl)->returnBuf, \
(size)+(align)); \
if (!(cl)->returnBuf) { \
return BadAlloc; \
......
nx-X11/programs/Xserver/GL/mesa/X/xf86glx.c
View file @ 1dbd3c88
......@@ -516,7 +516,7 @@ static Bool init_visuals(int *nvisualp, VisualPtr *visualp,
/* Free the private list created by DDX HW driver */
if (visualPrivates)
xfree(visualPrivates);
free(visualPrivates);
visualPrivates = NULL;
return TRUE;
......
nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c
View file @ 1dbd3c88
......@@ -52,7 +52,7 @@ XMesaImage *XMesaCreateImage(int bitsPerPixel, int width, int height, char *data
{
XMesaImage *image;
image = (XMesaImage *)xalloc(sizeof(XMesaImage));
image = (XMesaImage *)malloc(sizeof(XMesaImage));
if (image) {
image->width = width;
......@@ -70,7 +70,7 @@ void XMesaDestroyImage(XMesaImage *image)
{
if (image->data)
free(image->data);
xfree(image);
free(image);
}
unsigned long XMesaGetPixel(XMesaImage *image, int x, int y)
......
nx-X11/programs/Xserver/Xext/extmod/modinit.c
View file @ 1dbd3c88
......@@ -161,13 +161,13 @@ extmodSetup(void * module, void * opts, int *errmaj, int *errmin)
for (i = 0; extensionModules[i].name != NULL; i++) {
if (opts) {
char *s;
s = (char *)xalloc(strlen(extensionModules[i].name) + 5);
s = (char *)malloc(strlen(extensionModules[i].name) + 5);
if (s) {
void * o;
strcpy(s, "omit");
strcat(s, extensionModules[i].name);
o = xf86FindOption(opts, s);
xfree(s);
free(s);
if (o) {
xf86MarkOptionUsed(o);
continue;
......
nx-X11/programs/Xserver/Xext/panoramiX.c
View file @ 1dbd3c88
......@@ -165,7 +165,7 @@ XineramaCloseScreen (int i, ScreenPtr pScreen)
if (pScreen->myNum == 0)
RegionUninit(&PanoramiXScreenRegion);
xfree ((void *) pScreenPriv);
free ((void *) pScreenPriv);
return (*pScreen->CloseScreen) (i, pScreen);
}
......@@ -337,7 +337,7 @@ XineramaDestroyClip(GCPtr pGC)
int
XineramaDeleteResource(void * data, XID id)
{
xfree(data);
free(data);
return 1;
}
......@@ -420,7 +420,7 @@ XineramaRegisterConnectionBlockCallback(void (*func)(void))
{
XineramaConnectionCallbackList *newlist;
if(!(newlist = xalloc(sizeof(XineramaConnectionCallbackList))))
if(!(newlist = malloc(sizeof(XineramaConnectionCallbackList))))
return FALSE;
newlist->next = ConnectionCallbackList;
......@@ -525,7 +525,7 @@ void PanoramiXExtensionInit(int argc, char *argv[])
*/
panoramiXdataPtr = (PanoramiXData *)
xcalloc(PanoramiXNumScreens, sizeof(PanoramiXData));
calloc(PanoramiXNumScreens, sizeof(PanoramiXData));
BREAK_IF(!panoramiXdataPtr);
BREAK_IF((PanoramiXGCIndex = AllocateGCPrivateIndex()) < 0);
......@@ -539,7 +539,7 @@ void PanoramiXExtensionInit(int argc, char *argv[])
return;
}
pScreenPriv = xalloc(sizeof(PanoramiXScreenRec));
pScreenPriv = malloc(sizeof(PanoramiXScreenRec));
pScreen->devPrivates[PanoramiXScreenIndex].ptr =
(void *)pScreenPriv;
if(!pScreenPriv) {
......@@ -727,10 +727,10 @@ Bool PanoramiXCreateConnectionBlock(void)
connSetupPrefix.length = length >> 2;
xfree(PanoramiXVisuals);
free(PanoramiXVisuals);
for (i = 0; i < PanoramiXNumDepths; i++)
xfree(PanoramiXDepths[i].vids);
xfree(PanoramiXDepths);
free(PanoramiXDepths[i].vids);
free(PanoramiXDepths);
/*
* OK, change some dimensions so it looks as if it were one big screen
......@@ -752,7 +752,7 @@ Bool PanoramiXCreateConnectionBlock(void)
tmp = (void *)ConnectionCallbackList;
(*ConnectionCallbackList->func)();
ConnectionCallbackList = ConnectionCallbackList->next;
xfree(tmp);
free(tmp);
}
return TRUE;
......@@ -769,16 +769,16 @@ void PanoramiXConsolidate(void)
Bool foundDepth, missingDepth;
if(!PanoramiXVisualTable)
PanoramiXVisualTable = xcalloc(256 * MAXSCREENS, sizeof(XID));
PanoramiXVisualTable = calloc(256 * MAXSCREENS, sizeof(XID));
pScreen = screenInfo.screens[0];
pVisual = pScreen->visuals;
pDepth = pScreen->allowedDepths;
PanoramiXNumDepths = 0;
PanoramiXDepths = xcalloc(pScreen->numDepths,sizeof(DepthRec));
PanoramiXDepths = calloc(pScreen->numDepths,sizeof(DepthRec));
PanoramiXNumVisuals = 0;
PanoramiXVisuals = xcalloc(pScreen->numVisuals,sizeof(VisualRec));
PanoramiXVisuals = calloc(pScreen->numVisuals,sizeof(VisualRec));
for (i = 0; i < pScreen->numDepths; i++, pDepth++) {
missingDepth = FALSE;
......@@ -805,7 +805,7 @@ void PanoramiXConsolidate(void)
PanoramiXDepths[PanoramiXNumDepths].numVids = 0;
if(pDepth->numVids)
PanoramiXDepths[PanoramiXNumDepths].vids =
xalloc(sizeof(VisualID) * pDepth->numVids);
malloc(sizeof(VisualID) * pDepth->numVids);
else
PanoramiXDepths[PanoramiXNumDepths].vids = NULL;
PanoramiXNumDepths++;
......@@ -887,11 +887,11 @@ void PanoramiXConsolidate(void)
}
root = (PanoramiXRes *) xalloc(sizeof(PanoramiXRes));
root = (PanoramiXRes *) malloc(sizeof(PanoramiXRes));
root->type = XRT_WINDOW;
defmap = (PanoramiXRes *) xalloc(sizeof(PanoramiXRes));
defmap = (PanoramiXRes *) malloc(sizeof(PanoramiXRes));
defmap->type = XRT_COLORMAP;
saver = (PanoramiXRes *) xalloc(sizeof(PanoramiXRes));
saver = (PanoramiXRes *) malloc(sizeof(PanoramiXRes));
saver->type = XRT_WINDOW;
......@@ -927,7 +927,7 @@ static void PanoramiXResetProc(ExtensionEntry* extEntry)
for (i = 256; i--; )
ProcVector[i] = SavedProcVector[i];
Xfree(panoramiXdataPtr);
free(panoramiXdataPtr);
}
......@@ -1217,7 +1217,7 @@ XineramaGetImageData(
if(sizeNeeded > size) {
char *tmpdata = ScratchMem;
ScratchMem = xrealloc(ScratchMem, sizeNeeded);
ScratchMem = realloc(ScratchMem, sizeNeeded);
if(ScratchMem)
size = sizeNeeded;
else {
......@@ -1292,7 +1292,7 @@ XineramaGetImageData(
}
if(ScratchMem)
xfree(ScratchMem);
free(ScratchMem);
RegionUninit(&SrcRegion);
RegionUninit(&GrabRegion);
......
nx-X11/programs/Xserver/Xext/panoramiXprocs.c
View file @ 1dbd3c88
......@@ -130,7 +130,7 @@ int PanoramiXCreateWindow(ClientPtr client)
}
}
if(!(newWin = (PanoramiXRes *) xalloc(sizeof(PanoramiXRes))))
if(!(newWin = (PanoramiXRes *) malloc(sizeof(PanoramiXRes))))
return BadAlloc;
newWin->type = XRT_WINDOW;
......@@ -170,7 +170,7 @@ int PanoramiXCreateWindow(ClientPtr client)
if (result == Success)
AddResource(newWin->info[0].id, XRT_WINDOW, newWin);
else
xfree(newWin);
free(newWin);
return (result);
}
......@@ -660,7 +660,7 @@ int PanoramiXCreatePixmap(ClientPtr client)
client, stuff->drawable, XRC_DRAWABLE, SecurityReadAccess)))
return BadDrawable;
if(!(newPix = (PanoramiXRes *) xalloc(sizeof(PanoramiXRes))))
if(!(newPix = (PanoramiXRes *) malloc(sizeof(PanoramiXRes))))
return BadAlloc;
newPix->type = XRT_PIXMAP;
......@@ -679,7 +679,7 @@ int PanoramiXCreatePixmap(ClientPtr client)
if (result == Success)
AddResource(newPix->info[0].id, XRT_PIXMAP, newPix);
else
xfree(newPix);
free(newPix);
return (result);
}
......@@ -760,7 +760,7 @@ int PanoramiXCreateGC(ClientPtr client)
}
}
if(!(newGC = (PanoramiXRes *) xalloc(sizeof(PanoramiXRes))))
if(!(newGC = (PanoramiXRes *) malloc(sizeof(PanoramiXRes))))
return BadAlloc;
newGC->type = XRT_GC;
......@@ -784,7 +784,7 @@ int PanoramiXCreateGC(ClientPtr client)
if (result == Success)
AddResource(newGC->info[0].id, XRT_GC, newGC);
else
xfree(newGC);
free(newGC);
return (result);
}
......@@ -1036,7 +1036,7 @@ int PanoramiXCopyArea(ClientPtr client)
VERIFY_DRAWABLE(drawables[j], src->info[j].id, client);
pitch = PixmapBytePad(stuff->width, drawables[0]->depth);
if(!(data = xcalloc(1, stuff->height * pitch)))
if(!(data = calloc(1, stuff->height * pitch)))
return BadAlloc;
XineramaGetImageData(drawables, srcx, srcy,
......@@ -1049,7 +1049,7 @@ int PanoramiXCopyArea(ClientPtr client)
if(drawables[0]->depth != pDst->depth) {
client->errorValue = stuff->dstDrawable;
xfree(data);
free(data);
return (BadMatch);
}
......@@ -1060,7 +1060,7 @@ int PanoramiXCopyArea(ClientPtr client)
if(dstShared) break;
}
xfree(data);
free(data);
result = Success;
} else {
......@@ -1844,7 +1844,7 @@ int PanoramiXGetImage(ClientPtr client)
linesPerBuf = h;
}
length = linesPerBuf * widthBytesLine;
if(!(pBuf = xalloc(length)))
if(!(pBuf = malloc(length)))
return (BadAlloc);
WriteReplyToClient(client, sizeof (xGetImageReply), &xgi);
......@@ -1890,7 +1890,7 @@ int PanoramiXGetImage(ClientPtr client)
}
}
}
xfree(pBuf);
free(pBuf);
return (client->noClientException);
}
......@@ -2072,7 +2072,7 @@ int PanoramiXCreateColormap(ClientPtr client)
if(!stuff->visual || (stuff->visual > 255))
return BadValue;
if(!(newCmap = (PanoramiXRes *) xalloc(sizeof(PanoramiXRes))))
if(!(newCmap = (PanoramiXRes *) malloc(sizeof(PanoramiXRes))))
return BadAlloc;
newCmap->type = XRT_COLORMAP;
......@@ -2092,7 +2092,7 @@ int PanoramiXCreateColormap(ClientPtr client)
if (result == Success)
AddResource(newCmap->info[0].id, XRT_COLORMAP, newCmap);
else
xfree(newCmap);
free(newCmap);
return (result);
}
......@@ -2141,7 +2141,7 @@ PanoramiXCopyColormapAndFree(ClientPtr client)
SecurityReadAccess | SecurityWriteAccess)))
return BadColor;
if(!(newCmap = (PanoramiXRes *) xalloc(sizeof(PanoramiXRes))))
if(!(newCmap = (PanoramiXRes *) malloc(sizeof(PanoramiXRes))))
return BadAlloc;
newCmap->type = XRT_COLORMAP;
......@@ -2159,7 +2159,7 @@ PanoramiXCopyColormapAndFree(ClientPtr client)
if (result == Success)
AddResource(newCmap->info[0].id, XRT_COLORMAP, newCmap);
else
xfree(newCmap);
free(newCmap);
return (result);
}
......
nx-X11/programs/Xserver/Xext/saver.c
View file @ 1dbd3c88
......@@ -218,7 +218,7 @@ static int ScreenPrivateIndex;
#define SetScreenPrivate(s,v) ((s)->devPrivates[ScreenPrivateIndex].ptr = (void *) v);
#define SetupScreen(s) ScreenSaverScreenPrivatePtr pPriv = (s ? GetScreenPrivate(s) : NULL)
#define New(t) ((t *) xalloc (sizeof (t)))
#define New(t) ((t *) malloc (sizeof (t)))
/****************
* ScreenSaverExtensionInit
......@@ -274,7 +274,7 @@ CheckScreenPrivate (pScreen)
if (!pPriv->attr && !pPriv->events &&
!pPriv->hasWindow && pPriv->installedMap == None)
{
xfree (pPriv);
free (pPriv);
SetScreenPrivate (pScreen, NULL);
savedScreenInfo[pScreen->myNum].ExternalScreenSaver = NULL;
}
......@@ -340,7 +340,7 @@ setEventMask (pScreen, client, mask)
{
FreeResource (pEv->resource, EventType);
*pPrev = pEv->next;
xfree (pEv);
free (pEv);
CheckScreenPrivate (pScreen);
}
else
......@@ -386,8 +386,8 @@ FreeScreenAttr (pAttr)
ScreenSaverAttrPtr pAttr;
{
FreeAttrs (pAttr);
xfree (pAttr->values);
xfree (pAttr);
free (pAttr->values);
free (pAttr);
}
static int
......@@ -408,7 +408,7 @@ ScreenSaverFreeEvents (value, id)
if (!pEv)
return TRUE;
*pPrev = pEv->next;
xfree (pEv);
free (pEv);
CheckScreenPrivate (pScreen);
return TRUE;
}
......@@ -939,7 +939,7 @@ ScreenSaverSetAttributes (ClientPtr client)
goto bail;
}
/* over allocate for override redirect */
values = (unsigned long *) xalloc ((len + 1) * sizeof (unsigned long));
values = (unsigned long *) malloc ((len + 1) * sizeof (unsigned long));
if (!values)
{
ret = BadAlloc;
......@@ -1172,8 +1172,8 @@ PatchUp:
FreeAttrs (pAttr);
bail:
CheckScreenPrivate (pScreen);
if (pAttr) xfree (pAttr->values);
xfree (pAttr);
if (pAttr) free (pAttr->values);
free (pAttr);
return ret;
}
......
nx-X11/programs/Xserver/Xext/security.c
View file @ 1dbd3c88
......@@ -331,7 +331,7 @@ SecurityDeleteAuthorization(
}
SecurityAudit("revoked authorization ID %d\n", pAuth->id);
xfree(pAuth);
free(pAuth);
return Success;
} /* SecurityDeleteAuthorization */
......@@ -356,7 +356,7 @@ SecurityDeleteAuthorizationEventClient(
prev->next = pEventClient->next;
else
pAuth->eventClients = pEventClient->next;
xfree(pEventClient);
free(pEventClient);
return(Success);
}
prev = pEventClient;
......@@ -524,7 +524,7 @@ SecurityEventSelectForAuthorization(
}
}
pEventClient = (OtherClients *) xalloc(sizeof(OtherClients));
pEventClient = (OtherClients *) malloc(sizeof(OtherClients));
if (!pEventClient)
return BadAlloc;
pEventClient->mask = mask;
......@@ -533,7 +533,7 @@ SecurityEventSelectForAuthorization(
if (!AddResource(pEventClient->resource, RTEventClient,
(void *)pAuth))
{
xfree(pEventClient);
free(pEventClient);
return BadAlloc;
}
pAuth->eventClients = pEventClient;
......@@ -662,7 +662,7 @@ ProcSecurityGenerateAuthorization(
/* associate additional information with this auth ID */
pAuth = (SecurityAuthorizationPtr)xalloc(sizeof(SecurityAuthorizationRec));
pAuth = (SecurityAuthorizationPtr)malloc(sizeof(SecurityAuthorizationRec));
if (!pAuth)
{
err = BadAlloc;
......@@ -734,7 +734,7 @@ bailout:
if (removeAuth)
RemoveAuthorization(stuff->nbytesAuthProto, protoname,
authdata_len, pAuthdata);
if (pAuth) xfree(pAuth);
if (pAuth) free(pAuth);
return err;
} /* ProcSecurityGenerateAuthorization */
......@@ -1486,7 +1486,7 @@ SecurityFreePropertyAccessList(void)
{
PropertyAccessPtr freeit = PropertyAccessList;
PropertyAccessList = PropertyAccessList->next;
xfree(freeit);
free(freeit);
}
} /* SecurityFreePropertyAccessList */
......@@ -1643,14 +1643,14 @@ SecurityParsePropertyAccessRule(
*/
if (mustHaveValue)
size += strlen(mustHaveValue) + 1;
pacl = (PropertyAccessPtr)Xalloc(size);
pacl = (PropertyAccessPtr)malloc(size);
if (!pacl)
return FALSE;
pacl->name = MakeAtom(propname, strlen(propname), TRUE);
if (pacl->name == BAD_RESOURCE)
{
Xfree(pacl);
free(pacl);
return FALSE;
}
if (mustHaveProperty)
......@@ -1659,7 +1659,7 @@ SecurityParsePropertyAccessRule(
strlen(mustHaveProperty), TRUE);
if (pacl->mustHaveProperty == BAD_RESOURCE)
{
Xfree(pacl);
free(pacl);
return FALSE;
}
}
......@@ -1716,15 +1716,15 @@ SecurityParseSitePolicy(
if (!policyStr)
return FALSE;
copyPolicyStr = (char *)Xalloc(strlen(policyStr) + 1);
copyPolicyStr = (char *)malloc(strlen(policyStr) + 1);
if (!copyPolicyStr)
return TRUE;
strcpy(copyPolicyStr, policyStr);
newStrings = (char **)Xrealloc(SecurityPolicyStrings,
newStrings = (char **)realloc(SecurityPolicyStrings,
sizeof (char *) * (nSecurityPolicyStrings + 1));
if (!newStrings)
{
Xfree(copyPolicyStr);
free(copyPolicyStr);
return TRUE;
}
......@@ -1752,9 +1752,9 @@ SecurityFreeSitePolicyStrings(void)
assert(nSecurityPolicyStrings);
while (nSecurityPolicyStrings--)
{
Xfree(SecurityPolicyStrings[nSecurityPolicyStrings]);
free(SecurityPolicyStrings[nSecurityPolicyStrings]);
}
Xfree(SecurityPolicyStrings);
free(SecurityPolicyStrings);
SecurityPolicyStrings = NULL;
nSecurityPolicyStrings = 0;
}
......
nx-X11/programs/Xserver/Xext/shape.c
View file @ 1dbd3c88
......@@ -796,7 +796,7 @@ ShapeFreeClient (data, id)
*pHead = pShapeEvent->next;
}
}
xfree ((void *) pShapeEvent);
free ((void *) pShapeEvent);
return 1;
}
......@@ -812,9 +812,9 @@ ShapeFreeEvents (data, id)
for (pCur = *pHead; pCur; pCur = pNext) {
pNext = pCur->next;
FreeResource (pCur->clientResource, ClientType);
xfree ((void *) pCur);
free ((void *) pCur);
}
xfree ((void *) pHead);
free ((void *) pHead);
return 1;
}
......@@ -849,7 +849,7 @@ ProcShapeSelectInput (client)
/* build the entry */
pNewShapeEvent = (ShapeEventPtr)
xalloc (sizeof (ShapeEventRec));
malloc (sizeof (ShapeEventRec));
if (!pNewShapeEvent)
return BadAlloc;
pNewShapeEvent->next = 0;
......@@ -871,7 +871,7 @@ ProcShapeSelectInput (client)
*/
if (!pHead)
{
pHead = (ShapeEventPtr *) xalloc (sizeof (ShapeEventPtr));
pHead = (ShapeEventPtr *) malloc (sizeof (ShapeEventPtr));
if (!pHead ||
!AddResource (pWin->drawable.id, EventType, (void *)pHead))
{
......@@ -898,7 +898,7 @@ ProcShapeSelectInput (client)
pNewShapeEvent->next = pShapeEvent->next;
else
*pHead = pShapeEvent->next;
xfree (pShapeEvent);
free (pShapeEvent);
}
}
break;
......
nx-X11/programs/Xserver/Xext/shm.c
View file @ 1dbd3c88
......@@ -439,7 +439,7 @@ ProcShmAttach(client)
}
else
{
shmdesc = (ShmDescPtr) xalloc(sizeof(ShmDescRec));
shmdesc = (ShmDescPtr) malloc(sizeof(ShmDescRec));
if (!shmdesc)
return BadAlloc;
shmdesc->addr = shmat(stuff->shmid, 0,
......@@ -447,7 +447,7 @@ ProcShmAttach(client)
if ((shmdesc->addr == ((char *)-1)) ||
shmctl(stuff->shmid, IPC_STAT, &buf))
{
xfree(shmdesc);
free(shmdesc);
return BadAccess;
}
......@@ -457,7 +457,7 @@ ProcShmAttach(client)
if (shm_access(client, &(buf.shm_perm), stuff->readOnly) == -1) {
shmdt(shmdesc->addr);
xfree(shmdesc);
free(shmdesc);
return BadAccess;
}
......@@ -488,7 +488,7 @@ ShmDetachSegment(value, shmseg)
for (prev = &Shmsegs; *prev != shmdesc; prev = &(*prev)->next)
;
*prev = shmdesc->next;
xfree(shmdesc);
free(shmdesc);
return Success;
}
......@@ -779,7 +779,7 @@ CreatePmap:
VERIFY_SHMSIZE(shmdesc, stuff->offset, size, client);
if(!(newPix = (PanoramiXRes *) xalloc(sizeof(PanoramiXRes))))
if(!(newPix = (PanoramiXRes *) malloc(sizeof(PanoramiXRes))))
return BadAlloc;
newPix->type = XRT_PIXMAP;
......@@ -820,7 +820,7 @@ CreatePmap:
(*pScreen->DestroyPixmap)(pMap);
FreeResource(newPix->info[j].id, RT_NONE);
}
xfree(newPix);
free(newPix);
} else
AddResource(stuff->pid, XRT_PIXMAP, newPix);
......
nx-X11/programs/Xserver/Xext/sleepuntil.c
View file @ 1dbd3c88
......@@ -98,7 +98,7 @@ ClientSleepUntil (client, revive, notifyFunc, closure)
SertafiedGeneration = serverGeneration;
BlockHandlerRegistered = FALSE;
}
pRequest = (SertafiedPtr) xalloc (sizeof (SertafiedRec));
pRequest = (SertafiedPtr) malloc (sizeof (SertafiedRec));
if (!pRequest)
return FALSE;
pRequest->pClient = client;
......@@ -111,7 +111,7 @@ ClientSleepUntil (client, revive, notifyFunc, closure)
SertafiedWakeupHandler,
(void *) 0))
{
xfree (pRequest);
free (pRequest);
return FALSE;
}
BlockHandlerRegistered = TRUE;
......@@ -169,7 +169,7 @@ SertafiedDelete (value, id)
}
if (pRequest->notifyFunc)
(*pRequest->notifyFunc) (pRequest->pClient, pRequest->closure);
xfree (pRequest);
free (pRequest);
return TRUE;
}
......
nx-X11/programs/Xserver/Xext/sync.c
View file @ 1dbd3c88
......@@ -319,7 +319,7 @@ SyncDeleteTriggerFromCounter(pTrigger)
pPrev->next = pCur->next;
else
pTrigger->pCounter->pTriglist = pCur->next;
xfree(pCur);
free(pCur);
break;
}
}
......@@ -345,7 +345,7 @@ SyncAddTriggerToCounter(pTrigger)
return Success;
}
if (!(pCur = (SyncTriggerList *)xalloc(sizeof(SyncTriggerList))))
if (!(pCur = (SyncTriggerList *)malloc(sizeof(SyncTriggerList))))
return BadAlloc;
pCur->pTrigger = pTrigger;
......@@ -879,7 +879,7 @@ SyncEventSelectForAlarm(pAlarm, client, wantevents)
/* add new client to pAlarm->pEventClients */
pClients = (SyncAlarmClientList *) xalloc(sizeof(SyncAlarmClientList));
pClients = (SyncAlarmClientList *) malloc(sizeof(SyncAlarmClientList));
if (!pClients)
return BadAlloc;
......@@ -890,7 +890,7 @@ SyncEventSelectForAlarm(pAlarm, client, wantevents)
pClients->delete_id = FakeClientID(client->index);
if (!AddResource(pClients->delete_id, RTAlarmClient, pAlarm))
{
xfree(pClients);
free(pClients);
return BadAlloc;
}
......@@ -1014,12 +1014,12 @@ SyncCreateCounter(client, id, initialvalue)
{
SyncCounter *pCounter;
if (!(pCounter = (SyncCounter *) xalloc(sizeof(SyncCounter))))
if (!(pCounter = (SyncCounter *) malloc(sizeof(SyncCounter))))
return (SyncCounter *)NULL;
if (!AddResource(id, RTCounter, (void *) pCounter))
{
xfree((void *) pCounter);
free((void *) pCounter);
return (SyncCounter *)NULL;
}
......@@ -1058,7 +1058,7 @@ SyncCreateSystemCounter(name, initial, resolution, counterType,
{
SyncCounter *pCounter;
SysCounterList = (SyncCounter **)xrealloc(SysCounterList,
SysCounterList = (SyncCounter **)realloc(SysCounterList,
(SyncNumSystemCounters+1)*sizeof(SyncCounter *));
if (!SysCounterList)
return (void *)NULL;
......@@ -1081,7 +1081,7 @@ SyncCreateSystemCounter(name, initial, resolution, counterType,
{
SysCounterInfo *psci;
psci = (SysCounterInfo *)xalloc(sizeof(SysCounterInfo));
psci = (SysCounterInfo *)malloc(sizeof(SysCounterInfo));
if (!psci)
{
FreeResource(pCounter->id, RT_NONE);
......@@ -1214,7 +1214,7 @@ FreeAlarm(addr, id)
SyncDeleteTriggerFromCounter(&pAlarm->trigger);
xfree(pAlarm);
free(pAlarm);
return Success;
}
......@@ -1237,13 +1237,13 @@ FreeCounter(env, id)
{
(*ptl->pTrigger->CounterDestroyed)(ptl->pTrigger);
pnext = ptl->next;
xfree(ptl); /* destroy the trigger list as we go */
free(ptl); /* destroy the trigger list as we go */
}
if (IsSystemCounter(pCounter))
{
int i, found = 0;
xfree(pCounter->pSysCounterInfo);
free(pCounter->pSysCounterInfo);
/* find the counter in the list of system counters and remove it */
......@@ -1267,7 +1267,7 @@ FreeCounter(env, id)
}
SyncNumSystemCounters--;
}
xfree(pCounter);
free(pCounter);
return Success;
}
......@@ -1298,7 +1298,7 @@ FreeAwait(addr, id)
if (pCounter && !pCounter->beingDestroyed)
SyncDeleteTriggerFromCounter(&pAwait->trigger);
}
xfree(pAwaitUnion);
free(pAwaitUnion);
return Success;
}
......@@ -1321,7 +1321,7 @@ FreeAlarmClient(value, id)
pPrev->next = pCur->next;
else
pAlarm->pEventClients = pCur->next;
xfree(pCur);
free(pCur);
return(Success);
}
}
......@@ -1670,7 +1670,7 @@ ProcSyncAwait(client)
/* all the memory for the entire await list is allocated
* here in one chunk
*/
pAwaitUnion = (SyncAwaitUnion *)xalloc((items+1) * sizeof(SyncAwaitUnion));
pAwaitUnion = (SyncAwaitUnion *)malloc((items+1) * sizeof(SyncAwaitUnion));
if (!pAwaitUnion)
return BadAlloc;
......@@ -1679,7 +1679,7 @@ ProcSyncAwait(client)
pAwaitUnion->header.delete_id = FakeClientID(client->index);
if (!AddResource(pAwaitUnion->header.delete_id, RTAwait, pAwaitUnion))
{
xfree(pAwaitUnion);
free(pAwaitUnion);
return BadAlloc;
}
......@@ -1821,7 +1821,7 @@ ProcSyncCreateAlarm(client)
if (len != (Ones(vmask) + Ones(vmask & (XSyncCAValue|XSyncCADelta))))
return BadLength;
if (!(pAlarm = (SyncAlarm *) xalloc(sizeof(SyncAlarm))))
if (!(pAlarm = (SyncAlarm *) malloc(sizeof(SyncAlarm))))
{
return BadAlloc;
}
......@@ -1838,7 +1838,7 @@ ProcSyncCreateAlarm(client)
status = SyncInitTrigger(client, pTrigger, None, XSyncCAAllTrigger);
if (status != Success)
{
xfree(pAlarm);
free(pAlarm);
return status;
}
......@@ -1852,13 +1852,13 @@ ProcSyncCreateAlarm(client)
(CARD32 *)&stuff[1]);
if (status != Success)
{
xfree(pAlarm);
free(pAlarm);
return status;
}
if (!AddResource(stuff->id, RTAlarm, pAlarm))
{
xfree(pAlarm);
free(pAlarm);
return BadAlloc;
}
......@@ -2346,7 +2346,7 @@ static void
SyncResetProc(extEntry)
ExtensionEntry *extEntry;
{
xfree(SysCounterList);
free(SysCounterList);
SysCounterList = NULL;
RTCounter = 0;
}
......
nx-X11/programs/Xserver/Xext/xcmisc.c
View file @ 1dbd3c88
......@@ -154,7 +154,7 @@ ProcXCMiscGetXIDList(client)
if (stuff->count > UINT32_MAX / sizeof(XID))
return BadAlloc;
pids = (XID *)Xalloc(stuff->count * sizeof(XID));
pids = (XID *)malloc(stuff->count * sizeof(XID));
if (!pids)
{
return BadAlloc;
......@@ -175,7 +175,7 @@ ProcXCMiscGetXIDList(client)
client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write;
WriteSwappedDataToClient(client, count * sizeof(XID), pids);
}
Xfree(pids);
free(pids);
return(client->noClientException);
}
......
nx-X11/programs/Xserver/Xext/xf86bigfont.c
View file @ 1dbd3c88
......@@ -248,7 +248,7 @@ shmalloc(
if (size < 3500)
return (ShmDescPtr) NULL;
pDesc = (ShmDescRec *) xalloc(sizeof(ShmDescRec));
pDesc = (ShmDescRec *) malloc(sizeof(ShmDescRec));
if (!pDesc)
return (ShmDescPtr) NULL;
......@@ -257,7 +257,7 @@ shmalloc(
if (shmid == -1) {
ErrorF(XF86BIGFONTNAME " extension: shmget() failed, size = %u, errno = %d\n",
size, errno);
xfree(pDesc);
free(pDesc);
return (ShmDescPtr) NULL;
}
......@@ -265,7 +265,7 @@ shmalloc(
ErrorF(XF86BIGFONTNAME " extension: shmat() failed, size = %u, errno = %d\n",
size, errno);
shmctl(shmid, IPC_RMID, (void *) 0);
xfree(pDesc);
free(pDesc);
return (ShmDescPtr) NULL;
}
......@@ -294,7 +294,7 @@ shmdealloc(
if (pDesc->next) pDesc->next->prev = pDesc->prev;
*pDesc->prev = pDesc->next;
xfree(pDesc);
free(pDesc);
}
#endif
......
nx-X11/programs/Xserver/Xext/xvdisp.c
View file @ 1dbd3c88
......@@ -1258,7 +1258,7 @@ ProcXvQueryImageAttributes(ClientPtr client)
num_planes = pImage->num_planes;
if(!(offsets = xalloc(num_planes << 3)))
if(!(offsets = malloc(num_planes << 3)))
return BadAlloc;
pitches = offsets + num_planes;
......@@ -1281,7 +1281,7 @@ ProcXvQueryImageAttributes(ClientPtr client)
SwapLongs((CARD32*)offsets, rep.length);
WriteToClient(client, rep.length << 2, (char*)offsets);
xfree(offsets);
free(offsets);
return Success;
}
......@@ -2223,7 +2223,7 @@ void XineramifyXv(void)
/* now create a resource for each port */
for(j = 0; j < refAdapt->nPorts; j++) {
if(!(port = xalloc(sizeof(PanoramiXRes))))
if(!(port = malloc(sizeof(PanoramiXRes))))
break;
port->info[0].id = MatchingAdaptors[0]->base_id + j;
AddResource(port->info[0].id, XvXRTPort, port);
......
nx-X11/programs/Xserver/Xext/xvmain.c
View file @ 1dbd3c88
......@@ -288,7 +288,7 @@ XvScreenInit(ScreenPtr pScreen)
/* ALLOCATE SCREEN PRIVATE RECORD */
pxvs = (XvScreenPtr) xalloc (sizeof (XvScreenRec));
pxvs = (XvScreenPtr) malloc (sizeof (XvScreenRec));
if (!pxvs)
{
ErrorF("XvScreenInit: Unable to allocate screen private structure\n");
......@@ -325,7 +325,7 @@ XvCloseScreen(
(* pxvs->ddCloseScreen)(ii, pScreen);
xfree(pxvs);
free(pxvs);
pScreen->devPrivates[XvScreenIndex].ptr = (void *)NULL;
......@@ -522,7 +522,7 @@ XvdiDestroyVideoNotifyList(void * pn, XID id)
{
npn = cpn->next;
if (cpn->client) FreeResource(cpn->id, XvRTVideoNotify);
xfree(cpn);
free(cpn);
cpn = npn;
}
return Success;
......@@ -941,12 +941,12 @@ XvdiSelectVideoNotify(
if (!pn)
{
if (!(tpn = (XvVideoNotifyPtr)xalloc(sizeof(XvVideoNotifyRec))))
if (!(tpn = (XvVideoNotifyPtr)malloc(sizeof(XvVideoNotifyRec))))
return BadAlloc;
tpn->next = (XvVideoNotifyPtr)NULL;
if (!AddResource(pDraw->id, XvRTVideoNotifyList, tpn))
{
xfree(tpn);
free(tpn);
return BadAlloc;
}
}
......@@ -979,7 +979,7 @@ XvdiSelectVideoNotify(
}
else
{
if (!(tpn = (XvVideoNotifyPtr)xalloc(sizeof(XvVideoNotifyRec))))
if (!(tpn = (XvVideoNotifyPtr)malloc(sizeof(XvVideoNotifyRec))))
return BadAlloc;
tpn->next = pn->next;
pn->next = tpn;
......@@ -1037,7 +1037,7 @@ XvdiSelectPortNotify(
if (!tpn)
{
if (!(tpn = (XvPortNotifyPtr)xalloc(sizeof(XvPortNotifyRec))))
if (!(tpn = (XvPortNotifyPtr)malloc(sizeof(XvPortNotifyRec))))
return BadAlloc;
tpn->next = pPort->pNotify;
pPort->pNotify = tpn;
......
nx-X11/programs/Xserver/Xext/xvmc.c
View file @ 1dbd3c88
......@@ -75,7 +75,7 @@ XvMCDestroyContextRes(void * data, XID id)
if(!pContext->refcnt) {
XvMCScreenPtr pScreenPriv = XVMC_GET_PRIVATE(pContext->pScreen);
(*pScreenPriv->adaptors[pContext->adapt_num].DestroyContext)(pContext);
xfree(pContext);
free(pContext);
}
return Success;
......@@ -89,7 +89,7 @@ XvMCDestroySurfaceRes(void * data, XID id)
XvMCScreenPtr pScreenPriv = XVMC_GET_PRIVATE(pContext->pScreen);
(*pScreenPriv->adaptors[pContext->adapt_num].DestroySurface)(pSurface);
xfree(pSurface);
free(pSurface);
XvMCDestroyContextRes((void *)pContext, pContext->context_id);
......@@ -105,7 +105,7 @@ XvMCDestroySubpictureRes(void * data, XID id)
XvMCScreenPtr pScreenPriv = XVMC_GET_PRIVATE(pContext->pScreen);
(*pScreenPriv->adaptors[pContext->adapt_num].DestroySubpicture)(pSubpict);
xfree(pSubpict);
free(pSubpict);
XvMCDestroyContextRes((void *)pContext, pContext->context_id);
......@@ -242,7 +242,7 @@ ProcXvMCCreateContext(ClientPtr client)
(stuff->height > surface->max_height))
return BadValue;
if(!(pContext = xalloc(sizeof(XvMCContextRec)))) {
if(!(pContext = malloc(sizeof(XvMCContextRec)))) {
return BadAlloc;
}
......@@ -259,7 +259,7 @@ ProcXvMCCreateContext(ClientPtr client)
result = (*adaptor->CreateContext)(pPort, pContext, &dwords, &data);
if(result != Success) {
xfree(pContext);
free(pContext);
return result;
}
......@@ -276,7 +276,7 @@ ProcXvMCCreateContext(ClientPtr client)
AddResource(pContext->context_id, XvMCRTContext, pContext);
if(data)
xfree(data);
free(data);
return Success;
}
......@@ -313,7 +313,7 @@ ProcXvMCCreateSurface(ClientPtr client)
pScreenPriv = XVMC_GET_PRIVATE(pContext->pScreen);
if(!(pSurface = xalloc(sizeof(XvMCSurfaceRec))))
if(!(pSurface = malloc(sizeof(XvMCSurfaceRec))))
return BadAlloc;
pSurface->surface_id = stuff->surface_id;
......@@ -324,7 +324,7 @@ ProcXvMCCreateSurface(ClientPtr client)
pSurface, &dwords, &data);
if(result != Success) {
xfree(pSurface);
free(pSurface);
return result;
}
......@@ -338,7 +338,7 @@ ProcXvMCCreateSurface(ClientPtr client)
AddResource(pSurface->surface_id, XvMCRTSurface, pSurface);
if(data)
xfree(data);
free(data);
pContext->refcnt++;
......@@ -408,7 +408,7 @@ ProcXvMCCreateSubpicture(ClientPtr client)
(stuff->height > surface->subpicture_max_height))
return BadValue;
if(!(pSubpicture = xalloc(sizeof(XvMCSubpictureRec))))
if(!(pSubpicture = malloc(sizeof(XvMCSubpictureRec))))
return BadAlloc;
pSubpicture->subpicture_id = stuff->subpicture_id;
......@@ -427,7 +427,7 @@ ProcXvMCCreateSubpicture(ClientPtr client)
pSubpicture, &dwords, &data);
if(result != Success) {
xfree(pSubpicture);
free(pSubpicture);
return result;
}
......@@ -449,7 +449,7 @@ ProcXvMCCreateSubpicture(ClientPtr client)
AddResource(pSubpicture->subpicture_id, XvMCRTSubpicture, pSubpicture);
if(data)
xfree(data);
free(data);
pContext->refcnt++;
......@@ -708,7 +708,7 @@ XvMCCloseScreen (int i, ScreenPtr pScreen)
pScreen->CloseScreen = pScreenPriv->CloseScreen;
xfree(pScreenPriv);
free(pScreenPriv);
return (*pScreen->CloseScreen)(i, pScreen);
}
......@@ -726,7 +726,7 @@ XvMCScreenInit(ScreenPtr pScreen, int num, XvMCAdaptorPtr pAdapt)
XvMCGeneration = serverGeneration;
}
if(!(pScreenPriv = (XvMCScreenPtr)xalloc(sizeof(XvMCScreenRec))))
if(!(pScreenPriv = (XvMCScreenPtr)malloc(sizeof(XvMCScreenRec))))
return BadAlloc;
pScreen->devPrivates[XvMCScreenIndex].ptr = (void *)pScreenPriv;
......
nx-X11/programs/Xserver/Xi/chgkbd.c
View file @ 1dbd3c88
......@@ -168,7 +168,7 @@ ProcXChangeKeyboardDevice (client)
if (df->traceSize != xf->traceSize)
{
Must_have_memory = TRUE; /* XXX */
df->trace = (WindowPtr *) xrealloc(df->trace,
df->trace = (WindowPtr *) realloc(df->trace,
xf->traceSize * sizeof(WindowPtr));
Must_have_memory = FALSE; /* XXX */
}
......
nx-X11/programs/Xserver/Xi/chgptr.c
View file @ 1dbd3c88
......@@ -185,8 +185,8 @@ void
DeleteFocusClassDeviceStruct(dev)
DeviceIntPtr dev;
{
xfree(dev->focus->trace);
xfree(dev->focus);
free(dev->focus->trace);
free(dev->focus);
dev->focus = NULL;
}
......
nx-X11/programs/Xserver/Xi/exevents.c
View file @ 1dbd3c88
......@@ -302,7 +302,7 @@ InitProximityClassDeviceStruct( DeviceIntPtr dev)
{
register ProximityClassPtr proxc;
proxc = (ProximityClassPtr)xalloc(sizeof(ProximityClassRec));
proxc = (ProximityClassPtr)malloc(sizeof(ProximityClassRec));
if (!proxc)
return FALSE;
dev->proximity = proxc;
......@@ -460,7 +460,7 @@ DeviceFocusEvent(dev, type, mode, detail, pWin)
}
}
sev = ev = (deviceStateNotify *) xalloc(evcount * sizeof(xEvent));
sev = ev = (deviceStateNotify *) malloc(evcount * sizeof(xEvent));
FixDeviceStateNotify (dev, ev, NULL, NULL, NULL, first);
if (b != NULL) {
......@@ -515,7 +515,7 @@ DeviceFocusEvent(dev, type, mode, detail, pWin)
(void) DeliverEventsToWindow(pWin, (xEvent *)sev, evcount,
DeviceStateNotifyMask, NullGrab, dev->id);
xfree (sev);
free (sev);
}
}
......@@ -741,7 +741,7 @@ AddExtensionClient (pWin, client, mask, mskidx)
if (!pWin->optional && !MakeWindowOptional (pWin))
return BadAlloc;
others = (InputClients *) xalloc(sizeof(InputClients));
others = (InputClients *) malloc(sizeof(InputClients));
if (!others)
return BadAlloc;
if (!pWin->optional->inputMasks && !MakeInputMasks (pWin))
......@@ -763,7 +763,7 @@ MakeInputMasks (pWin)
struct _OtherInputMasks *imasks;
imasks = (struct _OtherInputMasks *)
xalloc (sizeof (struct _OtherInputMasks));
malloc (sizeof (struct _OtherInputMasks));
if (!imasks)
return FALSE;
bzero((char *) imasks, sizeof (struct _OtherInputMasks));
......@@ -830,17 +830,17 @@ InputClientGone(pWin, id)
if (prev)
{
prev->next = other->next;
xfree(other);
free(other);
}
else if (!(other->next))
{
if (ShouldFreeInputMasks(pWin, TRUE))
{
wOtherInputMasks(pWin)->inputClients = other->next;
xfree(wOtherInputMasks(pWin));
free(wOtherInputMasks(pWin));
pWin->optional->inputMasks = (OtherInputMasks *) NULL;
CheckWindowOptionalNeed (pWin);
xfree(other);
free(other);
}
else
{
......@@ -853,7 +853,7 @@ InputClientGone(pWin, id)
else
{
wOtherInputMasks(pWin)->inputClients = other->next;
xfree(other);
free(other);
}
RecalculateDeviceDeliverableEvents(pWin);
return(Success);
......@@ -1027,12 +1027,12 @@ SetModifierMapping(client, dev, len, rlen, numKeyPerModifier, inputMap, k)
* list of keycodes.
*/
if (inputMapLen) {
map = (KeyCode *)xalloc(inputMapLen);
map = (KeyCode *)malloc(inputMapLen);
if (!map)
return BadAlloc;
}
if ((*k)->modifierKeyMap)
xfree((*k)->modifierKeyMap);
free((*k)->modifierKeyMap);
if (inputMapLen) {
(*k)->modifierKeyMap = map;
memmove((char *)(*k)->modifierKeyMap, (char *)inputMap, inputMapLen);
......
nx-X11/programs/Xserver/Xi/extinit.c
View file @ 1dbd3c88
......@@ -872,7 +872,7 @@ AssignTypeAndName (dev, type, name)
char *name;
{
dev->type = type;
dev->name = (char *) xalloc(strlen(name)+1);
dev->name = (char *) malloc(strlen(name)+1);
strcpy (dev->name, name);
}
......
nx-X11/programs/Xserver/Xi/getdctl.c
View file @ 1dbd3c88
......@@ -139,7 +139,7 @@ ProcXGetDeviceControl(client)
return Success;
}
buf = (char *) xalloc (total_length);
buf = (char *) malloc (total_length);
if (!buf)
{
SendErrorToClient(client, IReqCode, X_GetDeviceControl, 0,
......@@ -161,7 +161,7 @@ ProcXGetDeviceControl(client)
rep.length = (total_length+3) >> 2;
WriteReplyToClient(client, sizeof(xGetDeviceControlReply), &rep);
WriteToClient(client, total_length, savbuf);
xfree (savbuf);
free (savbuf);
return Success;
}
......
nx-X11/programs/Xserver/Xi/getfctl.c
View file @ 1dbd3c88
......@@ -165,7 +165,7 @@ ProcXGetFeedbackControl(client)
return Success;
}
buf = (char *) xalloc (total_length);
buf = (char *) malloc (total_length);
if (!buf)
{
SendErrorToClient(client, IReqCode, X_GetFeedbackControl, 0,
......@@ -190,7 +190,7 @@ ProcXGetFeedbackControl(client)
rep.length = (total_length+3) >> 2;
WriteReplyToClient(client, sizeof(xGetFeedbackControlReply), &rep);
WriteToClient(client, total_length, savbuf);
xfree (savbuf);
free (savbuf);
return Success;
}
......
nx-X11/programs/Xserver/Xi/getprop.c
View file @ 1dbd3c88
......@@ -137,7 +137,7 @@ ProcXGetDeviceDontPropagateList (client)
if (count)
{
rep.count = count;
buf = (XEventClass *) xalloc (rep.count * sizeof(XEventClass));
buf = (XEventClass *) malloc (rep.count * sizeof(XEventClass));
rep.length = (rep.count * sizeof (XEventClass) + 3) >> 2;
tbuf = buf;
......@@ -154,7 +154,7 @@ ProcXGetDeviceDontPropagateList (client)
{
client->pSwapReplyFunc = (ReplySwapPtr)Swap32Write;
WriteSwappedDataToClient( client, count * sizeof(XEventClass), buf);
xfree (buf);
free (buf);
}
return Success;
}
......
nx-X11/programs/Xserver/Xi/getselev.c
View file @ 1dbd3c88
......@@ -149,7 +149,7 @@ ProcXGetSelectedExtensionEvents(client)
total_length = (rep.all_clients_count + rep.this_client_count) *
sizeof (XEventClass);
rep.length = (total_length + 3) >> 2;
buf = (XEventClass *) xalloc (total_length);
buf = (XEventClass *) malloc (total_length);
tclient = buf;
aclient = buf + rep.this_client_count;
......@@ -168,7 +168,7 @@ ProcXGetSelectedExtensionEvents(client)
{
client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write;
WriteSwappedDataToClient( client, total_length, buf);
xfree (buf);
free (buf);
}
return Success;
}
......
nx-X11/programs/Xserver/Xi/listdev.c
View file @ 1dbd3c88
......@@ -129,7 +129,7 @@ ProcXListInputDevices (client)
SizeDeviceInfo (d, &namesize, &size);
total_length = numdevs * sizeof (xDeviceInfo) + size + namesize;
devbuf = (char *) xcalloc (1, total_length);
devbuf = (char *) calloc (1, total_length);
classbuf = devbuf + (numdevs * sizeof (xDeviceInfo));
namebuf = classbuf + size;
savbuf = devbuf;
......@@ -144,7 +144,7 @@ ProcXListInputDevices (client)
rep.length = (total_length + 3) >> 2;
WriteReplyToClient (client, sizeof (xListInputDevicesReply), &rep);
WriteToClient(client, total_length, savbuf);
xfree (savbuf);
free (savbuf);
return Success;
}
......
nx-X11/programs/Xserver/Xi/queryst.c
View file @ 1dbd3c88
......@@ -135,7 +135,7 @@ ProcXQueryDeviceState(client)
(v->numAxes * sizeof(int)));
num_classes++;
}
buf = (char *) xalloc (total_length);
buf = (char *) malloc (total_length);
if (!buf)
{
SendErrorToClient(client, IReqCode, X_QueryDeviceState, 0,
......@@ -190,7 +190,7 @@ ProcXQueryDeviceState(client)
WriteReplyToClient (client, sizeof(xQueryDeviceStateReply), &rep);
if (total_length > 0)
WriteToClient (client, total_length, savbuf);
xfree (savbuf);
free (savbuf);
return Success;
}
......
nx-X11/programs/Xserver/composite/compalloc.c
View file @ 1dbd3c88
......@@ -146,7 +146,7 @@ compRedirectWindow(ClientPtr pClient, WindowPtr pWin, int update)
* The client *could* allocate multiple, but while supported,
* it is not expected to be common
*/
ccw = xalloc (sizeof (CompClientWindowRec));
ccw = malloc (sizeof (CompClientWindowRec));
if (!ccw)
return BadAlloc;
ccw->id = FakeClientID (pClient->index);
......@@ -156,10 +156,10 @@ compRedirectWindow(ClientPtr pClient, WindowPtr pWin, int update)
*/
if (!cw)
{
cw = xalloc (sizeof (CompWindowRec));
cw = malloc (sizeof (CompWindowRec));
if (!cw)
{
xfree (ccw);
free (ccw);
return BadAlloc;
}
cw->damage = DamageCreate (compReportDamage,
......@@ -170,8 +170,8 @@ compRedirectWindow(ClientPtr pClient, WindowPtr pWin, int update)
pWin);
if (!cw->damage)
{
xfree (ccw);
xfree (cw);
free (ccw);
free (cw);
return BadAlloc;
}
......@@ -269,7 +269,7 @@ compFreeClientWindow (WindowPtr pWin, XID id)
*prev = ccw->next;
if (ccw->update == CompositeRedirectManual)
cw->update = CompositeRedirectAutomatic;
xfree (ccw);
free (ccw);
break;
}
}
......@@ -288,7 +288,7 @@ compFreeClientWindow (WindowPtr pWin, XID id)
RegionUninit(&cw->borderClip);
FAKE_DIX_SET_WINDOW_PRIVATE(pWin, NULL);
xfree (cw);
free (cw);
}
else if (cw->update == CompositeRedirectAutomatic &&
!cw->damageRegistered && pWin->redirectDraw != RedirectDrawNone)
......@@ -355,7 +355,7 @@ compRedirectSubwindows (ClientPtr pClient, WindowPtr pWin, int update)
* The client *could* allocate multiple, but while supported,
* it is not expected to be common
*/
ccw = xalloc (sizeof (CompClientWindowRec));
ccw = malloc (sizeof (CompClientWindowRec));
if (!ccw)
return BadAlloc;
ccw->id = FakeClientID (pClient->index);
......@@ -365,10 +365,10 @@ compRedirectSubwindows (ClientPtr pClient, WindowPtr pWin, int update)
*/
if (!csw)
{
csw = xalloc (sizeof (CompSubwindowsRec));
csw = malloc (sizeof (CompSubwindowsRec));
if (!csw)
{
xfree (ccw);
free (ccw);
return BadAlloc;
}
csw->update = CompositeRedirectAutomatic;
......@@ -387,10 +387,10 @@ compRedirectSubwindows (ClientPtr pClient, WindowPtr pWin, int update)
(void) compUnredirectWindow (pClient, pChild, update);
if (!csw->clients)
{
xfree (csw);
free (csw);
FAKE_DIX_SET_SUBWINDOWS_PRIVATE(pWin, NULL);
}
xfree (ccw);
free (ccw);
return ret;
}
}
......@@ -451,7 +451,7 @@ compFreeClientSubwindows (WindowPtr pWin, XID id)
for (pChild = pWin->lastChild; pChild; pChild = pChild->prevSib)
(void) compUnredirectWindow (pClient, pChild, ccw->update);
xfree (ccw);
free (ccw);
break;
}
}
......@@ -462,7 +462,7 @@ compFreeClientSubwindows (WindowPtr pWin, XID id)
if (!csw->clients)
{
FAKE_DIX_SET_SUBWINDOWS_PRIVATE(pWin, NULL);
xfree (csw);
free (csw);
}
}
......
nx-X11/programs/Xserver/composite/compinit.c
View file @ 1dbd3c88
......@@ -76,7 +76,7 @@ compCloseScreen (int index, ScreenPtr pScreen)
pScreen->GetSpans = cs->GetSpans;
pScreen->SourceValidate = cs->SourceValidate;
xfree (cs);
free (cs);
FAKE_DIX_SET_SCREEN_PRIVATE(pScreen, NULL);
ret = (*pScreen->CloseScreen) (index, pScreen);
return ret;
......@@ -230,7 +230,7 @@ compRegisterAlternateVisuals(CompScreenPtr cs, VisualID * vids, int nVisuals)
p = reallocarray(cs->alternateVisuals,
cs->numAlternateVisuals + nVisuals, sizeof(VisualID));
#else
p = xrealloc(cs->alternateVisuals,
p = realloc(cs->alternateVisuals,
sizeof(VisualID) * (cs->numAlternateVisuals + nVisuals));
#endif
if (p == NULL)
......@@ -265,7 +265,7 @@ CompositeRegisterImplicitRedirectionException(ScreenPtr pScreen,
p = reallocarray(cs->implicitRedirectExceptions,
cs->numImplicitRedirectExceptions + 1, sizeof(p[0]));
#else
p = xrealloc(cs->implicitRedirectExceptions,
p = realloc(cs->implicitRedirectExceptions,
sizeof(p[0]) * (cs->numImplicitRedirectExceptions + 1));
#endif
if (p == NULL)
......@@ -405,7 +405,7 @@ compScreenInit (ScreenPtr pScreen)
if (GetCompScreen (pScreen))
return TRUE;
cs = (CompScreenPtr) xalloc (sizeof (CompScreenRec));
cs = (CompScreenPtr) malloc (sizeof (CompScreenRec));
if (!cs)
return FALSE;
......@@ -422,7 +422,7 @@ compScreenInit (ScreenPtr pScreen)
if (!compAddAlternateVisuals (pScreen, cs))
{
xfree (cs);
free (cs);
return FALSE;
}
......
nx-X11/programs/Xserver/damageext/damageext.c
View file @ 1dbd3c88
......@@ -199,7 +199,7 @@ ProcDamageCreate (ClientPtr client)
return BadValue;
}
pDamageExt = xalloc (sizeof (DamageExtRec));
pDamageExt = malloc (sizeof (DamageExtRec));
if (!pDamageExt)
return BadAlloc;
pDamageExt->id = stuff->damage;
......@@ -214,7 +214,7 @@ ProcDamageCreate (ClientPtr client)
pDamageExt);
if (!pDamageExt->pDamage)
{
xfree (pDamageExt);
free (pDamageExt);
return BadAlloc;
}
if (!AddResource (stuff->damage, DamageExtType, (void *) pDamageExt))
......@@ -412,7 +412,7 @@ FreeDamageExt (void * value, XID did)
DamageUnregister (pDamageExt->pDrawable, pDamageExt->pDamage);
DamageDestroy (pDamageExt->pDamage);
}
xfree (pDamageExt);
free (pDamageExt);
return Success;
}
......
nx-X11/programs/Xserver/dbe/dbe.c
View file @ 1dbd3c88
......@@ -176,7 +176,7 @@ DbeAllocWinPriv(pScreen)
register int i;
pDbeScreenPriv = DBE_SCREEN_PRIV(pScreen);
pDbeWindowPriv = (DbeWindowPrivPtr)xalloc(pDbeScreenPriv->totalWinPrivSize);
pDbeWindowPriv = (DbeWindowPrivPtr)malloc(pDbeScreenPriv->totalWinPrivSize);
if (pDbeWindowPriv)
{
......@@ -268,7 +268,7 @@ DbeAllocWinPrivPriv(pScreen, index, amount)
if (index >= pDbeScreenPriv->winPrivPrivLen)
{
unsigned *nsizes;
nsizes = (unsigned *)xrealloc(pDbeScreenPriv->winPrivPrivSizes,
nsizes = (unsigned *)realloc(pDbeScreenPriv->winPrivPrivSizes,
(index + 1) * sizeof(unsigned));
if (!nsizes)
{
......@@ -476,7 +476,7 @@ ProcDbeAllocateBackBufferName(client)
}
/* Free what was allocated by the GetVisualInfo() call above. */
xfree(scrVisInfo.visinfo);
free(scrVisInfo.visinfo);
if (!visualMatched)
{
......@@ -499,7 +499,7 @@ ProcDbeAllocateBackBufferName(client)
if (!AddResource(stuff->buffer, dbeWindowPrivResType,
(void *)pDbeWindowPriv))
{
xfree(pDbeWindowPriv);
free(pDbeWindowPriv);
return(BadAlloc);
}
......@@ -564,7 +564,7 @@ ProcDbeAllocateBackBufferName(client)
}
/* malloc/realloc a new array and initialize all elements to 0. */
pDbeWindowPriv->IDs = (XID *)xrealloc(pIDs,
pDbeWindowPriv->IDs = (XID *)realloc(pIDs,
(pDbeWindowPriv->maxAvailableIDs+DBE_INCR_MAX_IDS)*sizeof(XID));
if (!pDbeWindowPriv->IDs)
{
......@@ -610,7 +610,7 @@ ProcDbeAllocateBackBufferName(client)
/* The DDX buffer allocation routine failed for the first buffer of
* this window.
*/
xfree(pDbeWindowPriv);
free(pDbeWindowPriv);
return(status);
}
......@@ -746,7 +746,7 @@ ProcDbeSwapBuffers(client)
dbeSwapInfo = (xDbeSwapInfo *)&stuff[1];
/* Allocate array to record swap information. */
swapInfo = (DbeSwapInfoPtr)Xalloc(nStuff * sizeof(DbeSwapInfoRec));
swapInfo = (DbeSwapInfoPtr)malloc(nStuff * sizeof(DbeSwapInfoRec));
if (swapInfo == NULL)
{
return(BadAlloc);
......@@ -761,14 +761,14 @@ ProcDbeSwapBuffers(client)
if (!(pWin = SecurityLookupWindow(dbeSwapInfo[i].window, client,
SecurityWriteAccess)))
{
Xfree(swapInfo);
free(swapInfo);
return(BadWindow);
}
/* Each window must be double-buffered - BadMatch. */
if (DBE_WINDOW_PRIV(pWin) == NULL)
{
Xfree(swapInfo);
free(swapInfo);
return(BadMatch);
}
......@@ -777,7 +777,7 @@ ProcDbeSwapBuffers(client)
{
if (dbeSwapInfo[i].window == dbeSwapInfo[j].window)
{
Xfree(swapInfo);
free(swapInfo);
return(BadMatch);
}
}
......@@ -788,7 +788,7 @@ ProcDbeSwapBuffers(client)
(dbeSwapInfo[i].swapAction != XdbeUntouched ) &&
(dbeSwapInfo[i].swapAction != XdbeCopied ))
{
Xfree(swapInfo);
free(swapInfo);
return(BadValue);
}
......@@ -818,12 +818,12 @@ ProcDbeSwapBuffers(client)
error = (*pDbeScreenPriv->SwapBuffers)(client, &nStuff, swapInfo);
if (error != Success)
{
Xfree(swapInfo);
free(swapInfo);
return(error);
}
}
Xfree(swapInfo);
free(swapInfo);
return(Success);
} /* ProcDbeSwapBuffers() */
......@@ -912,7 +912,7 @@ ProcDbeGetVisualInfo(client)
/* Make sure any specified drawables are valid. */
if (stuff->n != 0)
{
if (!(pDrawables = (DrawablePtr *)Xalloc(stuff->n *
if (!(pDrawables = (DrawablePtr *)malloc(stuff->n *
sizeof(DrawablePtr))))
{
return(BadAlloc);
......@@ -925,19 +925,19 @@ ProcDbeGetVisualInfo(client)
if (!(pDrawables[i] = (DrawablePtr)SecurityLookupDrawable(
drawables[i], client, SecurityReadAccess)))
{
Xfree(pDrawables);
free(pDrawables);
return(BadDrawable);
}
}
}
count = (stuff->n == 0) ? screenInfo.numScreens : stuff->n;
if (!(pScrVisInfo = (XdbeScreenVisualInfo *)xalloc(count *
if (!(pScrVisInfo = (XdbeScreenVisualInfo *)malloc(count *
sizeof(XdbeScreenVisualInfo))))
{
if (pDrawables)
{
Xfree(pDrawables);
free(pDrawables);
}
return(BadAlloc);
......@@ -958,13 +958,13 @@ ProcDbeGetVisualInfo(client)
/* Free visinfos that we allocated for previous screen infos.*/
for (j = 0; j < i; j++)
{
xfree(pScrVisInfo[j].visinfo);
free(pScrVisInfo[j].visinfo);
}
/* Free pDrawables if we needed to allocate it above. */
if (pDrawables)
{
Xfree(pDrawables);
free(pDrawables);
}
return(BadAlloc);
......@@ -1039,13 +1039,13 @@ ProcDbeGetVisualInfo(client)
/* Clean up memory. */
for (i = 0; i < count; i++)
{
xfree(pScrVisInfo[i].visinfo);
free(pScrVisInfo[i].visinfo);
}
xfree(pScrVisInfo);
free(pScrVisInfo);
if (pDrawables)
{
Xfree(pDrawables);
free(pDrawables);
}
return(client->noClientException);
......@@ -1640,7 +1640,7 @@ DbeWindowPrivDelete(pDbeWinPriv, id)
DBE_INIT_MAX_IDS * sizeof(XID));
/* Free the extended array; use the static array. */
xfree(pDbeWindowPriv->IDs);
free(pDbeWindowPriv->IDs);
pDbeWindowPriv->IDs = pDbeWindowPriv->initIDs;
pDbeWindowPriv->maxAvailableIDs = DBE_INIT_MAX_IDS;
}
......@@ -1671,7 +1671,7 @@ DbeWindowPrivDelete(pDbeWinPriv, id)
(void *)NULL;
/* We are done with the window priv. */
xfree(pDbeWindowPriv);
free(pDbeWindowPriv);
}
return(Success);
......@@ -1719,10 +1719,10 @@ DbeResetProc(extEntry)
if (pDbeScreenPriv->winPrivPrivSizes)
{
xfree(pDbeScreenPriv->winPrivPrivSizes);
free(pDbeScreenPriv->winPrivPrivSizes);
}
xfree(pDbeScreenPriv);
free(pDbeScreenPriv);
}
}
......@@ -1874,7 +1874,7 @@ DbeExtensionInit()
if (!AllocateWindowPrivate(pScreen, dbeWindowPrivIndex, 0) ||
!(pDbeScreenPriv =
(DbeScreenPrivPtr)Xcalloc(sizeof(DbeScreenPrivRec))))
(DbeScreenPrivPtr)calloc(1, sizeof(DbeScreenPrivRec))))
{
/* If we can not alloc a window or screen private,
* then free any privates that we already alloc'ed and return
......@@ -1882,7 +1882,7 @@ DbeExtensionInit()
for (j = 0; j < i; j++)
{
xfree(screenInfo.screens[j]->devPrivates[dbeScreenPrivIndex].ptr);
free(screenInfo.screens[j]->devPrivates[dbeScreenPrivIndex].ptr);
screenInfo.screens[j]->devPrivates[dbeScreenPrivIndex].ptr = NULL;
}
return;
......@@ -1986,7 +1986,7 @@ DbeExtensionInit()
for (i = 0; i < screenInfo.numScreens; i++)
{
xfree(screenInfo.screens[i]->devPrivates[dbeScreenPrivIndex].ptr);
free(screenInfo.screens[i]->devPrivates[dbeScreenPrivIndex].ptr);
pScreen->devPrivates[dbeScreenPrivIndex].ptr = NULL;
}
return;
......
nx-X11/programs/Xserver/dbe/midbe.c
View file @ 1dbd3c88
......@@ -115,7 +115,7 @@ miDbeGetVisualInfo(pScreen, pScrVisInfo)
}
/* Allocate an array of XdbeVisualInfo items. */
if (!(visInfo = (XdbeVisualInfo *)xalloc(count * sizeof(XdbeVisualInfo))))
if (!(visInfo = (XdbeVisualInfo *)malloc(count * sizeof(XdbeVisualInfo))))
{
return(FALSE); /* memory alloc failure */
}
......
nx-X11/programs/Xserver/dix/atom.c
View file @ 1dbd3c88
......@@ -109,7 +109,7 @@ MakeAtom(const char *string, unsigned len, Bool makeit)
{
register NodePtr nd;
nd = (NodePtr) xalloc(sizeof(NodeRec));
nd = (NodePtr) malloc(sizeof(NodeRec));
if (!nd)
return BAD_RESOURCE;
if (lastAtom < XA_LAST_PREDEFINED)
......@@ -118,9 +118,9 @@ MakeAtom(const char *string, unsigned len, Bool makeit)
}
else
{
nd->string = (char *) xalloc(len + 1);
nd->string = (char *) malloc(len + 1);
if (!nd->string) {
xfree(nd);
free(nd);
return BAD_RESOURCE;
}
strncpy(nd->string, string, (int)len);
......@@ -129,12 +129,12 @@ MakeAtom(const char *string, unsigned len, Bool makeit)
if ((lastAtom + 1) >= tableLength) {
NodePtr *table;
table = (NodePtr *) xrealloc(nodeTable,
table = (NodePtr *) realloc(nodeTable,
tableLength * (2 * sizeof(NodePtr)));
if (!table) {
if (nd->string != string)
xfree(nd->string);
xfree(nd);
free(nd->string);
free(nd);
return BAD_RESOURCE;
}
tableLength <<= 1;
......@@ -180,8 +180,8 @@ FreeAtom(NodePtr patom)
if(patom->right)
FreeAtom(patom->right);
if (patom->a > XA_LAST_PREDEFINED)
xfree(patom->string);
xfree(patom);
free(patom->string);
free(patom);
}
void
......@@ -191,7 +191,7 @@ FreeAllAtoms()
return;
FreeAtom(atomRoot);
atomRoot = (NodePtr)NULL;
xfree(nodeTable);
free(nodeTable);
nodeTable = (NodePtr *)NULL;
lastAtom = None;
}
......@@ -201,7 +201,7 @@ InitAtoms()
{
FreeAllAtoms();
tableLength = InitialTableSize;
nodeTable = (NodePtr *)xalloc(InitialTableSize*sizeof(NodePtr));
nodeTable = (NodePtr *)malloc(InitialTableSize*sizeof(NodePtr));
if (!nodeTable)
AtomError();
nodeTable[None] = (NodePtr)NULL;
......
nx-X11/programs/Xserver/dix/cursor.c
View file @ 1dbd3c88
......@@ -81,10 +81,10 @@ FreeCursorBits(CursorBitsPtr bits)
{
if (--bits->refcnt > 0)
return;
xfree(bits->source);
xfree(bits->mask);
free(bits->source);
free(bits->mask);
#ifdef ARGB_CURSOR
xfree(bits->argb);
free(bits->argb);
#endif
if (bits->refcnt == 0)
{
......@@ -98,9 +98,9 @@ FreeCursorBits(CursorBitsPtr bits)
{
*prev = this->next;
CloseFont(this->font, (Font)0);
xfree(this);
free(this);
}
xfree(bits);
free(bits);
}
}
......@@ -126,7 +126,7 @@ FreeCursor(void * value, XID cid)
(void)( *pscr->UnrealizeCursor)( pscr, pCurs);
}
FreeCursorBits(pCurs->bits);
xfree( pCurs);
free( pCurs);
return(Success);
}
......@@ -174,11 +174,11 @@ AllocCursorARGB(unsigned char *psrcbits, unsigned char *pmaskbits, CARD32 *argb,
int nscr;
ScreenPtr pscr;
pCurs = (CursorPtr)xalloc(sizeof(CursorRec) + sizeof(CursorBits));
pCurs = (CursorPtr)malloc(sizeof(CursorRec) + sizeof(CursorBits));
if (!pCurs)
{
xfree(psrcbits);
xfree(pmaskbits);
free(psrcbits);
free(pmaskbits);
return (CursorPtr)NULL;
}
bits = (CursorBitsPtr)((char *)pCurs + sizeof(CursorRec));
......@@ -223,7 +223,7 @@ AllocCursorARGB(unsigned char *psrcbits, unsigned char *pmaskbits, CARD32 *argb,
( *pscr->UnrealizeCursor)( pscr, pCurs);
}
FreeCursorBits(bits);
xfree(pCurs);
free(pCurs);
return (CursorPtr)NULL;
}
}
......@@ -292,7 +292,7 @@ AllocGlyphCursor(Font source, unsigned sourceChar, Font mask, unsigned maskChar,
}
if (pShare)
{
pCurs = (CursorPtr)xalloc(sizeof(CursorRec));
pCurs = (CursorPtr)malloc(sizeof(CursorRec));
if (!pCurs)
return BadAlloc;
bits = pShare->bits;
......@@ -311,7 +311,7 @@ AllocGlyphCursor(Font source, unsigned sourceChar, Font mask, unsigned maskChar,
register unsigned char *mskptr;
n = BitmapBytePad(cm.width)*(long)cm.height;
mskptr = mskbits = (unsigned char *)xalloc(n);
mskptr = mskbits = (unsigned char *)malloc(n);
if (!mskptr)
return BadAlloc;
while (--n >= 0)
......@@ -329,12 +329,12 @@ AllocGlyphCursor(Font source, unsigned sourceChar, Font mask, unsigned maskChar,
}
if ((res = ServerBitsFromGlyph(sourcefont, sourceChar, &cm, &srcbits)) != 0)
{
xfree(mskbits);
free(mskbits);
return res;
}
if (sourcefont != maskfont)
{
pCurs = (CursorPtr)xalloc(sizeof(CursorRec) + sizeof(CursorBits));
pCurs = (CursorPtr)malloc(sizeof(CursorRec) + sizeof(CursorBits));
if (pCurs)
bits = (CursorBitsPtr)((char *)pCurs + sizeof(CursorRec));
else
......@@ -342,17 +342,17 @@ AllocGlyphCursor(Font source, unsigned sourceChar, Font mask, unsigned maskChar,
}
else
{
pCurs = (CursorPtr)xalloc(sizeof(CursorRec));
pCurs = (CursorPtr)malloc(sizeof(CursorRec));
if (pCurs)
bits = (CursorBitsPtr)xalloc(sizeof(CursorBits));
bits = (CursorBitsPtr)malloc(sizeof(CursorBits));
else
bits = (CursorBitsPtr)NULL;
}
if (!bits)
{
xfree(pCurs);
xfree(mskbits);
xfree(srcbits);
free(pCurs);
free(mskbits);
free(srcbits);
return BadAlloc;
}
bits->source = srcbits;
......@@ -369,7 +369,7 @@ AllocGlyphCursor(Font source, unsigned sourceChar, Font mask, unsigned maskChar,
else
{
bits->refcnt = 1;
pShare = (GlyphSharePtr)xalloc(sizeof(GlyphShare));
pShare = (GlyphSharePtr)malloc(sizeof(GlyphShare));
if (!pShare)
{
FreeCursorBits(bits);
......@@ -414,7 +414,7 @@ AllocGlyphCursor(Font source, unsigned sourceChar, Font mask, unsigned maskChar,
( *pscr->UnrealizeCursor)( pscr, pCurs);
}
FreeCursorBits(pCurs->bits);
xfree(pCurs);
free(pCurs);
return BadAlloc;
}
}
......
nx-X11/programs/Xserver/dix/devices.c
View file @ 1dbd3c88
......@@ -86,7 +86,7 @@ _AddInputDevice(DeviceProc deviceProc, Bool autoStart)
if (inputInfo.numDevices >= MAX_DEVICES)
return (DeviceIntPtr)NULL;
dev = (DeviceIntPtr) xalloc(sizeof(DeviceIntRec));
dev = (DeviceIntPtr) malloc(sizeof(DeviceIntRec));
if (!dev)
return (DeviceIntPtr)NULL;
dev->name = (char *)NULL;
......@@ -208,29 +208,29 @@ CloseDevice(register DeviceIntPtr dev)
if (dev->inited)
(void)(*dev->deviceProc)(dev, DEVICE_CLOSE);
xfree(dev->name);
free(dev->name);
if (dev->key)
{
#ifdef XKB
if (dev->key->xkbInfo)
XkbFreeInfo(dev->key->xkbInfo);
#endif
xfree(dev->key->curKeySyms.map);
xfree(dev->key->modifierKeyMap);
xfree(dev->key);
free(dev->key->curKeySyms.map);
free(dev->key->modifierKeyMap);
free(dev->key);
}
xfree(dev->valuator);
free(dev->valuator);
#ifdef XKB
if ((dev->button)&&(dev->button->xkb_acts))
xfree(dev->button->xkb_acts);
free(dev->button->xkb_acts);
#endif
xfree(dev->button);
free(dev->button);
if (dev->focus)
{
xfree(dev->focus->trace);
xfree(dev->focus);
free(dev->focus->trace);
free(dev->focus);
}
xfree(dev->proximity);
free(dev->proximity);
for (k=dev->kbdfeed; k; k=knext)
{
knext = k->next;
......@@ -238,29 +238,29 @@ CloseDevice(register DeviceIntPtr dev)
if (k->xkb_sli)
XkbFreeSrvLedInfo(k->xkb_sli);
#endif
xfree(k);
free(k);
}
for (p=dev->ptrfeed; p; p=pnext)
{
pnext = p->next;
xfree(p);
free(p);
}
for (i=dev->intfeed; i; i=inext)
{
inext = i->next;
xfree(i);
free(i);
}
for (s=dev->stringfeed; s; s=snext)
{
snext = s->next;
xfree(s->ctrl.symbols_supported);
xfree(s->ctrl.symbols_displayed);
xfree(s);
free(s->ctrl.symbols_supported);
free(s->ctrl.symbols_displayed);
free(s);
}
for (b=dev->bell; b; b=bnext)
{
bnext = b->next;
xfree(b);
free(b);
}
for (l=dev->leds; l; l=lnext)
{
......@@ -269,15 +269,15 @@ CloseDevice(register DeviceIntPtr dev)
if (l->xkb_sli)
XkbFreeSrvLedInfo(l->xkb_sli);
#endif
xfree(l);
free(l);
}
#ifdef XKB
while (dev->xkb_interest) {
XkbRemoveResourceClient((DevicePtr)dev,dev->xkb_interest->resource);
}
#endif
xfree(dev->sync.event);
xfree(dev);
free(dev->sync.event);
free(dev);
}
void
......@@ -369,7 +369,7 @@ _RegisterPointerDevice(DeviceIntPtr device)
if (!device->name)
{
char *p = "pointer";
device->name = (char *)xalloc(strlen(p) + 1);
device->name = (char *)malloc(strlen(p) + 1);
strcpy(device->name, p);
}
}
......@@ -392,7 +392,7 @@ _RegisterKeyboardDevice(DeviceIntPtr device)
if (!device->name)
{
char *k = "keyboard";
device->name = (char *)xalloc(strlen(k) + 1);
device->name = (char *)malloc(strlen(k) + 1);
strcpy(device->name, k);
}
}
......@@ -461,7 +461,7 @@ SetKeySymsMap(register KeySymsPtr dst, register KeySymsPtr src)
KeySym *map;
int bytes = sizeof(KeySym) * src->mapWidth *
(dst->maxKeyCode - dst->minKeyCode + 1);
map = (KeySym *)xalloc(bytes);
map = (KeySym *)malloc(bytes);
if (!map)
return FALSE;
bzero((char *)map, bytes);
......@@ -471,7 +471,7 @@ SetKeySymsMap(register KeySymsPtr dst, register KeySymsPtr src)
memmove((char *)&map[i*src->mapWidth],
(char *)&dst->map[i*dst->mapWidth],
dst->mapWidth * sizeof(KeySym));
xfree(dst->map);
free(dst->map);
}
dst->mapWidth = src->mapWidth;
dst->map = map;
......@@ -504,7 +504,7 @@ InitModMap(register KeyClassPtr keyc)
}
}
}
keyc->modifierKeyMap = (KeyCode *)xalloc(8*keyc->maxKeysPerModifier);
keyc->modifierKeyMap = (KeyCode *)malloc(8*keyc->maxKeysPerModifier);
if (!keyc->modifierKeyMap && keyc->maxKeysPerModifier)
return (FALSE);
bzero((char *)keyc->modifierKeyMap, 8*(int)keyc->maxKeysPerModifier);
......@@ -531,7 +531,7 @@ InitKeyClassDeviceStruct(DeviceIntPtr dev, KeySymsPtr pKeySyms, CARD8 pModifiers
int i;
register KeyClassPtr keyc;
keyc = (KeyClassPtr)xalloc(sizeof(KeyClassRec));
keyc = (KeyClassPtr)malloc(sizeof(KeyClassRec));
if (!keyc)
return FALSE;
keyc->curKeySyms.map = (KeySym *)NULL;
......@@ -550,9 +550,9 @@ InitKeyClassDeviceStruct(DeviceIntPtr dev, KeySymsPtr pKeySyms, CARD8 pModifiers
keyc->modifierKeyCount[i] = 0;
if (!SetKeySymsMap(&keyc->curKeySyms, pKeySyms) || !InitModMap(keyc))
{
xfree(keyc->curKeySyms.map);
xfree(keyc->modifierKeyMap);
xfree(keyc);
free(keyc->curKeySyms.map);
free(keyc->modifierKeyMap);
free(keyc);
return FALSE;
}
dev->key = keyc;
......@@ -570,7 +570,7 @@ InitButtonClassDeviceStruct(register DeviceIntPtr dev, int numButtons,
register ButtonClassPtr butc;
int i;
butc = (ButtonClassPtr)xalloc(sizeof(ButtonClassRec));
butc = (ButtonClassPtr)malloc(sizeof(ButtonClassRec));
if (!butc)
return FALSE;
butc->numButtons = numButtons;
......@@ -595,7 +595,7 @@ InitValuatorClassDeviceStruct(DeviceIntPtr dev, int numAxes,
int i;
register ValuatorClassPtr valc;
valc = (ValuatorClassPtr)xalloc(sizeof(ValuatorClassRec) +
valc = (ValuatorClassPtr)malloc(sizeof(ValuatorClassRec) +
numAxes * sizeof(AxisInfo) +
numAxes * sizeof(unsigned int));
if (!valc)
......@@ -618,7 +618,7 @@ InitFocusClassDeviceStruct(DeviceIntPtr dev)
{
register FocusClassPtr focc;
focc = (FocusClassPtr)xalloc(sizeof(FocusClassRec));
focc = (FocusClassPtr)malloc(sizeof(FocusClassRec));
if (!focc)
return FALSE;
focc->win = PointerRootWin;
......@@ -637,7 +637,7 @@ InitKbdFeedbackClassDeviceStruct(DeviceIntPtr dev, BellProcPtr bellProc,
{
register KbdFeedbackPtr feedc;
feedc = (KbdFeedbackPtr)xalloc(sizeof(KbdFeedbackClassRec));
feedc = (KbdFeedbackPtr)malloc(sizeof(KbdFeedbackClassRec));
if (!feedc)
return FALSE;
feedc->BellProc = bellProc;
......@@ -664,7 +664,7 @@ InitPtrFeedbackClassDeviceStruct(DeviceIntPtr dev, PtrCtrlProcPtr controlProc)
{
register PtrFeedbackPtr feedc;
feedc = (PtrFeedbackPtr)xalloc(sizeof(PtrFeedbackClassRec));
feedc = (PtrFeedbackPtr)malloc(sizeof(PtrFeedbackClassRec));
if (!feedc)
return FALSE;
feedc->CtrlProc = controlProc;
......@@ -708,7 +708,7 @@ InitStringFeedbackClassDeviceStruct (
int i;
register StringFeedbackPtr feedc;
feedc = (StringFeedbackPtr)xalloc(sizeof(StringFeedbackClassRec));
feedc = (StringFeedbackPtr)malloc(sizeof(StringFeedbackClassRec));
if (!feedc)
return FALSE;
feedc->CtrlProc = controlProc;
......@@ -716,16 +716,16 @@ InitStringFeedbackClassDeviceStruct (
feedc->ctrl.num_symbols_displayed = 0;
feedc->ctrl.max_symbols = max_symbols;
feedc->ctrl.symbols_supported = (KeySym *)
xalloc (sizeof (KeySym) * num_symbols_supported);
malloc (sizeof (KeySym) * num_symbols_supported);
feedc->ctrl.symbols_displayed = (KeySym *)
xalloc (sizeof (KeySym) * max_symbols);
malloc (sizeof (KeySym) * max_symbols);
if (!feedc->ctrl.symbols_supported || !feedc->ctrl.symbols_displayed)
{
if (feedc->ctrl.symbols_supported)
xfree(feedc->ctrl.symbols_supported);
free(feedc->ctrl.symbols_supported);
if (feedc->ctrl.symbols_displayed)
xfree(feedc->ctrl.symbols_displayed);
xfree(feedc);
free(feedc->ctrl.symbols_displayed);
free(feedc);
return FALSE;
}
for (i=0; i<num_symbols_supported; i++)
......@@ -746,7 +746,7 @@ InitBellFeedbackClassDeviceStruct (DeviceIntPtr dev, BellProcPtr bellProc,
{
register BellFeedbackPtr feedc;
feedc = (BellFeedbackPtr)xalloc(sizeof(BellFeedbackClassRec));
feedc = (BellFeedbackPtr)malloc(sizeof(BellFeedbackClassRec));
if (!feedc)
return FALSE;
feedc->CtrlProc = controlProc;
......@@ -765,7 +765,7 @@ InitLedFeedbackClassDeviceStruct (DeviceIntPtr dev, LedCtrlProcPtr controlProc)
{
register LedFeedbackPtr feedc;
feedc = (LedFeedbackPtr)xalloc(sizeof(LedFeedbackClassRec));
feedc = (LedFeedbackPtr)malloc(sizeof(LedFeedbackClassRec));
if (!feedc)
return FALSE;
feedc->CtrlProc = controlProc;
......@@ -786,7 +786,7 @@ InitIntegerFeedbackClassDeviceStruct (DeviceIntPtr dev, IntegerCtrlProcPtr contr
{
register IntegerFeedbackPtr feedc;
feedc = (IntegerFeedbackPtr)xalloc(sizeof(IntegerFeedbackClassRec));
feedc = (IntegerFeedbackPtr)malloc(sizeof(IntegerFeedbackClassRec));
if (!feedc)
return FALSE;
feedc->CtrlProc = controlProc;
......@@ -997,11 +997,11 @@ ProcSetModifierMapping(ClientPtr client)
* Now build the keyboard's modifier bitmap from the
* list of keycodes.
*/
map = (KeyCode *)xalloc(inputMapLen);
map = (KeyCode *)malloc(inputMapLen);
if (!map && inputMapLen)
return BadAlloc;
if (keyc->modifierKeyMap)
xfree(keyc->modifierKeyMap);
free(keyc->modifierKeyMap);
keyc->modifierKeyMap = map;
memmove((char *)map, (char *)inputMap, inputMapLen);
......
nx-X11/programs/Xserver/dix/dispatch.c
View file @ 1dbd3c88
......@@ -214,7 +214,7 @@ void
InitSelections()
{
if (CurrentSelections)
xfree(CurrentSelections);
free(CurrentSelections);
CurrentSelections = (Selection *)NULL;
NumCurrentSelections = 0;
}
......@@ -1021,9 +1021,9 @@ ProcSetSelectionOwner(register ClientPtr client)
Selection *newsels;
if (i == 0)
newsels = (Selection *)xalloc(sizeof(Selection));
newsels = (Selection *)malloc(sizeof(Selection));
else
newsels = (Selection *)xrealloc(CurrentSelections,
newsels = (Selection *)realloc(CurrentSelections,
(NumCurrentSelections + 1) * sizeof(Selection));
if (!newsels)
return BadAlloc;
......@@ -2188,7 +2188,7 @@ DoGetImage(register ClientPtr client, int format, Drawable drawable,
xgi.length = length;
if (im_return) {
pBuf = (char *)xcalloc(1, sz_xGetImageReply + length);
pBuf = (char *)calloc(1, sz_xGetImageReply + length);
if (!pBuf)
return (BadAlloc);
if (widthBytesLine == 0)
......@@ -3084,13 +3084,13 @@ ProcCreateCursor (register ClientPtr client)
return (BadMatch);
n = BitmapBytePad(width)*height;
srcbits = (unsigned char *)xalloc(n);
srcbits = (unsigned char *)malloc(n);
if (!srcbits)
return (BadAlloc);
mskbits = (unsigned char *)xalloc(n);
mskbits = (unsigned char *)malloc(n);
if (!mskbits)
{
xfree(srcbits);
free(srcbits);
return (BadAlloc);
}
......@@ -3332,7 +3332,7 @@ ProcListHosts(register ClientPtr client)
client->pSwapReplyFunc = (ReplySwapPtr) SLHostsExtend;
WriteSwappedDataToClient(client, len, pdata);
}
xfree(pdata);
free(pdata);
return (client->noClientException);
}
......@@ -3600,7 +3600,7 @@ CloseDownClient(register ClientPtr client)
#ifdef SMART_SCHEDULE
SmartLastClient = NullClient;
#endif
xfree(client);
free(client);
while (!clients[currentMaxClients-1])
currentMaxClients--;
......@@ -3716,7 +3716,7 @@ InitClientPrivates(ClientPtr client)
ppriv = (DevUnion *)(client + 1);
else
{
ppriv = (DevUnion *)xalloc(totalClientSize - sizeof(ClientRec));
ppriv = (DevUnion *)malloc(totalClientSize - sizeof(ClientRec));
if (!ppriv)
return 0;
}
......@@ -3753,14 +3753,14 @@ ClientPtr NextAvailableClient(void * ospriv)
i = nextFreeClientID;
if (i == MAXCLIENTS)
return (ClientPtr)NULL;
clients[i] = client = (ClientPtr)xalloc(totalClientSize);
clients[i] = client = (ClientPtr)malloc(totalClientSize);
if (!client)
return (ClientPtr)NULL;
InitClient(client, i, ospriv);
InitClientPrivates(client);
if (!InitClientResources(client))
{
xfree(client);
free(client);
return (ClientPtr)NULL;
}
data.reqType = 1;
......@@ -3768,7 +3768,7 @@ ClientPtr NextAvailableClient(void * ospriv)
if (!InsertFakeRequest(client, (char *)&data, sz_xReq))
{
FreeClientResources(client);
xfree(client);
free(client);
return (ClientPtr)NULL;
}
if (i == currentMaxClients)
......
nx-X11/programs/Xserver/dix/dixutils.c
View file @ 1dbd3c88
......@@ -351,7 +351,7 @@ AlterSaveSetForClient(ClientPtr client, WindowPtr pWin, unsigned mode,
if (j < numnow) /* duplicate */
return(Success);
numnow++;
pTmp = (SaveSetElt *)xrealloc(client->saveSet, sizeof(*pTmp) * numnow);
pTmp = (SaveSetElt *)realloc(client->saveSet, sizeof(*pTmp) * numnow);
if (!pTmp)
return(BadAlloc);
client->saveSet = pTmp;
......@@ -371,13 +371,13 @@ AlterSaveSetForClient(ClientPtr client, WindowPtr pWin, unsigned mode,
numnow--;
if (numnow)
{
pTmp = (SaveSetElt *)xrealloc(client->saveSet, sizeof(*pTmp) * numnow);
pTmp = (SaveSetElt *)realloc(client->saveSet, sizeof(*pTmp) * numnow);
if (pTmp)
client->saveSet = pTmp;
}
else
{
xfree(client->saveSet);
free(client->saveSet);
client->saveSet = (SaveSetElt *)NULL;
}
client->numSaved = numnow;
......@@ -504,7 +504,7 @@ RegisterBlockAndWakeupHandlers (BlockHandlerProcPtr blockHandler,
if (numHandlers >= sizeHandlers)
{
new = (BlockHandlerPtr) xrealloc (handlers, (numHandlers + 1) *
new = (BlockHandlerPtr) realloc (handlers, (numHandlers + 1) *
sizeof (BlockHandlerRec));
if (!new)
return FALSE;
......@@ -549,7 +549,7 @@ RemoveBlockAndWakeupHandlers (BlockHandlerProcPtr blockHandler,
void
InitBlockAndWakeupHandlers ()
{
xfree (handlers);
free (handlers);
handlers = (BlockHandlerPtr) 0;
numHandlers = 0;
sizeHandlers = 0;
......@@ -581,7 +581,7 @@ ProcessWorkQueue(void)
{
/* remove q from the list */
*p = q->next; /* don't fetch until after func called */
xfree (q);
free (q);
}
else
{
......@@ -604,7 +604,7 @@ ProcessWorkQueueZombies(void)
(void) (*q->function) (q->client, q->closure);
/* remove q from the list */
*p = q->next; /* don't fetch until after func called */
xfree (q);
free (q);
}
else
{
......@@ -621,7 +621,7 @@ QueueWorkProc (
{
WorkQueuePtr q;
q = (WorkQueuePtr) xalloc (sizeof *q);
q = (WorkQueuePtr) malloc (sizeof *q);
if (!q)
return FALSE;
q->function = function;
......@@ -655,7 +655,7 @@ ClientSleep (ClientPtr client, ClientSleepProcPtr function, void * closure)
{
SleepQueuePtr q;
q = (SleepQueuePtr) xalloc (sizeof *q);
q = (SleepQueuePtr) malloc (sizeof *q);
if (!q)
return FALSE;
......@@ -692,7 +692,7 @@ ClientWakeup (ClientPtr client)
if (q->client == client)
{
*prev = q->next;
xfree (q);
free (q);
if (client->clientGone)
/* Oops -- new zombie cleanup code ensures this only
* happens from inside CloseDownClient; don't want to
......@@ -735,7 +735,7 @@ _AddCallback(
{
CallbackPtr cbr;
cbr = (CallbackPtr) xalloc(sizeof(CallbackRec));
cbr = (CallbackPtr) malloc(sizeof(CallbackRec));
if (!cbr)
return FALSE;
cbr->proc = callback;
......@@ -775,7 +775,7 @@ _DeleteCallback(
cbl->list = cbr->next;
else
pcbr->next = cbr->next;
xfree(cbr);
free(cbr);
}
return TRUE;
}
......@@ -820,12 +820,12 @@ _CallCallbacks(
if (pcbr)
{
cbr = cbr->next;
xfree(pcbr->next);
free(pcbr->next);
pcbr->next = cbr;
} else
{
cbr = cbr->next;
xfree(cbl->list);
free(cbl->list);
cbl->list = cbr;
}
cbl->numDeleted--;
......@@ -865,9 +865,9 @@ _DeleteCallbackList(
for (cbr = cbl->list; cbr != NULL; cbr = nextcbr)
{
nextcbr = cbr->next;
xfree(cbr);
free(cbr);
}
xfree(cbl);
free(cbl);
*pcbl = NULL;
}
......@@ -888,7 +888,7 @@ CreateCallbackList(CallbackListPtr *pcbl, CallbackFuncsPtr cbfuncs)
int i;
if (!pcbl) return FALSE;
cbl = (CallbackListPtr) xalloc(sizeof(CallbackListRec));
cbl = (CallbackListPtr) malloc(sizeof(CallbackListRec));
if (!cbl) return FALSE;
cbl->funcs = cbfuncs ? *cbfuncs : default_cbfuncs;
cbl->inCallback = 0;
......@@ -955,7 +955,7 @@ InitCallbackManager()
{
DeleteCallbackList(listsToCleanup[i]);
}
if (listsToCleanup) xfree(listsToCleanup);
if (listsToCleanup) free(listsToCleanup);
numCallbackListsToCleanup = 0;
listsToCleanup = NULL;
......
nx-X11/programs/Xserver/dix/events.c
View file @ 1dbd3c88
......@@ -1027,7 +1027,7 @@ EnqueueEvent(xEvent *xE, DeviceIntPtr device, int count)
return;
}
}
qe = (QdEventPtr)xalloc(sizeof(QdEventRec) + (count * sizeof(xEvent)));
qe = (QdEventPtr)malloc(sizeof(QdEventRec) + (count * sizeof(xEvent)));
if (!qe)
return;
qe->next = (QdEventPtr)NULL;
......@@ -1076,7 +1076,7 @@ PlayReleasedEvents(void)
#endif
(*qe->device->public.processInputProc)(qe->event, qe->device,
qe->evcount);
xfree(qe);
free(qe);
for (dev = inputInfo.devices; dev && dev->sync.frozen; dev = dev->next)
;
if (!dev)
......@@ -1952,7 +1952,7 @@ XYToWindow(int x, int y)
{
spriteTraceSize += 10;
Must_have_memory = TRUE; /* XXX */
spriteTrace = (WindowPtr *)xrealloc(
spriteTrace = (WindowPtr *)realloc(
spriteTrace, spriteTraceSize*sizeof(WindowPtr));
Must_have_memory = FALSE; /* XXX */
}
......@@ -2467,7 +2467,7 @@ CheckPassiveGrabsOnWindow(
if (device->sync.evcount < count)
{
Must_have_memory = TRUE; /* XXX */
device->sync.event = (xEvent *)xrealloc(device->sync.event,
device->sync.event = (xEvent *)realloc(device->sync.event,
count*
sizeof(xEvent));
Must_have_memory = FALSE; /* XXX */
......@@ -2639,7 +2639,7 @@ DeliverGrabbedEvent(register xEvent *xE, register DeviceIntPtr thisDev,
if (thisDev->sync.evcount < count)
{
Must_have_memory = TRUE; /* XXX */
thisDev->sync.event = (xEvent *)xrealloc(thisDev->sync.event,
thisDev->sync.event = (xEvent *)realloc(thisDev->sync.event,
count*sizeof(xEvent));
Must_have_memory = FALSE; /* XXX */
}
......@@ -2959,7 +2959,7 @@ OtherClientGone(void * value, XID id)
if (!(pWin->optional->otherClients = other->next))
CheckWindowOptionalNeed (pWin);
}
xfree(other);
free(other);
RecalculateDeliverableEvents(pWin);
return(Success);
}
......@@ -3030,7 +3030,7 @@ EventSelectForWindow(register WindowPtr pWin, register ClientPtr client, Mask ma
check = 0;
if (!pWin->optional && !MakeWindowOptional (pWin))
return BadAlloc;
others = (OtherClients *) xalloc(sizeof(OtherClients));
others = (OtherClients *) malloc(sizeof(OtherClients));
if (!others)
return BadAlloc;
others->mask = mask;
......@@ -3530,7 +3530,7 @@ SetInputFocus(
{
focus->traceSize = depth+1;
Must_have_memory = TRUE; /* XXX */
focus->trace = (WindowPtr *)xrealloc(focus->trace,
focus->trace = (WindowPtr *)realloc(focus->trace,
focus->traceSize *
sizeof(WindowPtr));
Must_have_memory = FALSE; /* XXX */
......@@ -3929,7 +3929,7 @@ InitEvents()
if (spriteTraceSize == 0)
{
spriteTraceSize = 32;
spriteTrace = (WindowPtr *)xalloc(32*sizeof(WindowPtr));
spriteTrace = (WindowPtr *)malloc(32*sizeof(WindowPtr));
if (!spriteTrace)
FatalError("failed to allocate spriteTrace");
}
......@@ -3948,7 +3948,7 @@ InitEvents()
while (syncEvents.pending)
{
QdEventPtr next = syncEvents.pending->next;
xfree(syncEvents.pending);
free(syncEvents.pending);
syncEvents.pending = next;
}
syncEvents.pendtail = &syncEvents.pending;
......@@ -3968,7 +3968,7 @@ InitEvents()
void
CloseDownEvents(void)
{
xfree(spriteTrace);
free(spriteTrace);
spriteTrace = NULL;
spriteTraceSize = 0;
}
......
nx-X11/programs/Xserver/dix/extension.c
View file @ 1dbd3c88
......@@ -95,25 +95,25 @@ AddExtension(char *name, int NumEvents, int NumErrors,
(unsigned)(lastError + NumErrors > LAST_ERROR))
return((ExtensionEntry *) NULL);
ext = (ExtensionEntry *) xalloc(sizeof(ExtensionEntry));
ext = (ExtensionEntry *) malloc(sizeof(ExtensionEntry));
if (!ext)
return((ExtensionEntry *) NULL);
ext->name = (char *)xalloc(strlen(name) + 1);
ext->name = (char *)malloc(strlen(name) + 1);
ext->num_aliases = 0;
ext->aliases = (char **)NULL;
if (!ext->name)
{
xfree(ext);
free(ext);
return((ExtensionEntry *) NULL);
}
strcpy(ext->name, name);
i = NumExtensions;
newexts = (ExtensionEntry **) xrealloc(extensions,
newexts = (ExtensionEntry **) realloc(extensions,
(i + 1) * sizeof(ExtensionEntry *));
if (!newexts)
{
xfree(ext->name);
xfree(ext);
free(ext->name);
free(ext);
return((ExtensionEntry *) NULL);
}
NumExtensions++;
......@@ -159,12 +159,12 @@ Bool AddExtensionAlias(char *alias, ExtensionEntry *ext)
char *name;
char **aliases;
aliases = (char **)xrealloc(ext->aliases,
aliases = (char **)realloc(ext->aliases,
(ext->num_aliases + 1) * sizeof(char *));
if (!aliases)
return FALSE;
ext->aliases = aliases;
name = (char *)xalloc(strlen(alias) + 1);
name = (char *)malloc(strlen(alias) + 1);
if (!name)
return FALSE;
strcpy(name, alias);
......@@ -263,13 +263,13 @@ CloseDownExtensions()
if (extensions[i]->CloseDown)
(* extensions[i]->CloseDown)(extensions[i]);
NumExtensions = i;
xfree(extensions[i]->name);
free(extensions[i]->name);
for (j = extensions[i]->num_aliases; --j >= 0;)
xfree(extensions[i]->aliases[j]);
xfree(extensions[i]->aliases);
xfree(extensions[i]);
free(extensions[i]->aliases[j]);
free(extensions[i]->aliases);
free(extensions[i]);
}
xfree(extensions);
free(extensions);
extensions = (ExtensionEntry **)NULL;
lastEvent = EXTENSION_EVENT_BASE;
lastError = FirstExtensionError;
......@@ -280,9 +280,9 @@ CloseDownExtensions()
while (spentry->num)
{
spentry->num--;
xfree(spentry->procList[spentry->num].name);
free(spentry->procList[spentry->num].name);
}
xfree(spentry->procList);
free(spentry->procList);
spentry->procList = (ProcEntryPtr)NULL;
}
}
......@@ -438,15 +438,15 @@ RegisterScreenProc(char *name, ScreenPtr pScreen, ExtensionLookupProc proc)
procEntry->proc = proc;
else
{
newname = (char *)xalloc(strlen(name)+1);
newname = (char *)malloc(strlen(name)+1);
if (!newname)
return FALSE;
procEntry = (ProcEntryPtr)
xrealloc(spentry->procList,
realloc(spentry->procList,
sizeof(ProcEntryRec) * (spentry->num+1));
if (!procEntry)
{
xfree(newname);
free(newname);
return FALSE;
}
spentry->procList = procEntry;
......
nx-X11/programs/Xserver/dix/gc.c
View file @ 1dbd3c88
......@@ -457,7 +457,7 @@ dixChangeGC(ClientPtr client, register GC *pGC, register BITS32 mask, CARD32 *pC
{
if (pGC->dash != DefaultDash)
{
xfree(pGC->dash);
free(pGC->dash);
pGC->numInDashList = 2;
pGC->dash = DefaultDash;
}
......@@ -466,11 +466,11 @@ dixChangeGC(ClientPtr client, register GC *pGC, register BITS32 mask, CARD32 *pC
{
unsigned char *dash;
dash = (unsigned char *)xalloc(2 * sizeof(unsigned char));
dash = (unsigned char *)malloc(2 * sizeof(unsigned char));
if (dash)
{
if (pGC->dash != DefaultDash)
xfree(pGC->dash);
free(pGC->dash);
pGC->numInDashList = 2;
pGC->dash = dash;
dash[0] = newdash;
......@@ -580,7 +580,7 @@ AllocateGC(ScreenPtr pScreen)
register unsigned size;
register int i;
pGC = (GCPtr)xalloc(pScreen->totalGCSize);
pGC = (GCPtr)malloc(pScreen->totalGCSize);
if (pGC)
{
ppriv = (DevUnion *)(pGC + 1);
......@@ -838,7 +838,7 @@ CopyGC(register GC *pgcSrc, register GC *pgcDst, register BITS32 mask)
{
if (pgcDst->dash != DefaultDash)
{
xfree(pgcDst->dash);
free(pgcDst->dash);
pgcDst->numInDashList = pgcSrc->numInDashList;
pgcDst->dash = pgcSrc->dash;
}
......@@ -848,12 +848,12 @@ CopyGC(register GC *pgcSrc, register GC *pgcDst, register BITS32 mask)
unsigned char *dash;
unsigned int i;
dash = (unsigned char *)xalloc(pgcSrc->numInDashList *
dash = (unsigned char *)malloc(pgcSrc->numInDashList *
sizeof(unsigned char));
if (dash)
{
if (pgcDst->dash != DefaultDash)
xfree(pgcDst->dash);
free(pgcDst->dash);
pgcDst->numInDashList = pgcSrc->numInDashList;
pgcDst->dash = dash;
for (i=0; i<pgcSrc->numInDashList; i++)
......@@ -904,8 +904,8 @@ FreeGC(void * value, XID gid)
(*pGC->funcs->DestroyGC) (pGC);
if (pGC->dash != DefaultDash)
xfree(pGC->dash);
xfree(pGC);
free(pGC->dash);
free(pGC);
return(Success);
}
......@@ -1098,9 +1098,9 @@ SetDashes(register GCPtr pGC, unsigned offset, unsigned ndash, unsigned char *pd
}
if (ndash & 1)
p = (unsigned char *)xalloc(2 * ndash * sizeof(unsigned char));
p = (unsigned char *)malloc(2 * ndash * sizeof(unsigned char));
else
p = (unsigned char *)xalloc(ndash * sizeof(unsigned char));
p = (unsigned char *)malloc(ndash * sizeof(unsigned char));
if (!p)
return BadAlloc;
......@@ -1113,7 +1113,7 @@ SetDashes(register GCPtr pGC, unsigned offset, unsigned ndash, unsigned char *pd
}
if (pGC->dash != DefaultDash)
xfree(pGC->dash);
free(pGC->dash);
pGC->numInDashList = ndash;
pGC->dash = p;
if (ndash & 1)
......@@ -1195,7 +1195,7 @@ SetClipRects(GCPtr pGC, int xOrigin, int yOrigin, int nrects,
if (newct < 0)
return(BadMatch);
size = nrects * sizeof(xRectangle);
prectsNew = (xRectangle *) xalloc(size);
prectsNew = (xRectangle *) malloc(size);
if (!prectsNew && size)
return BadAlloc;
......
nx-X11/programs/Xserver/dix/glyphcurs.c
View file @ 1dbd3c88
......@@ -93,7 +93,7 @@ ServerBitsFromGlyph(FontPtr pfont, unsigned ch, register CursorMetricPtr cm, uns
pScreen = screenInfo.screens[0];
nby = BitmapBytePad(cm->width) * (long)cm->height;
pbits = (char *)xalloc(nby);
pbits = (char *)malloc(nby);
if (!pbits)
return BadAlloc;
/* zeroing the (pad) bits seems to help some ddx cursor handling */
......@@ -108,7 +108,7 @@ ServerBitsFromGlyph(FontPtr pfont, unsigned ch, register CursorMetricPtr cm, uns
(*pScreen->DestroyPixmap)(ppix);
if (pGC)
FreeScratchGC(pGC);
xfree(pbits);
free(pbits);
return BadAlloc;
}
......
nx-X11/programs/Xserver/dix/grabs.c
View file @ 1dbd3c88
......@@ -84,7 +84,7 @@ CreateGrab(
{
GrabPtr grab;
grab = (GrabPtr)xalloc(sizeof(GrabRec));
grab = (GrabPtr)malloc(sizeof(GrabRec));
if (!grab)
return (GrabPtr)NULL;
grab->resource = FakeClientID(client);
......@@ -116,15 +116,15 @@ static void
FreeGrab(GrabPtr pGrab)
{
if (pGrab->modifiersDetail.pMask != NULL)
xfree(pGrab->modifiersDetail.pMask);
free(pGrab->modifiersDetail.pMask);
if (pGrab->detail.pMask != NULL)
xfree(pGrab->detail.pMask);
free(pGrab->detail.pMask);
if (pGrab->cursor)
FreeCursor(pGrab->cursor, (Cursor)0);
xfree(pGrab);
free(pGrab);
}
int
......@@ -158,7 +158,7 @@ DeleteDetailFromMask(Mask *pDetailMask, unsigned short detail)
register Mask *mask;
register int i;
mask = (Mask *)xalloc(sizeof(Mask) * MasksPerDetailMask);
mask = (Mask *)malloc(sizeof(Mask) * MasksPerDetailMask);
if (mask)
{
if (pDetailMask)
......@@ -410,7 +410,7 @@ DeletePassiveGrabFromList(GrabPtr pMinuendGrab)
for (i = 0; i < nadds; i++)
FreeResource(adds[i]->resource, RT_NONE);
for (i = 0; i < nups; i++)
xfree(details[i]);
free(details[i]);
}
else
{
......@@ -424,7 +424,7 @@ DeletePassiveGrabFromList(GrabPtr pMinuendGrab)
}
for (i = 0; i < nups; i++)
{
xfree(*updates[i]);
free(*updates[i]);
*updates[i] = details[i];
}
}
......
nx-X11/programs/Xserver/dix/main.c
View file @ 1dbd3c88
......@@ -310,12 +310,12 @@ main(int argc, char *argv[], char *envp[])
{
CreateWellKnownSockets();
InitProcVectors();
clients = (ClientPtr *)xalloc(MAXCLIENTS * sizeof(ClientPtr));
clients = (ClientPtr *)malloc(MAXCLIENTS * sizeof(ClientPtr));
if (!clients)
FatalError("couldn't create client array");
for (i=1; i<MAXCLIENTS; i++)
clients[i] = NullClient;
serverClient = (ClientPtr)xalloc(sizeof(ClientRec));
serverClient = (ClientPtr)malloc(sizeof(ClientRec));
if (!serverClient)
FatalError("couldn't create server client");
InitClient(serverClient, 0, (void *)NULL);
......@@ -474,7 +474,7 @@ main(int argc, char *argv[], char *envp[])
#endif
FreeAuditTimer();
xfree(serverClient->devPrivates);
free(serverClient->devPrivates);
serverClient->devPrivates = NULL;
if (dispatchException & DE_TERMINATE)
......@@ -490,7 +490,7 @@ main(int argc, char *argv[], char *envp[])
break;
}
xfree(ConnectionInfo);
free(ConnectionInfo);
ConnectionInfo = NULL;
}
return(0);
......@@ -556,7 +556,7 @@ CreateConnectionBlock()
((setup.nbytesVendor + 3) & ~3) +
(setup.numFormats * sizeof(xPixmapFormat)) +
(setup.numRoots * sizeof(xWindowRoot));
ConnectionInfo = (char *) xalloc(lenofblock);
ConnectionInfo = (char *) malloc(lenofblock);
if (!ConnectionInfo)
return FALSE;
......@@ -618,10 +618,10 @@ CreateConnectionBlock()
{
lenofblock += sizeof(xDepth) +
(pDepth->numVids * sizeof(xVisualType));
pBuf = (char *)xrealloc(ConnectionInfo, lenofblock);
pBuf = (char *)realloc(ConnectionInfo, lenofblock);
if (!pBuf)
{
xfree(ConnectionInfo);
free(ConnectionInfo);
return FALSE;
}
ConnectionInfo = pBuf;
......@@ -689,15 +689,15 @@ AddScreen(
if (i == MAXSCREENS)
return -1;
pScreen = (ScreenPtr) xcalloc(1, sizeof(ScreenRec));
pScreen = (ScreenPtr) calloc(1, sizeof(ScreenRec));
if (!pScreen)
return -1;
pScreen->devPrivates = (DevUnion *)xcalloc(sizeof(DevUnion),
pScreen->devPrivates = (DevUnion *)calloc(sizeof(DevUnion),
screenPrivateCount);
if (!pScreen->devPrivates && screenPrivateCount)
{
xfree(pScreen);
free(pScreen);
return -1;
}
pScreen->myNum = i;
......@@ -782,11 +782,11 @@ static void
FreeScreen(ScreenPtr pScreen)
{
pScreen->root = NullWindow;
xfree(pScreen->WindowPrivateSizes);
xfree(pScreen->GCPrivateSizes);
free(pScreen->WindowPrivateSizes);
free(pScreen->GCPrivateSizes);
#ifdef PIXPRIV
xfree(pScreen->PixmapPrivateSizes);
free(pScreen->PixmapPrivateSizes);
#endif
xfree(pScreen->devPrivates);
xfree(pScreen);
free(pScreen->devPrivates);
free(pScreen);
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment