You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by tr...@apache.org on 2013/11/20 20:31:05 UTC
svn commit: r1543912 - in /qpid/dispatch/trunk:
include/qpid/dispatch/router.h src/router_node.c src/router_private.h
Author: tross
Date: Wed Nov 20 19:31:04 2013
New Revision: 1543912
URL: http://svn.apache.org/r1543912
Log:
QPID-5217 - Applied patch from Justin Ross
Modified:
qpid/dispatch/trunk/include/qpid/dispatch/router.h
qpid/dispatch/trunk/src/router_node.c
qpid/dispatch/trunk/src/router_private.h
Modified: qpid/dispatch/trunk/include/qpid/dispatch/router.h
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/include/qpid/dispatch/router.h?rev=1543912&r1=1543911&r2=1543912&view=diff
==============================================================================
--- qpid/dispatch/trunk/include/qpid/dispatch/router.h (original)
+++ qpid/dispatch/trunk/include/qpid/dispatch/router.h Wed Nov 20 19:31:04 2013
@@ -27,14 +27,14 @@
typedef struct qd_address_t qd_address_t;
-typedef void (*qd_router_message_cb)(void *context, qd_message_t *msg, int link_id);
+typedef void (*qd_router_message_cb_t)(void *context, qd_message_t *msg, int link_id);
const char *qd_router_id(const qd_dispatch_t *qd);
-qd_address_t *qd_router_register_address(qd_dispatch_t *qd,
- const char *address,
- qd_router_message_cb handler,
- void *context);
+qd_address_t *qd_router_register_address(qd_dispatch_t *qd,
+ const char *address,
+ qd_router_message_cb_t handler,
+ void *context);
void qd_router_unregister_address(qd_address_t *address);
Modified: qpid/dispatch/trunk/src/router_node.c
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/src/router_node.c?rev=1543912&r1=1543911&r2=1543912&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/router_node.c (original)
+++ qpid/dispatch/trunk/src/router_node.c Wed Nov 20 19:31:04 2013
@@ -502,9 +502,9 @@ static void router_rx_handler(void* cont
// We are performing Message-Routing, therefore we will need to validate the message
// through the Properties section so we can access the TO field.
//
- qd_message_t *in_process_copy = 0;
- qd_router_message_cb handler = 0;
- void *handler_context = 0;
+ qd_message_t *in_process_copy = 0;
+ qd_router_message_cb_t handler = 0;
+ void *handler_context = 0;
valid_message = qd_message_check(msg, QD_DEPTH_PROPERTIES);
@@ -1211,10 +1211,10 @@ const char *qd_router_id(const qd_dispat
}
-qd_address_t *qd_router_register_address(qd_dispatch_t *qd,
- const char *address,
- qd_router_message_cb handler,
- void *context)
+qd_address_t *qd_router_register_address(qd_dispatch_t *qd,
+ const char *address,
+ qd_router_message_cb_t handler,
+ void *context)
{
char addr_string[1000];
qd_router_t *router = qd->router;
Modified: qpid/dispatch/trunk/src/router_private.h
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/src/router_private.h?rev=1543912&r1=1543911&r2=1543912&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/router_private.h (original)
+++ qpid/dispatch/trunk/src/router_private.h Wed Nov 20 19:31:04 2013
@@ -111,7 +111,7 @@ ALLOC_DECLARE(qd_router_conn_t);
struct qd_address_t {
DEQ_LINKS(qd_address_t);
- qd_router_message_cb handler; // In-Process Consumer
+ qd_router_message_cb_t handler; // In-Process Consumer
void *handler_context; // In-Process Consumer context
qd_router_link_ref_list_t rlinks; // Locally-Connected Consumers
qd_router_ref_list_t rnodes; // Remotely-Connected Consumers
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org