cvs commit: jakarta-tomcat-connectors/jni/native/os/unix uxpipe.c

[mturk]

mturk       2005/07/02 01:24:21

  Modified:    jni/native/os/unix uxpipe.c
  Log:
  type is now member of net structure.
  
  Revision  Changes    Path
  1.4       +8 -10     jakarta-tomcat-connectors/jni/native/os/unix/uxpipe.c
  
  Index: uxpipe.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/os/unix/uxpipe.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- uxpipe.c  2 Jul 2005 07:19:10 -0000       1.3
  +++ uxpipe.c  2 Jul 2005 08:24:21 -0000       1.4
  @@ -170,9 +170,9 @@
   {
       tcn_socket_t *s = (tcn_socket_t *)data;
   
  -    if (s->cleanup) {
  -        (*s->cleanup)(s->opaque);
  -        s->cleanup = NULL;
  +    if (s->net->cleanup) {
  +        (*s->net->cleanup)(s->opaque);
  +        s->net->cleanup = NULL;
       }
   #ifdef TCN_DO_STATISTICS
       apr_atomic_inc32(&uxp_cleared);
  @@ -246,7 +246,7 @@
       UNREFERENCED_STDARGS;
       UNREFERENCED(sa);
       TCN_ASSERT(sock != 0);
  -    if (s->type == TCN_SOCKET_UNIX) {
  +    if (s->net->type == TCN_SOCKET_UNIX) {
           int rc;
           tcn_uxp_conn_t *c = (tcn_uxp_conn_t *)s->opaque;
           c->mode = TCN_UXP_SERVER;
  @@ -267,7 +267,7 @@
       UNREFERENCED_STDARGS;
   
       TCN_ASSERT(sock != 0);
  -    if (s->type == TCN_SOCKET_UNIX) {
  +    if (s->net->type == TCN_SOCKET_UNIX) {
           tcn_uxp_conn_t *c = (tcn_uxp_conn_t *)s->opaque;
           c->mode = TCN_UXP_SERVER;
           return apr_socket_listen(c->sock, (apr_int32_t)backlog);
  @@ -287,7 +287,7 @@
       TCN_ASSERT(sock != 0);
   
       TCN_THROW_IF_ERR(apr_pool_create(&p, s->pool), p);
  -    if (s->type == TCN_SOCKET_UNIX) {
  +    if (s->net->type == TCN_SOCKET_UNIX) {
           apr_socklen_t len;
           tcn_uxp_conn_t *c = (tcn_uxp_conn_t *)s->opaque;
           con = (tcn_uxp_conn_t *)apr_pcalloc(p, sizeof(tcn_uxp_conn_t));
  @@ -330,15 +330,13 @@
                                            jlong sa)
   {
       tcn_socket_t *s = J2P(sock, tcn_socket_t *);
  -    apr_pool_t   *p = NULL;
  -    tcn_socket_t *a = NULL;
       tcn_uxp_conn_t *con = NULL;
       int rc;
   
       UNREFERENCED(o);
       UNREFERENCED(sa);
       TCN_ASSERT(sock != 0);
  -    if (s->type != TCN_SOCKET_UNIX)
  +    if (s->net->type != TCN_SOCKET_UNIX)
           return APR_ENOTSOCK;
       con = (tcn_uxp_conn_t *)s->opaque;
       if (con->mode != TCN_UXP_UNKNOWN)
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]