diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-27 11:51:31 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-02 14:05:31 +0200 |
| commit | ce40aec08aef6aebd1d25728a1d0dc4b2bc8db09 (patch) | |
| tree | 35762983db2c3e9f0b2fec6501b77ec2d55a7fa4 /nx-X11/lib/xtrans/Xtranssock.c | |
| parent | 74a5450bc058354e55c1589e64ef8e73775cebc4 (diff) | |
| download | nx-libs-ce40aec08aef6aebd1d25728a1d0dc4b2bc8db09.tar.gz nx-libs-ce40aec08aef6aebd1d25728a1d0dc4b2bc8db09.tar.bz2 nx-libs-ce40aec08aef6aebd1d25728a1d0dc4b2bc8db09.zip | |
nx-X11/programs/Xserver: Drop {X,x}calloc() macros, use calloc() instead.
Diffstat (limited to 'nx-X11/lib/xtrans/Xtranssock.c')
| -rw-r--r-- | nx-X11/lib/xtrans/Xtranssock.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nx-X11/lib/xtrans/Xtranssock.c b/nx-X11/lib/xtrans/Xtranssock.c index 79b95efdc..e27ba9993 100644 --- a/nx-X11/lib/xtrans/Xtranssock.c +++ b/nx-X11/lib/xtrans/Xtranssock.c @@ -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; @@ -653,7 +653,7 @@ 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) { @@ -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); @@ -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); @@ -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); @@ -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); |