Merge remote branch 'origin/patches-2.0'

This commit is contained in:
Nick Mathewson 2011-03-12 12:12:35 -05:00
commit 4ab2a89dc7

View File

@ -99,7 +99,7 @@ evrpc_free(struct evrpc_base *base)
while ((rpc = TAILQ_FIRST(&base->registered_rpcs)) != NULL) { while ((rpc = TAILQ_FIRST(&base->registered_rpcs)) != NULL) {
r = evrpc_unregister_rpc(base, rpc->uri); r = evrpc_unregister_rpc(base, rpc->uri);
EVUTIL_ASSERT(r); EVUTIL_ASSERT(r == 0);
} }
while ((pause = TAILQ_FIRST(&base->paused_requests)) != NULL) { while ((pause = TAILQ_FIRST(&base->paused_requests)) != NULL) {
TAILQ_REMOVE(&base->paused_requests, pause, next); TAILQ_REMOVE(&base->paused_requests, pause, next);
@ -264,9 +264,6 @@ evrpc_unregister_rpc(struct evrpc_base *base, const char *name)
} }
TAILQ_REMOVE(&base->registered_rpcs, rpc, next); TAILQ_REMOVE(&base->registered_rpcs, rpc, next);
mm_free((char *)rpc->uri);
mm_free(rpc);
registered_uri = evrpc_construct_uri(name); registered_uri = evrpc_construct_uri(name);
/* remove the http server callback */ /* remove the http server callback */
@ -274,6 +271,9 @@ evrpc_unregister_rpc(struct evrpc_base *base, const char *name)
EVUTIL_ASSERT(r == 0); EVUTIL_ASSERT(r == 0);
mm_free(registered_uri); mm_free(registered_uri);
mm_free((char *)rpc->uri);
mm_free(rpc);
return (0); return (0);
} }