posix: upgrade libevent from 1.4.7 to 1.4.13

third_party/libevent/buffer.c

 /*
  * Copyright (c) 2002, 2003 Niels Provos <provos@citi.umich.edu>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 143 matching lines @@
 #define va_copy(dst, src)       memcpy(&(dst), &(src), sizeof(va_list))
 #endif
                 va_copy(aq, ap);
 
                 sz = evutil_vsnprintf(buffer, space, fmt, aq);
 
                 va_end(aq);
 
                 if (sz < 0)
                         return (-1);
-                if (sz < space) {
+                if ((size_t)sz < space) {
                         buf->off += sz;
                         if (buf->cb != NULL)
                                 (*buf->cb)(buf, oldoff, buf->off, buf->cbarg);
                         return (sz);
                 }
                 if (evbuffer_expand(buf, sz + 1) == -1)
                         return (-1);
 
         }
         /* NOTREACHED */
@@ skipping 43 matching lines @@
         for (i = 0; i < len; i++) {
                 if (data[i] == '\r' || data[i] == '\n')
                         break;
         }
 
         if (i == len)
                 return (NULL);
 
         if ((line = malloc(i + 1)) == NULL) {
                 fprintf(stderr, "%s: out of memory\n", __func__);
-                evbuffer_drain(buffer, i);
                 return (NULL);
         }
 
         memcpy(line, data, i);
         line[i] = '\0';
 
         /*
          * Some protocols terminate a line with '\r\n', so check for
          * that, too.
          */
@@ skipping 111 matching lines @@
 int
 evbuffer_read(struct evbuffer *buf, int fd, int howmuch)
 {
         u_char *p;
         size_t oldoff = buf->off;
         int n = EVBUFFER_MAX_READ;
 
 #if defined(FIONREAD)
 #ifdef WIN32
         long lng = n;
-        if (ioctlsocket(fd, FIONREAD, &lng) == -1 || (n=lng) == 0) {
+        if (ioctlsocket(fd, FIONREAD, &lng) == -1 || (n=lng) <= 0) {
 #else
-        if (ioctl(fd, FIONREAD, &n) == -1 || n == 0) {
+        if (ioctl(fd, FIONREAD, &n) == -1 || n <= 0) {
 #endif
                 n = EVBUFFER_MAX_READ;
         } else if (n > EVBUFFER_MAX_READ && n > howmuch) {
                 /*
                  * It's possible that a lot of data is available for
                  * reading.  We do not want to exhaust resources
                  * before the reader has a chance to do something
                  * about it.  If the reader does not tell us how much
                  * data we should read, we artifically limit it.
                  */
-                if (n > buf->totallen << 2)
+                if ((size_t)n > buf->totallen << 2)
                         n = buf->totallen << 2;
                 if (n < EVBUFFER_MAX_READ)
                         n = EVBUFFER_MAX_READ;
         }
 #endif  
         if (howmuch < 0 || howmuch > n)
                 howmuch = n;
 
         /* If we don't have FIONREAD, we might waste some space here */
         if (evbuffer_expand(buf, howmuch) == -1)
@@ skipping 58 matching lines @@
         return (NULL);
 }
 
 void evbuffer_setcb(struct evbuffer *buffer,
     void (*cb)(struct evbuffer *, size_t, size_t, void *),
     void *cbarg)
 {
         buffer->cb = cb;
         buffer->cbarg = cbarg;
 }