From: Niels Provos <provos@gmail.com>
Date: Mon, 20 Nov 2006 07:57:36 +0000 (+0000)
Subject: don't require string literal for message name
X-Git-Tag: release-2.0.1-alpha~689
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4aa780d6adf37a23985aa8f544087bc3b14aba9b;p=libevent

don't require string literal for message name


svn:r270
---

diff --git a/evrpc.h b/evrpc.h
index 5c9d2a81..4640d0ba 100644
--- 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 ceae9641..863b9571 100644
--- 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;