cvs commit: jakarta-tomcat-connectors/jni/native/src error.c

[mturk]

mturk       2005/04/15 10:21:23

  Modified:    jni/java/org/apache/tomcat/jni Status.java
               jni/native/src error.c
  Log:
  Add missing APR_STATUS_IS_ macros wrappers for socket statuses.
  
  Revision  Changes    Path
  1.5       +7 -2      
jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/Status.java
  
  Index: Status.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/Status.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Status.java       15 Apr 2005 10:15:55 -0000      1.4
  +++ Status.java       15 Apr 2005 17:21:23 -0000      1.5
  @@ -244,9 +244,14 @@
       public static final boolean APR_STATUS_IS_ENOTIMPL(int s)   { return 
is(s, 73); }
       public static final boolean APR_STATUS_IS_EMISMATCH(int s)  { return 
is(s, 74); }
       public static final boolean APR_STATUS_IS_EBUSY(int s)      { return 
is(s, 75); }
  -    
  +
       /* Socket errors */
       public static final boolean APR_STATUS_IS_EAGAIN(int s)     { return 
is(s, 90); }
       public static final boolean APR_STATUS_IS_ETIMEDOUT(int s)  { return 
is(s, 91); }
  +    public static final boolean APR_STATUS_IS_ECONNABORTED(int s) { return 
is(s, 92); }
  +    public static final boolean APR_STATUS_IS_ECONNRESET(int s)   { return 
is(s, 93); }
  +    public static final boolean APR_STATUS_IS_EINPROGRESS(int s)  { return 
is(s, 94); }
  +    public static final boolean APR_STATUS_IS_EINTR(int s)      { return 
is(s, 95); }
  +    public static final boolean APR_STATUS_IS_ENOTSOCK(int s)   { return 
is(s, 96); }
   
   }
  
  
  
  1.4       +5 -0      jakarta-tomcat-connectors/jni/native/src/error.c
  
  Index: error.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/src/error.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- error.c   15 Apr 2005 10:16:05 -0000      1.3
  +++ error.c   15 Apr 2005 17:21:23 -0000      1.4
  @@ -181,6 +181,11 @@
           /* Socket errors */
           APR_IS(90, APR_STATUS_IS_EAGAIN);
           APR_IS(91, APR_STATUS_IS_ETIMEDOUT);
  +        APR_IS(92, APR_STATUS_IS_ECONNABORTED);
  +        APR_IS(93, APR_STATUS_IS_ECONNRESET);
  +        APR_IS(94, APR_STATUS_IS_EINPROGRESS);
  +        APR_IS(95, APR_STATUS_IS_EINTR);
  +        APR_IS(96, APR_STATUS_IS_ENOTSOCK);
       }
       return JNI_FALSE;
   }
  
  
  

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