From 6293b80374f7c7b017515b9a8716a9ea16eb063a Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 17 Aug 2001 07:51:36 +0000 Subject: Update. 2001-08-17 Ulrich Drepper * sunrpc/svc_simple.c (universal): Use __write instead of write. * wcsmbs/wcscoll.c: Also define __wcscoll. * include/wchar.h: Declare __wcscoll. * libio/fwprintf.c: Use __vfwprintf instead of vfwprintf. * libio/vwprintf.c: Likewise. * libio/wprintf.c: Likewise. * iconv/gconv_cache.c: Use __munmap instead of munmap. * posix/regex.c [_LIBC] (convert_mbs_to_wcs): Use __mbrtowc instead of mbrtowc. [_LIBC]: Use __iswctype instead of iswctype, __wcslen instead of wcslen, and __wcscoll instead of wcscoll. * sysdeps/unix/sockatmark.c (sockatmark): Use __ioctl instead of ioctl. * sysdeps/unix/sysv/linux/gai_sigqueue.c (__gai_sigqueue): Use __getuid instead of getuid. * stdio-common/perror.c (perror): Use __close instead of close. * iconv/gconv_cache.c (__gconv_load_cache): Likewise. * libio/freopen.c (freopen): Likewise. * libio/freopen64.c (freopen64): Likewise. --- inet/rcmd.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'inet') diff --git a/inet/rcmd.c b/inet/rcmd.c index 7d974f3e0c..2c0a34de49 100644 --- a/inet/rcmd.c +++ b/inet/rcmd.c @@ -206,7 +206,7 @@ rcmd_af(ahost, rport, locuser, remuser, cmd, fd2p, af) NULL, 0, NI_NUMERICHOST); - asprintf (&buf, _("connect to address %s: "), paddr); + __asprintf (&buf, _("connect to address %s: "), paddr); #ifdef USE_IN_LIBIO if (_IO_fwide (stderr, 0) > 0) __fwprintf(stderr, L"%s", buf); @@ -220,7 +220,7 @@ rcmd_af(ahost, rport, locuser, remuser, cmd, fd2p, af) paddr, sizeof(paddr), NULL, 0, NI_NUMERICHOST); - asprintf (&buf, _("Trying %s...\n"), paddr); + __asprintf (&buf, _("Trying %s...\n"), paddr); #ifdef USE_IN_LIBIO if (_IO_fwide (stderr, 0) > 0) __fwprintf (stderr, L"%s", buf); @@ -267,8 +267,8 @@ rcmd_af(ahost, rport, locuser, remuser, cmd, fd2p, af) if (__write(s, num, strlen(num)+1) != (ssize_t)strlen(num)+1) { char *buf = NULL; - asprintf (&buf, - _("rcmd: write (setting up stderr): %m\n")); + __asprintf (&buf, _("\ +rcmd: write (setting up stderr): %m\n")); #ifdef USE_IN_LIBIO if (_IO_fwide (stderr, 0) > 0) __fwprintf(stderr, L"%s", buf); @@ -286,10 +286,10 @@ rcmd_af(ahost, rport, locuser, remuser, cmd, fd2p, af) char *buf = NULL; if (errno != 0) - asprintf(&buf, - _("rcmd: poll (setting up stderr): %m\n")); + __asprintf(&buf, + _("rcmd: poll (setting up stderr): %m\n")); else - asprintf(&buf, + __asprintf(&buf, _("poll: protocol failure in circuit setup\n")); #ifdef USE_IN_LIBIO if (_IO_fwide (stderr, 0) > 0) @@ -331,7 +331,7 @@ rcmd_af(ahost, rport, locuser, remuser, cmd, fd2p, af) if (rport >= IPPORT_RESERVED || rport < IPPORT_RESERVED / 2){ char *buf = NULL; - asprintf(&buf, + __asprintf(&buf, _("socket: protocol failure in circuit setup\n")); #ifdef USE_IN_LIBIO if (_IO_fwide (stderr, 0) > 0) @@ -351,9 +351,9 @@ rcmd_af(ahost, rport, locuser, remuser, cmd, fd2p, af) char *buf = NULL; if (n == 0) - asprintf(&buf, _("rcmd: %s: short read"), *ahost); + __asprintf(&buf, _("rcmd: %s: short read"), *ahost); else - asprintf(&buf, "rcmd: %s: %m\n", *ahost); + __asprintf(&buf, "rcmd: %s: %m\n", *ahost); #ifdef USE_IN_LIBIO if (_IO_fwide (stderr, 0) > 0) __fwprintf (stderr, L"%s", buf); -- cgit 1.4.1