Changeset 57cfaad in rtems for cpukit/librpc/src/rpc/svc_tcp.c


Ignore:
Timestamp:
Oct 31, 2000, 4:39:06 PM (21 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
df3b242
Parents:
3e59793
Message:

2000-10-30 Joel Sherrill <joel@…>

  • POSIX include files merged into newlib. This resulted in some definitions moving to other files and thus some secondary effects in RTEMS source code.
  • src/rpc/Makefile.am, src/rpc/auth_time.c, src/rpc/clnt_simple.c, src/rpc/clnt_tcp.c, src/rpc/clnt_udp.c, src/rpc/clnt_unix.c, src/rpc/get_myaddress.c, src/rpc/pmap_clnt.c, src/rpc/pmap_getmaps.c, src/rpc/pmap_getport.c, src/rpc/pmap_rmt.c, src/rpc/rtime.c, src/rpc/svc_tcp.c, src/rpc/svc_udp.c, src/rpc/svc_unix.c: Use of _read, _write, and _close as macros conflicted with newlib's use of these as routine names. They were renamed to include "_RPC_" prefix.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • cpukit/librpc/src/rpc/svc_tcp.c

    r3e59793 r57cfaad  
    146146                perror("svc_tcp.c - cannot turn on non-blocking mode");
    147147                if (madesock)
    148                        (void)_close(sock);
     148                       (void)_RPC_close(sock);
    149149                return ((SVCXPRT *)NULL);
    150150        }
     
    160160                perror("svctcp_.c - cannot getsockname or listen");
    161161                if (madesock)
    162                        (void)_close(sock);
     162                       (void)_RPC_close(sock);
    163163                return ((SVCXPRT *)NULL);
    164164        }
     
    258258         */
    259259        if (addr.sin_port == htons(20)) {
    260                 _close(sock);
     260                _RPC_close(sock);
    261261                return (FALSE);
    262262        }
     
    266266        off = 0;
    267267        if (ioctl(sock, FIONBIO, &off) < 0) {
    268                 _close(sock);
     268                _RPC_close(sock);
    269269                return (FALSE);
    270270        }
     
    292292
    293293        xprt_unregister(xprt);
    294         (void)_close(xprt->xp_sock);
     294        (void)_RPC_close(xprt->xp_sock);
    295295        if (xprt->xp_port != 0) {
    296296                /* a rendezvouser socket */
     
    374374                }
    375375        } while (!FD_ISSET(sock, fds));
    376         if ((len = _read(sock, buf, len)) > 0) {
     376        if ((len = _RPC_read(sock, buf, len)) > 0) {
    377377                if (fds != NULL)
    378378                        free(fds);
     
    399399
    400400        for (cnt = len; cnt > 0; cnt -= i, buf += i) {
    401                 if ((i = _write(xprt->xp_sock, buf, cnt)) < 0) {
     401                if ((i = _RPC_write(xprt->xp_sock, buf, cnt)) < 0) {
    402402                        ((struct tcp_conn *)(xprt->xp_p1))->strm_stat =
    403403                            XPRT_DIED;
Note: See TracChangeset for help on using the changeset viewer.