Return-Path: <apache-cvs-owner-apache-cvs-archive=hyperreal.org@apache.org>
Delivered-To: apache-cvs-archive@hyperreal.org
Received: (qmail 22295 invoked by uid 6000); 31 Oct 1999 06:13:27 -0000
Received: (qmail 22288 invoked by uid 2016); 31 Oct 1999 06:13:25 -0000
Delivered-To: apcore-apache-2.0-cvs@apache.org
Received: (qmail 22274 invoked by uid 240); 31 Oct 1999 06:13:21 -0000
Date: 31 Oct 1999 06:13:20 -0000
Message-ID: <19991031061320.22269.qmail@hyperreal.org>
From: bjh@hyperreal.org
To: apache-2.0-cvs@apache.org
Subject: cvs commit: apache-2.0/src/os/os2 iol_socket.c
Sender: apache-cvs-owner@apache.org
Precedence: bulk
Reply-To: new-httpd@apache.org

bjh         99/10/30 23:13:18

  Modified:    src/os/os2 iol_socket.c
  Log:
  OS/2: iol_socket cleanup
  - method functions should be static.
  - errno is no longer relevant.
  
  Revision  Changes    Path
  1.6       +4 -10     apache-2.0/src/os/os2/iol_socket.c
  
  Index: iol_socket.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/os/os2/iol_socket.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- iol_socket.c	1999/10/29 15:06:22	1.5
  +++ iol_socket.c	1999/10/31 06:13:14	1.6
  @@ -62,7 +62,6 @@
   #include <apr_network_io.h>
   #include <apr_file_io.h>
   
  -#include <errno.h>
   #include <sys/types.h>
   #include <sys/uio.h>
   
  @@ -97,18 +96,18 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t os2_write(ap_iol *viol, const char *buf, ap_size_t size, ap_ssize_t *nbytes)
  +static ap_status_t os2_write(ap_iol *viol, const char *buf, ap_size_t size, ap_ssize_t *nbytes)
   {
       *nbytes = size;
       return ap_send(((iol_socket *)viol)->sock, buf, nbytes);
   }
   
  -ap_status_t os2_writev(ap_iol *viol, const struct iovec *vec, int nvec, ap_ssize_t *nbytes)
  +static ap_status_t os2_writev(ap_iol *viol, const struct iovec *vec, int nvec, ap_ssize_t *nbytes)
   {
       return ap_sendv(((iol_socket *)viol)->sock, vec, nvec, nbytes);
   }
   
  -ap_status_t os2_read(ap_iol *viol, char *buf, ap_size_t size, ap_ssize_t *nbytes)
  +static ap_status_t os2_read(ap_iol *viol, char *buf, ap_size_t size, ap_ssize_t *nbytes)
   {
       *nbytes = size;
       return ap_recv(((iol_socket *)viol)->sock, buf, nbytes);
  @@ -118,15 +117,10 @@
   {
       iol_socket *iol = (iol_socket *)viol;
       int rv;
  -    int saved_errno;
   
       rv = ap_close_socket(iol->sock);
  -    saved_errno = errno;
       free(iol);
  -    if (rv == 0) {
  -        return APR_SUCCESS;
  -    }
  -    return saved_errno;
  +    return rv;
   }
   
   static const ap_iol_methods socket_methods = {