From: Ben Laurie <ben@apache.org>
Date: Sat, 11 Sep 1999 22:14:37 +0000 (+0000)
Subject: Fix warnings.
X-Git-Tag: 1.3.10~328
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5536bd40700dce9a46dd0578c891b892a69ae7db;p=thirdparty%2Fapache%2Fhttpd.git

Fix warnings.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83894 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/include/http_protocol.h b/include/http_protocol.h
index 908326ce7b0..e962b962c9c 100644
--- a/include/http_protocol.h
+++ b/include/http_protocol.h
@@ -173,7 +173,8 @@ API_EXPORT(int) ap_discard_request_body(request_rec *r);
 /* 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
diff --git a/modules/http/http_core.c b/modules/http/http_core.c
index 02debf7c320..3a33543ae48 100644
--- a/modules/http/http_core.c
+++ b/modules/http/http_core.c
@@ -2624,7 +2624,8 @@ static int default_handler(request_rec *r)
 		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);
 		}
diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c
index b642a96542d..c099254318b 100644
--- a/modules/http/http_protocol.c
+++ b/modules/http/http_protocol.c
@@ -122,8 +122,8 @@ static int parse_byterange(char *range, long clength, long *start, long *end)
     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 @@ API_EXPORT(int) ap_set_byterange(request_rec *r)
     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 @@ API_EXPORT(int) ap_each_byterange(request_rec *r, long *offset, long *length)
  * 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;