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

1 files changed, 2 insertions, 16 deletions

diff --git a/src/ne_request.h b/src/ne_request.h
index ab14939..b057869 100644
--- a/src/ne_request.h
+++ b/src/ne_request.h
@@ -57,14 +57,7 @@ void ne_set_request_body_buffer(ne_request *req, const char *buffer,
 /* The request body will be taken from 'length' bytes read from the
  * file descriptor 'fd', starting from file offset 'offset'. */
 void ne_set_request_body_fd(ne_request *req, int fd,
-                            off_t offset, off_t length);
-
-#ifdef NE_LFS
-/* Alternate version of ne_set_request_body_fd taking off64_t 
- * offset type for systems supporting _LARGEFILE64_SOURCE. */
-void ne_set_request_body_fd64(ne_request *req, int fd,
-                              off64_t offset, off64_t length);
-#endif
+                            ne_off_t offset, ne_off_t length);
 
 /* "Pull"-based request body provider: a callback which is invoked to
  * provide blocks of request body on demand.
@@ -86,16 +79,9 @@ typedef ssize_t (*ne_provide_body)(void *userdata,
  * request body, a block at a time.  The total size of the request
  * body is 'length'; the callback must ensure that it returns no more
  * than 'length' bytes in total. */
-void ne_set_request_body_provider(ne_request *req, off_t length,
+void ne_set_request_body_provider(ne_request *req, ne_off_t length,
 				  ne_provide_body provider, void *userdata);
 
-#ifdef NE_LFS
-/* Duplicate version of ne_set_request_body_provider, taking an off64_t
- * offset. */
-void ne_set_request_body_provider64(ne_request *req, off64_t length,
-                                    ne_provide_body provider, void *userdata);
-#endif
-
 /* Handling response bodies; two callbacks must be provided:
  *
  * 1) 'acceptance' callback: determines whether you want to handle the