don't require string literal for message name

svn:r270

diff --git a/evrpc.h b/evrpc.h
index 5c9d2a81f094f473dfcf78524ed20109b7914bc1..4640d0ba562ce015c1be6d19718f954c7311c1dc 100644 (file)
--- a/evrpc.h
+++ b/evrpc.h
@@ -49,7 +49,7 @@
  *
  * A specific RPC can then be registered with
  *
- * EVRPC_REGISTER(base, "SendCommand", Request, Reply,  FunctionCB, arg);
+ * EVRPC_REGISTER(base, SendCommand, Request, Reply,  FunctionCB, arg);
  *
  * when the server receives an appropriately formatted RPC, the user callback
  * is invokved.   The callback needs to fill in the reply structure.
@@ -185,7 +185,7 @@ int evrpc_send_request_##rpcname(struct evrpc_pool *pool, \
 /* Takes a request object and fills it in with the right magic */
 #define EVRPC_REGISTER_OBJECT(rpc, name, request, reply) \
   do { \
-    (rpc)->uri = strdup(name); \
+    (rpc)->uri = strdup(#name); \
     if ((rpc)->uri == NULL) \
       event_err(1, "failed to register object"); \
     (rpc)->request_new = (void *(*)(void))request##_new; \

diff --git a/test/regress_rpc.c b/test/regress_rpc.c
index ceae96415c4a590f79ccc0b96415f2c9af20d4a1..863b9571d0d636d35be7dfcae4181d7074235438 100644 (file)
--- a/test/regress_rpc.c
+++ b/test/regress_rpc.c
@@ -111,7 +111,7 @@ rpc_setup(struct evhttp **phttp, short *pport, struct evrpc_base **pbase)
        http = http_setup(&port);
        base = evrpc_init(http);
        
-       EVRPC_REGISTER(base, "Message", msg, kill, MessageCB, NULL);
+       EVRPC_REGISTER(base, Message, msg, kill, MessageCB, NULL);
 
        *phttp = http;
        *pport = port;