diff options
author | David Barksdale <amatus.amongus@gmail.com> | 2016-08-18 00:03:29 +0000 |
---|---|---|
committer | David Barksdale <amatus.amongus@gmail.com> | 2016-08-18 00:03:29 +0000 |
commit | 7f937e3781f36538d9864fa841822eecdaf0bf27 (patch) | |
tree | 318eb592dae2bbf59d094f5df140c24a4b6184c9 /src/testbed | |
parent | 94a717fab18ed25e6bec4b349526212045f6ca70 (diff) | |
download | gnunet-7f937e3781f36538d9864fa841822eecdaf0bf27.tar.gz gnunet-7f937e3781f36538d9864fa841822eecdaf0bf27.zip |
Use statement exprs instead of local function
This change lets us compile with clang again.
Diffstat (limited to 'src/testbed')
-rw-r--r-- | src/testbed/testbed_api.c | 80 | ||||
-rw-r--r-- | src/testbed/testbed_api_barriers.c | 8 |
2 files changed, 44 insertions, 44 deletions
diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c index 895800514..53f70a1c0 100644 --- a/src/testbed/testbed_api.c +++ b/src/testbed/testbed_api.c | |||
@@ -1549,49 +1549,49 @@ GNUNET_TESTBED_controller_connect (struct GNUNET_TESTBED_Host *host, | |||
1549 | GNUNET_TESTBED_ControllerCallback cc, | 1549 | GNUNET_TESTBED_ControllerCallback cc, |
1550 | void *cc_cls) | 1550 | void *cc_cls) |
1551 | { | 1551 | { |
1552 | GNUNET_MQ_hd_var_size (add_host_confirm, | ||
1553 | GNUNET_MESSAGE_TYPE_TESTBED_ADD_HOST_SUCCESS, | ||
1554 | struct GNUNET_TESTBED_HostConfirmedMessage); | ||
1555 | GNUNET_MQ_hd_fixed_size (peer_conevent, | ||
1556 | GNUNET_MESSAGE_TYPE_TESTBED_PEER_CONNECT_EVENT, | ||
1557 | struct GNUNET_TESTBED_ConnectionEventMessage); | ||
1558 | GNUNET_MQ_hd_fixed_size (opsuccess, | ||
1559 | GNUNET_MESSAGE_TYPE_TESTBED_GENERIC_OPERATION_SUCCESS, | ||
1560 | struct GNUNET_TESTBED_GenericOperationSuccessEventMessage); | ||
1561 | GNUNET_MQ_hd_var_size (op_fail_event, | ||
1562 | GNUNET_MESSAGE_TYPE_TESTBED_OPERATION_FAIL_EVENT, | ||
1563 | struct GNUNET_TESTBED_OperationFailureEventMessage); | ||
1564 | GNUNET_MQ_hd_fixed_size (peer_create_success, | ||
1565 | GNUNET_MESSAGE_TYPE_TESTBED_CREATE_PEER_SUCCESS, | ||
1566 | struct GNUNET_TESTBED_PeerCreateSuccessEventMessage); | ||
1567 | GNUNET_MQ_hd_fixed_size (peer_event, | ||
1568 | GNUNET_MESSAGE_TYPE_TESTBED_PEER_EVENT, | ||
1569 | struct GNUNET_TESTBED_PeerEventMessage); | ||
1570 | GNUNET_MQ_hd_var_size (peer_config, | ||
1571 | GNUNET_MESSAGE_TYPE_TESTBED_PEER_INFORMATION, | ||
1572 | struct GNUNET_TESTBED_PeerConfigurationInformationMessage); | ||
1573 | GNUNET_MQ_hd_var_size (slave_config, | ||
1574 | GNUNET_MESSAGE_TYPE_TESTBED_SLAVE_CONFIGURATION, | ||
1575 | struct GNUNET_TESTBED_SlaveConfiguration); | ||
1576 | GNUNET_MQ_hd_var_size (link_controllers_result, | ||
1577 | GNUNET_MESSAGE_TYPE_TESTBED_LINK_CONTROLLERS_RESULT, | ||
1578 | struct GNUNET_TESTBED_ControllerLinkResponse); | ||
1579 | GNUNET_MQ_hd_var_size (barrier_status, | ||
1580 | GNUNET_MESSAGE_TYPE_TESTBED_BARRIER_STATUS, | ||
1581 | const struct GNUNET_TESTBED_BarrierStatusMsg); | ||
1582 | struct GNUNET_TESTBED_Controller *controller | 1552 | struct GNUNET_TESTBED_Controller *controller |
1583 | = GNUNET_new (struct GNUNET_TESTBED_Controller); | 1553 | = GNUNET_new (struct GNUNET_TESTBED_Controller); |
1584 | struct GNUNET_MQ_MessageHandler handlers[] = { | 1554 | struct GNUNET_MQ_MessageHandler handlers[] = { |
1585 | make_add_host_confirm_handler (controller), | 1555 | GNUNET_MQ_hd_var_size (add_host_confirm, |
1586 | make_peer_conevent_handler (controller), | 1556 | GNUNET_MESSAGE_TYPE_TESTBED_ADD_HOST_SUCCESS, |
1587 | make_opsuccess_handler (controller), | 1557 | struct GNUNET_TESTBED_HostConfirmedMessage, |
1588 | make_op_fail_event_handler (controller), | 1558 | controller), |
1589 | make_peer_create_success_handler (controller), | 1559 | GNUNET_MQ_hd_fixed_size (peer_conevent, |
1590 | make_peer_event_handler (controller), | 1560 | GNUNET_MESSAGE_TYPE_TESTBED_PEER_CONNECT_EVENT, |
1591 | make_peer_config_handler (controller), | 1561 | struct GNUNET_TESTBED_ConnectionEventMessage, |
1592 | make_slave_config_handler (controller), | 1562 | controller), |
1593 | make_link_controllers_result_handler (controller), | 1563 | GNUNET_MQ_hd_fixed_size (opsuccess, |
1594 | make_barrier_status_handler (controller), | 1564 | GNUNET_MESSAGE_TYPE_TESTBED_GENERIC_OPERATION_SUCCESS, |
1565 | struct GNUNET_TESTBED_GenericOperationSuccessEventMessage, | ||
1566 | controller), | ||
1567 | GNUNET_MQ_hd_var_size (op_fail_event, | ||
1568 | GNUNET_MESSAGE_TYPE_TESTBED_OPERATION_FAIL_EVENT, | ||
1569 | struct GNUNET_TESTBED_OperationFailureEventMessage, | ||
1570 | controller), | ||
1571 | GNUNET_MQ_hd_fixed_size (peer_create_success, | ||
1572 | GNUNET_MESSAGE_TYPE_TESTBED_CREATE_PEER_SUCCESS, | ||
1573 | struct GNUNET_TESTBED_PeerCreateSuccessEventMessage, | ||
1574 | controller), | ||
1575 | GNUNET_MQ_hd_fixed_size (peer_event, | ||
1576 | GNUNET_MESSAGE_TYPE_TESTBED_PEER_EVENT, | ||
1577 | struct GNUNET_TESTBED_PeerEventMessage, | ||
1578 | controller), | ||
1579 | GNUNET_MQ_hd_var_size (peer_config, | ||
1580 | GNUNET_MESSAGE_TYPE_TESTBED_PEER_INFORMATION, | ||
1581 | struct GNUNET_TESTBED_PeerConfigurationInformationMessage, | ||
1582 | controller), | ||
1583 | GNUNET_MQ_hd_var_size (slave_config, | ||
1584 | GNUNET_MESSAGE_TYPE_TESTBED_SLAVE_CONFIGURATION, | ||
1585 | struct GNUNET_TESTBED_SlaveConfiguration, | ||
1586 | controller), | ||
1587 | GNUNET_MQ_hd_var_size (link_controllers_result, | ||
1588 | GNUNET_MESSAGE_TYPE_TESTBED_LINK_CONTROLLERS_RESULT, | ||
1589 | struct GNUNET_TESTBED_ControllerLinkResponse, | ||
1590 | controller), | ||
1591 | GNUNET_MQ_hd_var_size (barrier_status, | ||
1592 | GNUNET_MESSAGE_TYPE_TESTBED_BARRIER_STATUS, | ||
1593 | const struct GNUNET_TESTBED_BarrierStatusMsg, | ||
1594 | controller), | ||
1595 | GNUNET_MQ_handler_end () | 1595 | GNUNET_MQ_handler_end () |
1596 | }; | 1596 | }; |
1597 | struct GNUNET_TESTBED_InitMessage *msg; | 1597 | struct GNUNET_TESTBED_InitMessage *msg; |
diff --git a/src/testbed/testbed_api_barriers.c b/src/testbed/testbed_api_barriers.c index ee75e515c..3761fbbdf 100644 --- a/src/testbed/testbed_api_barriers.c +++ b/src/testbed/testbed_api_barriers.c | |||
@@ -171,13 +171,13 @@ GNUNET_TESTBED_barrier_wait (const char *name, | |||
171 | GNUNET_TESTBED_barrier_wait_cb cb, | 171 | GNUNET_TESTBED_barrier_wait_cb cb, |
172 | void *cb_cls) | 172 | void *cb_cls) |
173 | { | 173 | { |
174 | GNUNET_MQ_hd_var_size (status, | ||
175 | GNUNET_MESSAGE_TYPE_TESTBED_BARRIER_STATUS, | ||
176 | struct GNUNET_TESTBED_BarrierStatusMsg); | ||
177 | struct GNUNET_TESTBED_BarrierWaitHandle *h | 174 | struct GNUNET_TESTBED_BarrierWaitHandle *h |
178 | = GNUNET_new (struct GNUNET_TESTBED_BarrierWaitHandle); | 175 | = GNUNET_new (struct GNUNET_TESTBED_BarrierWaitHandle); |
179 | struct GNUNET_MQ_MessageHandler handlers[] = { | 176 | struct GNUNET_MQ_MessageHandler handlers[] = { |
180 | make_status_handler (h), | 177 | GNUNET_MQ_hd_var_size (status, |
178 | GNUNET_MESSAGE_TYPE_TESTBED_BARRIER_STATUS, | ||
179 | struct GNUNET_TESTBED_BarrierStatusMsg, | ||
180 | h), | ||
181 | GNUNET_MQ_handler_end () | 181 | GNUNET_MQ_handler_end () |
182 | }; | 182 | }; |
183 | struct GNUNET_MQ_Envelope *env; | 183 | struct GNUNET_MQ_Envelope *env; |