posix: upgrade libevent from 1.4.7 to 1.4.13

third_party/libevent/test/regress.gen.c

 /*
  * Automatically generated from ./regress.rpc
  * by event_rpcgen.py/0.1.  DO NOT EDIT THIS FILE.
  */
 
 #include <sys/types.h>
+#ifdef _EVENT_HAVE_SYS_TIME_H
 #include <sys/time.h>
+#endif
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
+#define EVENT_NO_STRUCT
 #include <event.h>
 
+#ifdef _EVENT___func__
+#define __func__ _EVENT___func__
+#endif
 
 #include "./regress.gen.h"
 
 void event_err(int eval, const char *fmt, ...);
 void event_warn(const char *fmt, ...);
 void event_errx(int eval, const char *fmt, ...);
 void event_warnx(const char *fmt, ...);
 
 
 /*
@@ skipping 260 matching lines @@
     int i;
     for (i = 0; i < tmp->run_length; ++i) {
       evtag_marshal_run(evbuf, MSG_RUN, tmp->run_data[i]);
     }
   }
 }
 
 int
 msg_unmarshal(struct msg *tmp,  struct evbuffer *evbuf)
 {
-  uint32_t tag;
+  ev_uint32_t tag;
   while (EVBUFFER_LENGTH(evbuf) > 0) {
     if (evtag_peek(evbuf, &tag) == -1)
       return (-1);
     switch (tag) {
 
       case MSG_FROM_NAME:
 
         if (tmp->from_name_set)
           return (-1);
         if (evtag_unmarshal_string(evbuf, MSG_FROM_NAME, &tmp->from_name_data) == -1) {
@@ skipping 64 matching lines @@
     int i;
     for (i = 0; i < msg->run_length; ++i) {
       if (run_complete(msg->run_data[i]) == -1)
         return (-1);
     }
   }
   return (0);
 }
 
 int
-evtag_unmarshal_msg(struct evbuffer *evbuf, uint32_t need_tag, struct msg *msg)
+evtag_unmarshal_msg(struct evbuffer *evbuf, ev_uint32_t need_tag, struct msg *msg)
 {
-  uint32_t tag;
+  ev_uint32_t tag;
   int res = -1;
 
   struct evbuffer *tmp = evbuffer_new();
 
   if (evtag_unmarshal(evbuf, &tag, tmp) == -1 || tag != need_tag)
     goto error;
 
   if (msg_unmarshal(msg, tmp) == -1)
     goto error;
 
   res = 0;
 
  error:
   evbuffer_free(tmp);
   return (res);
 }
 
 void
-evtag_marshal_msg(struct evbuffer *evbuf, uint32_t tag, const struct msg *msg)
+evtag_marshal_msg(struct evbuffer *evbuf, ev_uint32_t tag, const struct msg *msg)
 {
   struct evbuffer *_buf = evbuffer_new();
   assert(_buf != NULL);
   evbuffer_drain(_buf, -1);
   msg_marshal(_buf, msg);
   evtag_marshal(evbuf, tag, EVBUFFER_DATA(_buf), EVBUFFER_LENGTH(_buf));
   evbuffer_free(_buf);
 }
 
 /*
@@ skipping 52 matching lines @@
 {
   if (msg->action_data != NULL)
     free(msg->action_data);
   if ((msg->action_data = strdup(value)) == NULL)
     return (-1);
   msg->action_set = 1;
   return (0);
 }
 
 int
-kill_how_often_assign(struct kill *msg, const uint32_t value)
+kill_how_often_assign(struct kill *msg, const ev_uint32_t value)
 {
   msg->how_often_set = 1;
   msg->how_often_data = value;
   return (0);
 }
 
 int
 kill_weapon_get(struct kill *msg, char * *value)
 {
   if (msg->weapon_set != 1)
     return (-1);
   *value = msg->weapon_data;
   return (0);
 }
 
 int
 kill_action_get(struct kill *msg, char * *value)
 {
   if (msg->action_set != 1)
     return (-1);
   *value = msg->action_data;
   return (0);
 }
 
 int
-kill_how_often_get(struct kill *msg, uint32_t *value)
+kill_how_often_get(struct kill *msg, ev_uint32_t *value)
 {
   if (msg->how_often_set != 1)
     return (-1);
   *value = msg->how_often_data;
   return (0);
 }
 
 void
 kill_clear(struct kill *tmp)
 {
@@ skipping 25 matching lines @@
   evtag_marshal_string(evbuf, KILL_WEAPON, tmp->weapon_data);
   evtag_marshal_string(evbuf, KILL_ACTION, tmp->action_data);
   if (tmp->how_often_set) {
     evtag_marshal_int(evbuf, KILL_HOW_OFTEN, tmp->how_often_data);
   }
 }
 
 int
 kill_unmarshal(struct kill *tmp,  struct evbuffer *evbuf)
 {
-  uint32_t tag;
+  ev_uint32_t tag;
   while (EVBUFFER_LENGTH(evbuf) > 0) {
     if (evtag_peek(evbuf, &tag) == -1)
       return (-1);
     switch (tag) {
 
       case KILL_WEAPON:
 
         if (tmp->weapon_set)
           return (-1);
         if (evtag_unmarshal_string(evbuf, KILL_WEAPON, &tmp->weapon_data) == -1) {
@@ skipping 39 matching lines @@
 kill_complete(struct kill *msg)
 {
   if (!msg->weapon_set)
     return (-1);
   if (!msg->action_set)
     return (-1);
   return (0);
 }
 
 int
-evtag_unmarshal_kill(struct evbuffer *evbuf, uint32_t need_tag, struct kill *msg)
+evtag_unmarshal_kill(struct evbuffer *evbuf, ev_uint32_t need_tag, struct kill *msg)
 {
-  uint32_t tag;
+  ev_uint32_t tag;
   int res = -1;
 
   struct evbuffer *tmp = evbuffer_new();
 
   if (evtag_unmarshal(evbuf, &tag, tmp) == -1 || tag != need_tag)
     goto error;
 
   if (kill_unmarshal(msg, tmp) == -1)
     goto error;
 
   res = 0;
 
  error:
   evbuffer_free(tmp);
   return (res);
 }
 
 void
-evtag_marshal_kill(struct evbuffer *evbuf, uint32_t tag, const struct kill *msg)
+evtag_marshal_kill(struct evbuffer *evbuf, ev_uint32_t tag, const struct kill *msg)
 {
   struct evbuffer *_buf = evbuffer_new();
   assert(_buf != NULL);
   evbuffer_drain(_buf, -1);
   kill_marshal(_buf, msg);
   evtag_marshal(evbuf, tag, EVBUFFER_DATA(_buf), EVBUFFER_LENGTH(_buf));
   evbuffer_free(_buf);
 }
 
 /*
@@ skipping 41 matching lines @@
 {
   if (msg->how_data != NULL)
     free(msg->how_data);
   if ((msg->how_data = strdup(value)) == NULL)
     return (-1);
   msg->how_set = 1;
   return (0);
 }
 
 int
-run_some_bytes_assign(struct run *msg, const uint8_t * value, uint32_t len)
+run_some_bytes_assign(struct run *msg, const ev_uint8_t * value, ev_uint32_t len)
 {
   if (msg->some_bytes_data != NULL)
     free (msg->some_bytes_data);
   msg->some_bytes_data = malloc(len);
   if (msg->some_bytes_data == NULL)
     return (-1);
   msg->some_bytes_set = 1;
   msg->some_bytes_length = len;
   memcpy(msg->some_bytes_data, value, len);
   return (0);
 }
 
 int
-run_fixed_bytes_assign(struct run *msg, const uint8_t *value)
+run_fixed_bytes_assign(struct run *msg, const ev_uint8_t *value)
 {
   msg->fixed_bytes_set = 1;
   memcpy(msg->fixed_bytes_data, value, 24);
   return (0);
 }
 
 int
 run_how_get(struct run *msg, char * *value)
 {
   if (msg->how_set != 1)
     return (-1);
   *value = msg->how_data;
   return (0);
 }
 
 int
-run_some_bytes_get(struct run *msg, uint8_t * *value, uint32_t *plen)
+run_some_bytes_get(struct run *msg, ev_uint8_t * *value, ev_uint32_t *plen)
 {
   if (msg->some_bytes_set != 1)
     return (-1);
   *value = msg->some_bytes_data;
   *plen = msg->some_bytes_length;
   return (0);
 }
 
 int
-run_fixed_bytes_get(struct run *msg, uint8_t **value)
+run_fixed_bytes_get(struct run *msg, ev_uint8_t **value)
 {
   if (msg->fixed_bytes_set != 1)
     return (-1);
   *value = msg->fixed_bytes_data;
   return (0);
 }
 
 void
 run_clear(struct run *tmp)
 {
@@ skipping 27 matching lines @@
   evtag_marshal_string(evbuf, RUN_HOW, tmp->how_data);
   if (tmp->some_bytes_set) {
     evtag_marshal(evbuf, RUN_SOME_BYTES, tmp->some_bytes_data, tmp->some_bytes_length);
   }
   evtag_marshal(evbuf, RUN_FIXED_BYTES, tmp->fixed_bytes_data, sizeof(tmp->fixed_bytes_data));
 }
 
 int
 run_unmarshal(struct run *tmp,  struct evbuffer *evbuf)
 {
-  uint32_t tag;
+  ev_uint32_t tag;
   while (EVBUFFER_LENGTH(evbuf) > 0) {
     if (evtag_peek(evbuf, &tag) == -1)
       return (-1);
     switch (tag) {
 
       case RUN_HOW:
 
         if (tmp->how_set)
           return (-1);
         if (evtag_unmarshal_string(evbuf, RUN_HOW, &tmp->how_data) == -1) {
@@ skipping 45 matching lines @@
 run_complete(struct run *msg)
 {
   if (!msg->how_set)
     return (-1);
   if (!msg->fixed_bytes_set)
     return (-1);
   return (0);
 }
 
 int
-evtag_unmarshal_run(struct evbuffer *evbuf, uint32_t need_tag, struct run *msg)
+evtag_unmarshal_run(struct evbuffer *evbuf, ev_uint32_t need_tag, struct run *msg)
 {
-  uint32_t tag;
+  ev_uint32_t tag;
   int res = -1;
 
   struct evbuffer *tmp = evbuffer_new();
 
   if (evtag_unmarshal(evbuf, &tag, tmp) == -1 || tag != need_tag)
     goto error;
 
   if (run_unmarshal(msg, tmp) == -1)
     goto error;
 
   res = 0;
 
  error:
   evbuffer_free(tmp);
   return (res);
 }
 
 void
-evtag_marshal_run(struct evbuffer *evbuf, uint32_t tag, const struct run *msg)
+evtag_marshal_run(struct evbuffer *evbuf, ev_uint32_t tag, const struct run *msg)
 {
   struct evbuffer *_buf = evbuffer_new();
   assert(_buf != NULL);
   evbuffer_drain(_buf, -1);
   run_marshal(_buf, msg);
   evtag_marshal(evbuf, tag, EVBUFFER_DATA(_buf), EVBUFFER_LENGTH(_buf));
   evbuffer_free(_buf);
 }