aboutsummaryrefslogtreecommitdiff
path: root/src/arm
diff options
context:
space:
mode:
authorDavid Barksdale <amatus.amongus@gmail.com>2016-08-18 00:03:29 +0000
committerDavid Barksdale <amatus.amongus@gmail.com>2016-08-18 00:03:29 +0000
commit7f937e3781f36538d9864fa841822eecdaf0bf27 (patch)
tree318eb592dae2bbf59d094f5df140c24a4b6184c9 /src/arm
parent94a717fab18ed25e6bec4b349526212045f6ca70 (diff)
downloadgnunet-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/arm')
-rw-r--r--src/arm/arm_api.c24
-rw-r--r--src/arm/arm_monitor_api.c8
2 files changed, 16 insertions, 16 deletions
diff --git a/src/arm/arm_api.c b/src/arm/arm_api.c
index c8c5e8ba6..5c4a1c794 100644
--- a/src/arm/arm_api.c
+++ b/src/arm/arm_api.c
@@ -453,19 +453,19 @@ mq_error_handler (void *cls,
453static int 453static int
454reconnect_arm (struct GNUNET_ARM_Handle *h) 454reconnect_arm (struct GNUNET_ARM_Handle *h)
455{ 455{
456 GNUNET_MQ_hd_fixed_size (arm_result,
457 GNUNET_MESSAGE_TYPE_ARM_RESULT,
458 struct GNUNET_ARM_ResultMessage);
459 GNUNET_MQ_hd_var_size (arm_list_result,
460 GNUNET_MESSAGE_TYPE_ARM_LIST_RESULT,
461 struct GNUNET_ARM_ListResultMessage);
462 GNUNET_MQ_hd_fixed_size (confirm,
463 GNUNET_MESSAGE_TYPE_TEST,
464 struct GNUNET_MessageHeader);
465 struct GNUNET_MQ_MessageHandler handlers[] = { 456 struct GNUNET_MQ_MessageHandler handlers[] = {
466 make_arm_result_handler (h), 457 GNUNET_MQ_hd_fixed_size (arm_result,
467 make_arm_list_result_handler (h), 458 GNUNET_MESSAGE_TYPE_ARM_RESULT,
468 make_confirm_handler (h), 459 struct GNUNET_ARM_ResultMessage,
460 h),
461 GNUNET_MQ_hd_var_size (arm_list_result,
462 GNUNET_MESSAGE_TYPE_ARM_LIST_RESULT,
463 struct GNUNET_ARM_ListResultMessage,
464 h),
465 GNUNET_MQ_hd_fixed_size (confirm,
466 GNUNET_MESSAGE_TYPE_TEST,
467 struct GNUNET_MessageHeader,
468 h),
469 GNUNET_MQ_handler_end () 469 GNUNET_MQ_handler_end ()
470 }; 470 };
471 struct GNUNET_MessageHeader *test; 471 struct GNUNET_MessageHeader *test;
diff --git a/src/arm/arm_monitor_api.c b/src/arm/arm_monitor_api.c
index 442320fe8..471393c7e 100644
--- a/src/arm/arm_monitor_api.c
+++ b/src/arm/arm_monitor_api.c
@@ -198,11 +198,11 @@ mq_error_handler (void *cls,
198static int 198static int
199reconnect_arm_monitor (struct GNUNET_ARM_MonitorHandle *h) 199reconnect_arm_monitor (struct GNUNET_ARM_MonitorHandle *h)
200{ 200{
201 GNUNET_MQ_hd_var_size (monitor_notify,
202 GNUNET_MESSAGE_TYPE_ARM_STATUS,
203 struct GNUNET_ARM_StatusMessage);
204 struct GNUNET_MQ_MessageHandler handlers[] = { 201 struct GNUNET_MQ_MessageHandler handlers[] = {
205 make_monitor_notify_handler (h), 202 GNUNET_MQ_hd_var_size (monitor_notify,
203 GNUNET_MESSAGE_TYPE_ARM_STATUS,
204 struct GNUNET_ARM_StatusMessage,
205 h),
206 GNUNET_MQ_handler_end () 206 GNUNET_MQ_handler_end ()
207 }; 207 };
208 struct GNUNET_MessageHeader *msg; 208 struct GNUNET_MessageHeader *msg;