From a6ac024104db4f2014a2f07517f1024facd3c229 Mon Sep 17 00:00:00 2001 From: "William A. Rowe Jr" Date: Sat, 3 Aug 2002 19:36:33 +0000 Subject: [PATCH] catch up with the apr_atoll -> apr_atoi64 rename git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96299 13f79535-47bb-0310-9956-ffa450edef68 --- modules/dav/main/mod_dav.c | 8 ++++---- modules/experimental/mod_cache.c | 2 +- modules/http/http_protocol.c | 6 +++--- modules/mappers/mod_negotiation.c | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/dav/main/mod_dav.c b/modules/dav/main/mod_dav.c index 7ec2b0bde3..c5dd5566b4 100644 --- a/modules/dav/main/mod_dav.c +++ b/modules/dav/main/mod_dav.c @@ -761,11 +761,11 @@ static int dav_parse_range(request_rec *r, *dash = *slash = '\0'; - *range_start = apr_atoll(range + 6); - *range_end = apr_atoll(dash + 1); + *range_start = apr_atoi64(range + 6); + *range_end = apr_atoi64(dash + 1); if (*range_end < *range_start - || (slash[1] != '*' && apr_atoll(slash + 1) <= *range_end)) { + || (slash[1] != '*' && apr_atoi64(slash + 1) <= *range_end)) { /* invalid range. ignore it (per S14.16 of RFC2616) */ return 0; } @@ -2318,7 +2318,7 @@ static int process_mkcol_body(request_rec *r) return HTTP_BAD_REQUEST; } - r->remaining = apr_atoll(lenp); + r->remaining = apr_atoi64(lenp); } if (r->read_chunked || r->remaining > 0) { diff --git a/modules/experimental/mod_cache.c b/modules/experimental/mod_cache.c index ced7cf3290..26b4fab7a2 100644 --- a/modules/experimental/mod_cache.c +++ b/modules/experimental/mod_cache.c @@ -577,7 +577,7 @@ static int cache_in_filter(ap_filter_t *f, apr_bucket_brigade *in) const char* cl; cl = apr_table_get(r->headers_out, "Content-Length"); if (cl) { - size = apr_atoll(cl); + size = apr_atoi64(cl); } else { diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c index 92b3db42e7..20ad5f2c00 100644 --- a/modules/http/http_protocol.c +++ b/modules/http/http_protocol.c @@ -2719,15 +2719,15 @@ static int parse_byterange(char *range, apr_off_t clength, if ((dash == range)) { /* In the form "-5" */ - *start = clength - apr_atoll(dash + 1); + *start = clength - apr_atoi64(dash + 1); *end = clength - 1; } else { *dash = '\0'; dash++; - *start = apr_atoll(range); + *start = apr_atoi64(range); if (*dash) { - *end = apr_atoll(dash); + *end = apr_atoi64(dash); } else { /* "5-" */ *end = clength - 1; diff --git a/modules/mappers/mod_negotiation.c b/modules/mappers/mod_negotiation.c index efc9b94b64..61b30e51a1 100644 --- a/modules/mappers/mod_negotiation.c +++ b/modules/mappers/mod_negotiation.c @@ -948,7 +948,7 @@ static int read_type_map(apr_file_t **map, negotiation_state *neg, request_rec * has_content = 1; } else if (!strncmp(buffer, "content-length:", 15)) { - mime_info.bytes = apr_atoll((char *)body); + mime_info.bytes = apr_atoi64((char *)body); has_content = 1; } else if (!strncmp(buffer, "content-language:", 17)) { -- 2.40.0