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

r19677@catbus: nickm | 2008-05-11 20:51:41 -0400

Browse Source 
Oops; we had not changed event_malloc() to mm_malloc() [etc] in win32.c


svn:r809
This commit is contained in:
Nick Mathewson 2008-05-12 00:51:48 +00:00
parent 6bf1ca780c
commit 04366d5acc
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
WIN32-Code/win32.c
View File

@ -49,7 +49,7 @@
#include "event.h" #include "event.h"
#include "event-internal.h" #include "event-internal.h"
#define XFREE(ptr) do { if (ptr) event_free(ptr); } while(0) #define XFREE(ptr) do { if (ptr) mm_free(ptr); } while(0)
extern struct event_list timequeue; extern struct event_list timequeue;
extern struct event_list addqueue; extern struct event_list addqueue;
@ -163,7 +163,7 @@ get_event_entry(struct win32op *op, SOCKET s, int create)
val = RB_FIND(event_map, &op->event_root, &key); val = RB_FIND(event_map, &op->event_root, &key);
if (val || !create) if (val || !create)
return val; return val;
if (!(val = event_calloc(1, sizeof(struct event_entry)))) { if (!(val = mm_calloc(1, sizeof(struct event_entry)))) {
event_warn("%s: calloc", __func__); event_warn("%s: calloc", __func__);
return NULL; return NULL;
} }
@ -234,19 +234,19 @@ win32_init(struct event_base *_base)
{ {
struct win32op *winop; struct win32op *winop;
size_t size; size_t size;
if (!(winop = event_calloc(1, sizeof(struct win32op)))) if (!(winop = mm_calloc(1, sizeof(struct win32op))))
return NULL; return NULL;
winop->fd_setsz = NEVENT; winop->fd_setsz = NEVENT;
size = FD_SET_ALLOC_SIZE(NEVENT); size = FD_SET_ALLOC_SIZE(NEVENT);
if (!(winop->readset_in = event_malloc(size))) if (!(winop->readset_in = mm_malloc(size)))
goto err; goto err;
if (!(winop->writeset_in = event_malloc(size))) if (!(winop->writeset_in = mm_malloc(size)))
goto err; goto err;
if (!(winop->readset_out = event_malloc(size))) if (!(winop->readset_out = mm_malloc(size)))
goto err; goto err;
if (!(winop->writeset_out = event_malloc(size))) if (!(winop->writeset_out = mm_malloc(size)))
goto err; goto err;
if (!(winop->exset_out = event_malloc(size))) if (!(winop->exset_out = mm_malloc(size)))
goto err; goto err;
RB_INIT(&winop->event_root); RB_INIT(&winop->event_root);
winop->readset_in->fd_count = winop->writeset_in->fd_count = 0; winop->readset_in->fd_count = winop->writeset_in->fd_count = 0;
@ -317,7 +317,7 @@ win32_del(void *op, struct event *ev)
} }
if (!ent->read_event && !ent->write_event) { if (!ent->read_event && !ent->write_event) {
RB_REMOVE(event_map, &win32op->event_root, ent); RB_REMOVE(event_map, &win32op->event_root, ent);
event_free(ent); mm_free(ent);
} }
return 0; return 0;
@ -413,19 +413,19 @@ win32_dealloc(struct event_base *_base, void *arg)
evsignal_dealloc(_base); evsignal_dealloc(_base);
if (win32op->readset_in) if (win32op->readset_in)
event_free(win32op->readset_in); mm_free(win32op->readset_in);
if (win32op->writeset_in) if (win32op->writeset_in)
event_free(win32op->writeset_in); mm_free(win32op->writeset_in);
if (win32op->readset_out) if (win32op->readset_out)
event_free(win32op->readset_out); mm_free(win32op->readset_out);
if (win32op->writeset_out) if (win32op->writeset_out)
event_free(win32op->writeset_out); mm_free(win32op->writeset_out);
if (win32op->exset_out) if (win32op->exset_out)
event_free(win32op->exset_out); mm_free(win32op->exset_out);
/* XXXXX free the tree. */ /* XXXXX free the tree. */
memset(win32op, 0, sizeof(win32op)); memset(win32op, 0, sizeof(win32op));
event_free(win32op); mm_free(win32op);
} }
#if 0 #if 0