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/Xtransos2.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/Xtransos2.c')
| -rw-r--r-- | nx-X11/lib/xtrans/Xtransos2.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nx-X11/lib/xtrans/Xtransos2.c b/nx-X11/lib/xtrans/Xtransos2.c index 9fd5049a0..1380403da 100644 --- a/nx-X11/lib/xtrans/Xtransos2.c +++ b/nx-X11/lib/xtrans/Xtransos2.c @@ -90,7 +90,7 @@ TRANS(Os2OpenClient)(Xtransport *thistrans, char *protocol, PRMSG(5, "Os2OpenClient: Creating pipe %s\n",pipename, 0,0 ); /* make a connection entry */ - if( (ciptr=(XtransConnInfo)xcalloc(1,sizeof(struct _XtransConnInfo))) == NULL ) { + if( (ciptr=(XtransConnInfo)calloc(1,sizeof(struct _XtransConnInfo))) == NULL ) { PRMSG(1,"Os2OpenClient: calloc(1,%d) failed\n", sizeof(struct _XtransConnInfo),0,0 ); return NULL; @@ -268,9 +268,9 @@ TRANS(Os2OpenServer)(Xtransport *thistrans, char *protocol, PRMSG(2,"Os2OpenServer(%s,%s,%s)\n",protocol,host,port); - if( (ciptr=(XtransConnInfo)xcalloc(1,sizeof(struct _XtransConnInfo))) == NULL ) + if( (ciptr=(XtransConnInfo)calloc(1,sizeof(struct _XtransConnInfo))) == NULL ) { - PRMSG(1,"Os2OpenServer: xcalloc(1,%d) failed\n", + PRMSG(1,"Os2OpenServer: calloc(1,%d) failed\n", sizeof(struct _XtransConnInfo),0,0 ); return NULL; } @@ -432,9 +432,9 @@ TRANS(Os2ReopenCOTSServer)(Xtransport *thistrans, int fd, char *port) PRMSG(2,"Os2ReopenCOTSServer(%d,%s)\n", fd, port, 0); - if( (ciptr=(XtransConnInfo)xcalloc(1,sizeof(struct _XtransConnInfo))) == NULL ) + if( (ciptr=(XtransConnInfo)calloc(1,sizeof(struct _XtransConnInfo))) == NULL ) { - PRMSG(1,"Os2ReopenCOTSServer: xcalloc(1,%d) failed\n", + PRMSG(1,"Os2ReopenCOTSServer: calloc(1,%d) failed\n", sizeof(struct _XtransConnInfo),0,0 ); return NULL; } @@ -508,9 +508,9 @@ TRANS(Os2Accept)(XtransConnInfo ciptr, int *status) PRMSG(2,"Os2Accept(%x->%d)\n", ciptr, ciptr->fd,0); - if( (newciptr=(XtransConnInfo)xcalloc(1,sizeof(struct _XtransConnInfo)))==NULL ) + if( (newciptr=(XtransConnInfo)calloc(1,sizeof(struct _XtransConnInfo)))==NULL ) { - PRMSG(1,"Os2Accept: xcalloc(1,%d) failed\n", + PRMSG(1,"Os2Accept: calloc(1,%d) failed\n", sizeof(struct _XtransConnInfo),0,0 ); *status = TRANS_ACCEPT_BAD_MALLOC; return NULL; |