diff options
| author | joe <joe@61a7d7f5-40b7-0310-9c16-bb0ea8cb1845> | 2006-10-24 19:40:09 +0000 |
|---|---|---|
| committer | joe <joe@61a7d7f5-40b7-0310-9c16-bb0ea8cb1845> | 2006-10-24 19:40:09 +0000 |
| commit | 1f813f966306aa0d85160ab84b530c6ec414ec99 (patch) | |
| tree | 9a271429e146032adc3cf3a686acf187aabb74d9 /test/largefile.c | |
| parent | fd11694c60a970999cea2604144763d5380b4ce8 (diff) | |
| download | neon-1f813f966306aa0d85160ab84b530c6ec414ec99.tar.gz | |
Simplify LFS support, drop *64 transition functions:
* src/ne_defs.h: Add ne_off_t typedef.
* src/ne_request.h (ne_set_request_body_fd64,
ne_set_request_body_provider64): Removed.
(ne_set_request_body_fd, ne_set_request_body_provider):
Take ne_off_t arguments.
* src/ne_internal.h: Move LFS definitions here...
* src/ne_request.c: ...from here.
(ne_set_request_body_fd64, ne_set_request_body_provider64): Removed.
(ne_set_request_body_fd, ne_set_request_body_provider): Adjust for
ne_off_t arguments.
* src/ne_basic.h (ne_get_range64): Removed prototype.
(ne_content_range): Use ne_off_t offsets.
* src/ne_basic.c (ne_get_range64): Removed function.
(ne_get_range): Adjust for ne_off_t offsets.
* test/largefile.c (send_high_offset, read_large_response): Adjust to
use normal interfaces. Save and restore debug mask.
git-svn-id: http://svn.webdav.org/repos/projects/neon/trunk@1092 61a7d7f5-40b7-0310-9c16-bb0ea8cb1845
Diffstat (limited to 'test/largefile.c')
| -rw-r--r-- | test/largefile.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/test/largefile.c b/test/largefile.c index c68b4fd..e99e960 100644 --- a/test/largefile.c +++ b/test/largefile.c @@ -1,6 +1,6 @@ /* Tests for LFS support in neon - Copyright (C) 2004, Joe Orton <joe@manyfish.co.uk> + Copyright (C) 2004-2006, Joe Orton <joe@manyfish.co.uk> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -89,7 +89,7 @@ static int send_high_offset(void) CALL(make_session(&sess, serve_check_body, NULL)); req = ne_request_create(sess, "PUT", "/sparse"); - ne_set_request_body_fd64(req, fd, point, strlen(data)); + ne_set_request_body_fd(req, fd, point, strlen(data)); ret = ne_request_dispatch(req); CALL(await_server()); ONV(ret != NE_OK || ne_get_status(req)->klass != 2, @@ -148,16 +148,20 @@ static int read_large_response(void) off64_t count = 0; int ret; char buf[8192]; +#ifdef NE_DEBUGGING + int old_mask = ne_debug_mask; +#endif CALL(make_session(&sess, serve_large_response, NULL)); req = ne_request_create(sess, "GET", "/foo"); + ret = ne_begin_request(req); + #ifdef NE_DEBUGGING ne_debug_init(ne_debug_stream, ne_debug_mask & ~(NE_DBG_HTTPBODY|NE_DBG_HTTP)); #endif - - ret = ne_begin_request(req); + if (ret == NE_OK) { while ((ret = ne_read_response_block(req, buf, sizeof buf)) > 0) count += ret; @@ -166,7 +170,7 @@ static int read_large_response(void) } #ifdef NE_DEBUGGING - ne_debug_init(ne_debug_stream, ne_debug_mask & (NE_DBG_HTTPBODY|NE_DBG_HTTP)); + ne_debug_init(ne_debug_stream, old_mask); #endif ONV(ret, ("request failed: %s", ne_get_error(sess))); |