EVRPC_MAKE_REQUEST needs the pool argument

svn:r349

diff --git a/evrpc.h b/evrpc.h
index 86a6bd83ee21fd30886509d73c48b6a44f54bf8f..fc452623608bd646505f3c1854ca6aef7cf84186 100644 (file)
--- a/evrpc.h
+++ b/evrpc.h
@@ -262,7 +262,7 @@ struct evrpc_request_wrapper {
        int (*reply_unmarshal)(void *, struct evbuffer*);
 };
 
-#define EVRPC_MAKE_REQUEST(name, request, reply, cb, cbarg) \
+#define EVRPC_MAKE_REQUEST(name, pool, request, reply, cb, cbarg)      \
        evrpc_send_request_##name(pool, request, reply, cb, cbarg)
 
 int evrpc_make_request(struct evrpc_request_wrapper *);

diff --git a/test/regress_rpc.c b/test/regress_rpc.c
index 785127b9ce57cdd845af79e481a5ac6f85187dc3..dcae9c9e092d6eae5f74d2a0b35a758c76c1d1c2 100644 (file)
--- a/test/regress_rpc.c
+++ b/test/regress_rpc.c
@@ -381,7 +381,7 @@ rpc_basic_client(void)
 
        kill = kill_new();
 
-       EVRPC_MAKE_REQUEST(Message, msg, kill,  GotKillCb, NULL);
+       EVRPC_MAKE_REQUEST(Message, pool, msg, kill,  GotKillCb, NULL);
 
        test_ok = 0;
 
@@ -395,7 +395,7 @@ rpc_basic_client(void)
        /* we do it twice to make sure that reuse works correctly */
        kill_clear(kill);
 
-       EVRPC_MAKE_REQUEST(Message, msg, kill,  GotKillCb, NULL);
+       EVRPC_MAKE_REQUEST(Message, pool, msg, kill,  GotKillCb, NULL);
 
        event_dispatch();
        
@@ -441,8 +441,8 @@ rpc_basic_queued_client(void)
        kill_one = kill_new();
        kill_two = kill_new();
 
-       EVRPC_MAKE_REQUEST(Message, msg, kill_one,  GotKillCbTwo, NULL);
-       EVRPC_MAKE_REQUEST(Message, msg, kill_two,  GotKillCb, NULL);
+       EVRPC_MAKE_REQUEST(Message, pool, msg, kill_one,  GotKillCbTwo, NULL);
+       EVRPC_MAKE_REQUEST(Message, pool, msg, kill_two,  GotKillCb, NULL);
 
        test_ok = 0;
 
@@ -502,7 +502,7 @@ rpc_client_timeout(void)
 
        kill = kill_new();
 
-       EVRPC_MAKE_REQUEST(NeverReply, msg, kill,  GotErrorCb, NULL);
+       EVRPC_MAKE_REQUEST(NeverReply, pool, msg, kill,  GotErrorCb, NULL);
 
        test_ok = 0;