ben 99/09/11 15:14:43
Modified: src/include http_protocol.h
src/main http_core.c http_protocol.c
Log:
Fix warnings.
Revision Changes Path
1.5 +2 -1 apache-2.0/src/include/http_protocol.h
Index: http_protocol.h
===================================================================
RCS file: /export/home/cvs/apache-2.0/src/include/http_protocol.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- http_protocol.h 1999/09/08 14:15:40 1.4
+++ http_protocol.h 1999/09/11 22:14:35 1.5
@@ -173,7 +173,8 @@
/* Sending a byterange */
API_EXPORT(int) ap_set_byterange(request_rec *r);
-API_EXPORT(int) ap_each_byterange(request_rec *r, long *offset, long *length);
+API_EXPORT(int) ap_each_byterange(request_rec *r, ap_off_t *offset,
+ long *length);
/* Support for the Basic authentication protocol. Note that there's
* nothing that prevents these from being in mod_auth.c, except that other
1.12 +2 -1 apache-2.0/src/main/http_core.c
Index: http_core.c
===================================================================
RCS file: /export/home/cvs/apache-2.0/src/main/http_core.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- http_core.c 1999/09/08 14:15:42 1.11
+++ http_core.c 1999/09/11 22:14:36 1.12
@@ -2624,7 +2624,8 @@
ap_send_mmap(mm, r, 0, r->finfo.st_size);
}
else {
- long offset, length;
+ ap_off_t offset;
+ long length;
while (ap_each_byterange(r, &offset, &length)) {
ap_send_mmap(mm, r, offset, length);
}
1.15 +6 -4 apache-2.0/src/main/http_protocol.c
Index: http_protocol.c
===================================================================
RCS file: /export/home/cvs/apache-2.0/src/main/http_protocol.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- http_protocol.c 1999/09/08 14:15:43 1.14
+++ http_protocol.c 1999/09/11 22:14:37 1.15
@@ -122,8 +122,8 @@
return (*start > 0 || *end < clength - 1);
}
-static int internal_byterange(int, long *, request_rec *, const char **, long *,
- long *);
+static int internal_byterange(int, long *, request_rec *, const char **,
+ ap_off_t *, long *);
API_EXPORT(int) ap_set_byterange(request_rec *r)
{
@@ -198,7 +198,8 @@
return 1;
}
-API_EXPORT(int) ap_each_byterange(request_rec *r, long *offset, long *length)
+API_EXPORT(int) ap_each_byterange(request_rec *r, ap_off_t *offset,
+ long *length)
{
return internal_byterange(1, NULL, r, &r->range, offset, length);
}
@@ -214,7 +215,8 @@
* when done.
*/
static int internal_byterange(int realreq, long *tlength, request_rec *r,
- const char **r_range, long *offset, long *length)
+ const char **r_range, ap_off_t *offset,
+ long *length)
{
long range_start, range_end;
char *range;
|