Author: rhs
Date: Thu Jun 19 17:21:52 2014
New Revision: 1603949
URL: http://svn.apache.org/r1603949
Log:
removed type specific initializers
Modified:
qpid/proton/trunk/proton-c/src/engine/engine.c
qpid/proton/trunk/proton-c/src/engine/event.c
qpid/proton/trunk/proton-c/src/engine/event.h
qpid/proton/trunk/proton-c/src/transport/transport.c
Modified: qpid/proton/trunk/proton-c/src/engine/engine.c
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/engine/engine.c?rev=1603949&r1=1603948&r2=1603949&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/engine/engine.c (original)
+++ qpid/proton/trunk/proton-c/src/engine/engine.c Thu Jun 19 17:21:52 2014
@@ -66,18 +66,18 @@ static void endpoint_init_event(pn_event
switch (endpoint->type) {
case CONNECTION: {
pn_connection_t *conn = (pn_connection_t *) endpoint;
- pn_event_init_connection(event, conn);
+ pn_event_init(event, conn);
}
break;
case SESSION: {
pn_session_t *ssn = (pn_session_t *) endpoint;
- pn_event_init_session(event, ssn);
+ pn_event_init(event, ssn);
}
break;
case SENDER:
case RECEIVER: {
pn_link_t *link = (pn_link_t*) endpoint;
- pn_event_init_link(event, link);
+ pn_event_init(event, link);
}
break;
}
@@ -596,7 +596,7 @@ void pn_modified(pn_connection_t *connec
if (emit) {
pn_event_t *event = pn_collector_put(connection->collector, PN_TRANSPORT);
if (event) {
- pn_event_init_transport(event, connection->transport);
+ pn_event_init(event, connection->transport);
}
}
}
Modified: qpid/proton/trunk/proton-c/src/engine/event.c
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/engine/event.c?rev=1603949&r1=1603948&r2=1603949&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/engine/event.c (original)
+++ qpid/proton/trunk/proton-c/src/engine/event.c Thu Jun 19 17:21:52 2014
@@ -176,36 +176,11 @@ pn_event_t *pn_event(void)
return event;
}
-void pn_event_init_context(pn_event_t *event, void *object)
+void pn_event_init(pn_event_t *event, void *context)
{
- event->context = object;
- if (event->context)
- pn_incref(event->context);
-}
-
-void pn_event_init_transport(pn_event_t *event, pn_transport_t *transport)
-{
- pn_event_init_context(event, transport);
-}
-
-void pn_event_init_connection(pn_event_t *event, pn_connection_t *connection)
-{
- pn_event_init_context(event, connection);
-}
-
-void pn_event_init_session(pn_event_t *event, pn_session_t *session)
-{
- pn_event_init_context(event, session);
-}
-
-void pn_event_init_link(pn_event_t *event, pn_link_t *link)
-{
- pn_event_init_context(event, link);
-}
-
-void pn_event_init_delivery(pn_event_t *event, pn_delivery_t *delivery)
-{
- pn_event_init_context(event, delivery);
+ event->context = context;
+ if (event->context)
+ pn_incref(event->context);
}
pn_event_type_t pn_event_type(pn_event_t *event)
Modified: qpid/proton/trunk/proton-c/src/engine/event.h
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/engine/event.h?rev=1603949&r1=1603948&r2=1603949&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/engine/event.h (original)
+++ qpid/proton/trunk/proton-c/src/engine/event.h Thu Jun 19 17:21:52 2014
@@ -24,10 +24,6 @@
pn_event_t *pn_collector_put(pn_collector_t *collector, pn_event_type_t type);
-void pn_event_init_transport(pn_event_t *event, pn_transport_t *transport);
-void pn_event_init_connection(pn_event_t *event, pn_connection_t *connection);
-void pn_event_init_session(pn_event_t *event, pn_session_t *session);
-void pn_event_init_link(pn_event_t *event, pn_link_t *link);
-void pn_event_init_delivery(pn_event_t *event, pn_delivery_t *delivery);
+void pn_event_init(pn_event_t *event, void *context);
#endif /* event.h */
Modified: qpid/proton/trunk/proton-c/src/transport/transport.c
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/transport/transport.c?rev=1603949&r1=1603948&r2=1603949&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/transport/transport.c (original)
+++ qpid/proton/trunk/proton-c/src/transport/transport.c Thu Jun 19 17:21:52
2014
@@ -268,7 +268,7 @@ int pn_transport_bind(pn_transport_t *tr
pn_event_t *event = pn_collector_put(connection->collector,
PN_CONNECTION_REMOTE_STATE);
if (event) {
- pn_event_init_connection(event, connection);
+ pn_event_init(event, connection);
}
if (!pn_error_code(transport->error)) {
transport->disp->halt = false;
@@ -458,7 +458,7 @@ int pn_do_open(pn_dispatcher_t *disp)
pn_event_t *event = pn_collector_put(conn->collector,
PN_CONNECTION_REMOTE_STATE);
if (event) {
- pn_event_init_connection(event, conn);
+ pn_event_init(event, conn);
}
} else {
transport->disp->halt = true;
@@ -492,7 +492,7 @@ int pn_do_begin(pn_dispatcher_t *disp)
pn_event_t *event = pn_collector_put(transport->connection->collector,
PN_SESSION_REMOTE_STATE);
if (event) {
- pn_event_init_session(event, ssn);
+ pn_event_init(event, ssn);
}
return 0;
@@ -667,7 +667,7 @@ int pn_do_attach(pn_dispatcher_t *disp)
pn_event_t *event = pn_collector_put(transport->connection->collector,
PN_LINK_REMOTE_STATE);
if (event) {
- pn_event_init_link(event, link);
+ pn_event_init(event, link);
}
return 0;
@@ -752,7 +752,7 @@ int pn_do_transfer(pn_dispatcher_t *disp
pn_event_t *event = pn_collector_put(transport->connection->collector,
PN_DELIVERY);
if (event) {
- pn_event_init_delivery(event, delivery);
+ pn_event_init(event, delivery);
}
return 0;
@@ -806,7 +806,7 @@ int pn_do_flow(pn_dispatcher_t *disp)
pn_event_t *event = pn_collector_put(transport->connection->collector,
PN_LINK_FLOW);
if (event) {
- pn_event_init_link(event, link);
+ pn_event_init(event, link);
}
}
@@ -904,7 +904,7 @@ int pn_do_disposition(pn_dispatcher_t *d
pn_event_t *event = pn_collector_put(transport->connection->collector,
PN_DELIVERY);
if (event) {
- pn_event_init_delivery(event, delivery);
+ pn_event_init(event, delivery);
}
}
}
@@ -938,7 +938,7 @@ int pn_do_detach(pn_dispatcher_t *disp)
pn_event_t *event = pn_collector_put(transport->connection->collector,
PN_LINK_REMOTE_STATE);
if (event) {
- pn_event_init_link(event, link);
+ pn_event_init(event, link);
}
} else {
// TODO: implement
@@ -958,7 +958,7 @@ int pn_do_end(pn_dispatcher_t *disp)
pn_event_t *event = pn_collector_put(transport->connection->collector,
PN_SESSION_REMOTE_STATE);
if (event) {
- pn_event_init_session(event, ssn);
+ pn_event_init(event, ssn);
}
pn_unmap_channel(transport, ssn);
return 0;
@@ -975,7 +975,7 @@ int pn_do_close(pn_dispatcher_t *disp)
pn_event_t *event = pn_collector_put(transport->connection->collector,
PN_CONNECTION_REMOTE_STATE);
if (event) {
- pn_event_init_connection(event, conn);
+ pn_event_init(event, conn);
}
return 0;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
