cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-10 13:04:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make evbuffer_add_file take ev_off_t, not off_t

Browse Source 
This change has no effect on non-windows platforms, since those
either define off_t to 64-bits, or allow you to decide whether
it should be 64-bits yourself via some LARGEFILE-like macro.

On Windows, however, off_t is always 32-bit, so it's a bad choice
for "file size" or "file offset" values.  Instead, I'm adding
an ev_off_t type, and using it in the one place where we used
off_t to mean "the size of a file" or "an offset into a file" in the
API.

This breaks ABI compatibility on Windows.
This commit is contained in:
Nick Mathewson 2010-10-25 14:29:30 -04:00
parent 2c66983a6d
commit ac7e52d84d
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buffer.c
View File

@ -2642,7 +2642,7 @@ done:
*/ */
int int
evbuffer_add_file(struct evbuffer *outbuf, int fd, evbuffer_add_file(struct evbuffer *outbuf, int fd,
off_t offset, off_t length) ev_off_t offset, ev_off_t length)
{ {
#if defined(USE_SENDFILE) || defined(_EVENT_HAVE_MMAP) #if defined(USE_SENDFILE) || defined(_EVENT_HAVE_MMAP)
struct evbuffer_chain *chain; struct evbuffer_chain *chain;
@ -2738,7 +2738,7 @@ evbuffer_add_file(struct evbuffer *outbuf, int fd,
return (-1); return (-1);
#ifdef WIN32 #ifdef WIN32
#define lseek _lseek #define lseek _lseeki64
#endif #endif
if (lseek(fd, offset, SEEK_SET) == -1) { if (lseek(fd, offset, SEEK_SET) == -1) {
evbuffer_free(tmp); evbuffer_free(tmp);

4
include/event2/buffer.h
View File

@ -375,8 +375,8 @@ int evbuffer_add_reference(struct evbuffer *outbuf,
@return 0 if successful, or -1 if an error occurred @return 0 if successful, or -1 if an error occurred
*/ */
int evbuffer_add_file(struct evbuffer *output, int fd, off_t offset, int evbuffer_add_file(struct evbuffer *output, int fd, ev_off_t offset,
off_t length); ev_off_t length);
/** /**
Append a formatted string to the end of an evbuffer. Append a formatted string to the end of an evbuffer.

6
include/event2/util.h
View File

@ -161,6 +161,12 @@ extern "C" {
#define ev_ssize_t ssize_t #define ev_ssize_t ssize_t
#endif #endif
#ifdef WIN32
#define ev_off_t ev_int64_t
#else
#define ev_off_t off_t
#endif
/* Limits for integer types. /* Limits for integer types.
We're making two assumptions here: We're making two assumptions here: