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, 26 deletions

diff --git a/src/ne_basic.c b/src/ne_basic.c
index 1333d13..0a3c7f6 100644
--- a/src/ne_basic.c
+++ b/src/ne_basic.c
@@ -103,11 +103,7 @@ int ne_put(ne_session *sess, const char *uri, int fd)
     ne_lock_using_parent(req, uri);
 #endif
 
-#ifdef NE_LFS
-    ne_set_request_body_fd64(req, fd, 0, st.st_size);
-#else
     ne_set_request_body_fd(req, fd, 0, st.st_size);
-#endif
 	
     ret = ne_request_dispatch(req);
     
@@ -204,38 +200,18 @@ int ne_get_range(ne_session *sess, const char *uri,
     char brange[64];
 
     if (range->end == -1) {
-        ne_snprintf(brange, sizeof brange, "bytes=%" NE_FMT_OFF_T "-", 
+        ne_snprintf(brange, sizeof brange, "bytes=%" FMT_NE_OFF_T "-", 
                     range->start);
     }
     else {
 	ne_snprintf(brange, sizeof brange,
-                    "bytes=%" NE_FMT_OFF_T "-%" NE_FMT_OFF_T,
+                    "bytes=%" FMT_NE_OFF_T "-%" FMT_NE_OFF_T,
                     range->start, range->end);
     }
 
     return get_range_common(sess, uri, brange, fd);
 }
 
-#ifdef NE_LFS
-int ne_get_range64(ne_session *sess, const char *uri, 
-                   ne_content_range64 *range, int fd)
-{
-    char brange[64];
-
-    if (range->end == -1) {
-        ne_snprintf(brange, sizeof brange, "bytes=%" NE_FMT_OFF64_T "-", 
-                    range->start);
-    }
-    else {
-	ne_snprintf(brange, sizeof brange,
-                    "bytes=%" NE_FMT_OFF64_T "-%" NE_FMT_OFF64_T,
-                    range->start, range->end);
-    }
-
-    return get_range_common(sess, uri, brange, fd);
-}
-#endif
-
 /* Get to given fd */
 int ne_get(ne_session *sess, const char *uri, int fd)
 {