]> granicus.if.org Git - libevent/commitdiff
fix windows compilation issues with new file segment code
authorNick Mathewson <nickm@torproject.org>
Fri, 2 Dec 2011 06:48:14 +0000 (01:48 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 2 Dec 2011 06:48:17 +0000 (01:48 -0500)
Found by Linus Nordberg

buffer.c

index 8c246c52362f78beb2a8e154ebaf5cd503f7b580..9b4edda56c336e8b53d2a871527bd9cdd99e84e9 100644 (file)
--- a/buffer.c
+++ b/buffer.c
@@ -2769,7 +2769,9 @@ evbuffer_file_segment_new(
        if (evbuffer_file_segment_materialize(seg)<0)
                goto err;
 
+#if defined(USE_SENDFILE)
 done:
+#endif
        if (!(flags & EVBUF_FS_DISABLE_LOCKING)) {
                EVTHREAD_ALLOC_LOCK(seg->lock, 0);
        }
@@ -2839,7 +2841,7 @@ evbuffer_file_segment_materialize(struct evbuffer_file_segment *seg)
                HANDLE m;
                ev_uint64_t total_size = length+offset;
                if (h == (long)INVALID_HANDLE_VALUE)
-                       return NULL;
+                       goto err;
                m = CreateFileMapping((HANDLE)h, NULL, PAGE_READONLY,
                    (total_size >> 32), total_size & 0xfffffffful,
                    NULL);