tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jni/native/src network.c
Date Sat, 23 Apr 2005 18:33:39 GMT
mturk       2005/04/23 11:33:39

  Modified:    jni/java/org/apache/tomcat/jni Socket.java
               jni/native/src network.c
  Log:
  Use long for sendfile size.
  
  Revision  Changes    Path
  1.14      +4 -4      jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/Socket.java
  
  Index: Socket.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/Socket.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- Socket.java	23 Apr 2005 15:51:03 -0000	1.13
  +++ Socket.java	23 Apr 2005 18:33:39 -0000	1.14
  @@ -441,8 +441,8 @@
        *         file, and trailers
        *
        */
  -    public static native int sendfile(long sock, long file, byte [][] headers,
  -                                      byte[][] trailers, long offset,
  -                                      int len, int flags);
  +    public static native long sendfile(long sock, long file, byte [][] headers,
  +                                       byte[][] trailers, long offset,
  +                                       long len, int flags);
   
   }
  
  
  
  1.15      +8 -8      jakarta-tomcat-connectors/jni/native/src/network.c
  
  Index: network.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/src/network.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- network.c	23 Apr 2005 15:51:03 -0000	1.14
  +++ network.c	23 Apr 2005 18:33:39 -0000	1.15
  @@ -512,12 +512,12 @@
   }
   
   
  -TCN_IMPLEMENT_CALL(jint, Socket, sendfile)(TCN_STDARGS, jlong sock,
  -                                           jlong file,
  -                                           jobjectArray headers,
  -                                           jobjectArray trailers,
  -                                           jlong offset, jint len,
  -                                           jint flags)
  +TCN_IMPLEMENT_CALL(jlong, Socket, sendfile)(TCN_STDARGS, jlong sock,
  +                                            jlong file,
  +                                            jobjectArray headers,
  +                                            jobjectArray trailers,
  +                                            jlong offset, jlong len,
  +                                            jint flags)
   {
       apr_socket_t *s = J2P(sock, apr_socket_t *);
       apr_file_t *f = J2P(file, apr_file_t *);
  @@ -573,7 +573,7 @@
        * including headers, file, and trailers
        */
       if (ss == APR_SUCCESS)
  -        return (jint)written;
  +        return (jlong)written;
       else
  -        return -(jint)ss;
  +        return -(jlong)ss;
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message