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 2018/10/11 17:43:14 UTC
qpid-dispatch git commit: DISPATCH-1142 - Shortened "qdrcm" nae
prefix to "qcm"
Repository: qpid-dispatch
Updated Branches:
refs/heads/master 122648a7e -> 1b8f61b4d
DISPATCH-1142 - Shortened "qdrcm" nae prefix to "qcm"
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/1b8f61b4
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/1b8f61b4
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/1b8f61b4
Branch: refs/heads/master
Commit: 1b8f61b4d76ab19cd46eb48277c69347eaa2797f
Parents: 122648a
Author: Ted Ross <tr...@redhat.com>
Authored: Thu Oct 11 13:42:30 2018 -0400
Committer: Ted Ross <tr...@redhat.com>
Committed: Thu Oct 11 13:42:30 2018 -0400
----------------------------------------------------------------------
.../modules/edge_router/connection_manager.c | 10 +++++-----
.../modules/edge_router/connection_manager.h | 14 +++++++-------
src/router_core/modules/edge_router/module.c | 18 +++++++++---------
3 files changed, 21 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/1b8f61b4/src/router_core/modules/edge_router/connection_manager.c
----------------------------------------------------------------------
diff --git a/src/router_core/modules/edge_router/connection_manager.c b/src/router_core/modules/edge_router/connection_manager.c
index 0f745f4..4fc3d47 100644
--- a/src/router_core/modules/edge_router/connection_manager.c
+++ b/src/router_core/modules/edge_router/connection_manager.c
@@ -38,7 +38,7 @@
// QDRC_EVENT_CONN_EDGE_LOST
//
-struct qdrcm_edge_conn_mgr_t {
+struct qcm_edge_conn_mgr_t {
qdr_core_t *core;
qdrc_event_subscription_t *event_sub;
qdr_connection_t *active_uplink;
@@ -47,7 +47,7 @@ struct qdrcm_edge_conn_mgr_t {
static void on_conn_event(void *context, qdrc_event_t event, qdr_connection_t *conn)
{
- qdrcm_edge_conn_mgr_t *cm = (qdrcm_edge_conn_mgr_t*) context;
+ qcm_edge_conn_mgr_t *cm = (qcm_edge_conn_mgr_t*) context;
switch (event) {
case QDRC_EVENT_CONN_OPENED :
@@ -86,9 +86,9 @@ static void on_conn_event(void *context, qdrc_event_t event, qdr_connection_t *c
}
-qdrcm_edge_conn_mgr_t *qdrcm_edge_conn_mgr(qdr_core_t *core)
+qcm_edge_conn_mgr_t *qcm_edge_conn_mgr(qdr_core_t *core)
{
- qdrcm_edge_conn_mgr_t *cm = NEW(qdrcm_edge_conn_mgr_t);
+ qcm_edge_conn_mgr_t *cm = NEW(qcm_edge_conn_mgr_t);
cm->core = core;
cm->event_sub = qdrc_event_subscribe_CT(core,
@@ -103,7 +103,7 @@ qdrcm_edge_conn_mgr_t *qdrcm_edge_conn_mgr(qdr_core_t *core)
}
-void qdrcm_edge_conn_mgr_final(qdrcm_edge_conn_mgr_t *cm)
+void qcm_edge_conn_mgr_final(qcm_edge_conn_mgr_t *cm)
{
qdrc_event_unsubscribe_CT(cm->core, cm->event_sub);
free(cm);
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/1b8f61b4/src/router_core/modules/edge_router/connection_manager.h
----------------------------------------------------------------------
diff --git a/src/router_core/modules/edge_router/connection_manager.h b/src/router_core/modules/edge_router/connection_manager.h
index 3e7b5b8..07febe4 100644
--- a/src/router_core/modules/edge_router/connection_manager.h
+++ b/src/router_core/modules/edge_router/connection_manager.h
@@ -17,19 +17,19 @@
* under the License.
*/
-#ifndef qdrcm_edge_router_conn_mgr_types
-#define qdrcm_edge_router_conn_mgr_types 1
+#ifndef qcm_edge_router_conn_mgr_types
+#define qcm_edge_router_conn_mgr_types 1
-typedef struct qdrcm_edge_conn_mgr_t qdrcm_edge_conn_mgr_t;
+typedef struct qcm_edge_conn_mgr_t qcm_edge_conn_mgr_t;
#include "router_core_private.h"
#endif
-#ifndef qdrcm_edge_router_conn_mgr
-#define qdrcm_edge_router_conn_mgr 1
+#ifndef qcm_edge_router_conn_mgr
+#define qcm_edge_router_conn_mgr 1
-qdrcm_edge_conn_mgr_t *qdrcm_edge_conn_mgr(qdr_core_t *core);
-void qdrcm_edge_conn_mgr_final(qdrcm_edge_conn_mgr_t *cm);
+qcm_edge_conn_mgr_t *qcm_edge_conn_mgr(qdr_core_t *core);
+void qcm_edge_conn_mgr_final(qcm_edge_conn_mgr_t *cm);
#endif
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/1b8f61b4/src/router_core/modules/edge_router/module.c
----------------------------------------------------------------------
diff --git a/src/router_core/modules/edge_router/module.c b/src/router_core/modules/edge_router/module.c
index 00dc674..8e14307 100644
--- a/src/router_core/modules/edge_router/module.c
+++ b/src/router_core/modules/edge_router/module.c
@@ -21,16 +21,16 @@
#include "connection_manager.h"
typedef struct {
- qdrcm_edge_conn_mgr_t *conn_mgr;
+ qcm_edge_conn_mgr_t *conn_mgr;
// TODO - Add pointers to other edge-router state here
-} qdrcm_edge_t;
+} qcm_edge_t;
-static void qdrcm_edge_router_init_CT(qdr_core_t *core, void **module_context)
+static void qcm_edge_router_init_CT(qdr_core_t *core, void **module_context)
{
if (core->router_mode == QD_ROUTER_MODE_EDGE) {
- qdrcm_edge_t *edge = NEW(qdrcm_edge_t);
- edge->conn_mgr = qdrcm_edge_conn_mgr(core);
+ qcm_edge_t *edge = NEW(qcm_edge_t);
+ edge->conn_mgr = qcm_edge_conn_mgr(core);
// TODO - Add initialization of other edge-router functions here
*module_context = edge;
} else
@@ -38,16 +38,16 @@ static void qdrcm_edge_router_init_CT(qdr_core_t *core, void **module_context)
}
-static void qdrcm_edge_router_final_CT(void *module_context)
+static void qcm_edge_router_final_CT(void *module_context)
{
- qdrcm_edge_t *edge = (qdrcm_edge_t*) module_context;
+ qcm_edge_t *edge = (qcm_edge_t*) module_context;
if (edge) {
- qdrcm_edge_conn_mgr_final(edge->conn_mgr);
+ qcm_edge_conn_mgr_final(edge->conn_mgr);
// TODO - Add finalization of other edge-router functions here
free(edge);
}
}
-QDR_CORE_MODULE_DECLARE("edge_router", qdrcm_edge_router_init_CT, qdrcm_edge_router_final_CT)
+QDR_CORE_MODULE_DECLARE("edge_router", qcm_edge_router_init_CT, qcm_edge_router_final_CT)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org