diff options
author | Nick Mathewson <nickm@torproject.org> | 2008-04-25 01:18:08 +0000 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2008-04-25 01:18:08 +0000 |
commit | 49868b618a55c375d6c378edc174cd81e478f213 (patch) | |
tree | 43d062032c9e61bc720d71e79de3560fbb61b05f /select.c | |
parent | a55a67d56e989b9f7fa2027f2c75bec8a55a9a87 (diff) | |
download | libevent-49868b618a55c375d6c378edc174cd81e478f213.tar.gz |
r15316@tombo: nickm | 2008-04-24 20:58:36 -0400
Rename internal memory management functions from event_malloc() etc to mm_malloc() etc.
svn:r725
Diffstat (limited to 'select.c')
-rw-r--r-- | select.c | 28 |
1 files changed, 14 insertions, 14 deletions
@@ -98,7 +98,7 @@ select_init(struct event_base *base) if (getenv("EVENT_NOSELECT")) return (NULL); - if (!(sop = event_calloc(1, sizeof(struct selectop)))) + if (!(sop = mm_calloc(1, sizeof(struct selectop)))) return (NULL); select_resize(sop, howmany(32 + 1, NFDBITS)*sizeof(fd_mask)); @@ -210,23 +210,23 @@ select_resize(struct selectop *sop, int fdsz) if (sop->event_readset_in) check_selectop(sop); - if ((readset_in = event_realloc(sop->event_readset_in, fdsz)) == NULL) + if ((readset_in = mm_realloc(sop->event_readset_in, fdsz)) == NULL) goto error; sop->event_readset_in = readset_in; - if ((readset_out = event_realloc(sop->event_readset_out, fdsz)) == NULL) + if ((readset_out = mm_realloc(sop->event_readset_out, fdsz)) == NULL) goto error; sop->event_readset_out = readset_out; - if ((writeset_in = event_realloc(sop->event_writeset_in, fdsz)) == NULL) + if ((writeset_in = mm_realloc(sop->event_writeset_in, fdsz)) == NULL) goto error; sop->event_writeset_in = writeset_in; - if ((writeset_out = event_realloc(sop->event_writeset_out, fdsz)) == NULL) + if ((writeset_out = mm_realloc(sop->event_writeset_out, fdsz)) == NULL) goto error; sop->event_writeset_out = writeset_out; - if ((r_by_fd = event_realloc(sop->event_r_by_fd, + if ((r_by_fd = mm_realloc(sop->event_r_by_fd, n_events*sizeof(struct event*))) == NULL) goto error; sop->event_r_by_fd = r_by_fd; - if ((w_by_fd = event_realloc(sop->event_w_by_fd, + if ((w_by_fd = mm_realloc(sop->event_w_by_fd, n_events * sizeof(struct event*))) == NULL) goto error; sop->event_w_by_fd = w_by_fd; @@ -336,18 +336,18 @@ select_dealloc(struct event_base *base, void *arg) evsignal_dealloc(base); if (sop->event_readset_in) - event_free(sop->event_readset_in); + mm_free(sop->event_readset_in); if (sop->event_writeset_in) - event_free(sop->event_writeset_in); + mm_free(sop->event_writeset_in); if (sop->event_readset_out) - event_free(sop->event_readset_out); + mm_free(sop->event_readset_out); if (sop->event_writeset_out) - event_free(sop->event_writeset_out); + mm_free(sop->event_writeset_out); if (sop->event_r_by_fd) - event_free(sop->event_r_by_fd); + mm_free(sop->event_r_by_fd); if (sop->event_w_by_fd) - event_free(sop->event_w_by_fd); + mm_free(sop->event_w_by_fd); memset(sop, 0, sizeof(struct selectop)); - event_free(sop); + mm_free(sop); } |