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 /evport.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 'evport.c')
-rw-r--r-- | evport.c | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -147,21 +147,21 @@ evport_init(struct event_base *base) if (getenv("EVENT_NOEVPORT")) return (NULL); - if (!(evpd = event_calloc(1, sizeof(struct evport_data)))) + if (!(evpd = mm_calloc(1, sizeof(struct evport_data)))) return (NULL); if ((evpd->ed_port = port_create()) == -1) { - event_free(evpd); + mm_free(evpd); return (NULL); } /* * Initialize file descriptor structure */ - evpd->ed_fds = event_calloc(DEFAULT_NFDS, sizeof(struct fd_info)); + evpd->ed_fds = mm_calloc(DEFAULT_NFDS, sizeof(struct fd_info)); if (evpd->ed_fds == NULL) { close(evpd->ed_port); - event_free(evpd); + mm_free(evpd); return (NULL); } evpd->ed_nevents = DEFAULT_NFDS; @@ -242,7 +242,7 @@ grow(struct evport_data *epdp, int factor) check_evportop(epdp); - tmp = event_realloc(epdp->ed_fds, sizeof(struct fd_info) * newsize); + tmp = mm_realloc(epdp->ed_fds, sizeof(struct fd_info) * newsize); if (NULL == tmp) return -1; epdp->ed_fds = tmp; @@ -509,6 +509,6 @@ evport_dealloc(struct event_base *base, void *arg) close(evpd->ed_port); if (evpd->ed_fds) - event_free(evpd->ed_fds); - event_free(evpd); + mm_free(evpd->ed_fds); + mm_free(evpd); } |