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/conversation | |
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/conversation')
-rw-r--r-- | src/conversation/conversation_api.c | 40 | ||||
-rw-r--r-- | src/conversation/conversation_api_call.c | 40 |
2 files changed, 40 insertions, 40 deletions
diff --git a/src/conversation/conversation_api.c b/src/conversation/conversation_api.c index 5dd9cf79e..8a74f0ca6 100644 --- a/src/conversation/conversation_api.c +++ b/src/conversation/conversation_api.c | |||
@@ -551,27 +551,27 @@ clean_up_callers (struct GNUNET_CONVERSATION_Phone *phone) | |||
551 | static void | 551 | static void |
552 | reconnect_phone (struct GNUNET_CONVERSATION_Phone *phone) | 552 | reconnect_phone (struct GNUNET_CONVERSATION_Phone *phone) |
553 | { | 553 | { |
554 | GNUNET_MQ_hd_fixed_size (phone_ring, | ||
555 | GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_RING, | ||
556 | struct ClientPhoneRingMessage); | ||
557 | GNUNET_MQ_hd_fixed_size (phone_hangup, | ||
558 | GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_HANG_UP, | ||
559 | struct ClientPhoneHangupMessage); | ||
560 | GNUNET_MQ_hd_fixed_size (phone_suspend, | ||
561 | GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_SUSPEND, | ||
562 | struct ClientPhoneSuspendMessage); | ||
563 | GNUNET_MQ_hd_fixed_size (phone_resume, | ||
564 | GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_RESUME, | ||
565 | struct ClientPhoneResumeMessage); | ||
566 | GNUNET_MQ_hd_var_size (phone_audio, | ||
567 | GNUNET_MESSAGE_TYPE_CONVERSATION_CS_AUDIO, | ||
568 | struct ClientAudioMessage); | ||
569 | struct GNUNET_MQ_MessageHandler handlers[] = { | 554 | struct GNUNET_MQ_MessageHandler handlers[] = { |
570 | make_phone_ring_handler (phone), | 555 | GNUNET_MQ_hd_fixed_size (phone_ring, |
571 | make_phone_hangup_handler (phone), | 556 | GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_RING, |
572 | make_phone_suspend_handler (phone), | 557 | struct ClientPhoneRingMessage, |
573 | make_phone_resume_handler (phone), | 558 | phone), |
574 | make_phone_audio_handler (phone), | 559 | GNUNET_MQ_hd_fixed_size (phone_hangup, |
560 | GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_HANG_UP, | ||
561 | struct ClientPhoneHangupMessage, | ||
562 | phone), | ||
563 | GNUNET_MQ_hd_fixed_size (phone_suspend, | ||
564 | GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_SUSPEND, | ||
565 | struct ClientPhoneSuspendMessage, | ||
566 | phone), | ||
567 | GNUNET_MQ_hd_fixed_size (phone_resume, | ||
568 | GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_RESUME, | ||
569 | struct ClientPhoneResumeMessage, | ||
570 | phone), | ||
571 | GNUNET_MQ_hd_var_size (phone_audio, | ||
572 | GNUNET_MESSAGE_TYPE_CONVERSATION_CS_AUDIO, | ||
573 | struct ClientAudioMessage, | ||
574 | phone), | ||
575 | GNUNET_MQ_handler_end () | 575 | GNUNET_MQ_handler_end () |
576 | }; | 576 | }; |
577 | struct GNUNET_MQ_Envelope *e; | 577 | struct GNUNET_MQ_Envelope *e; |
diff --git a/src/conversation/conversation_api_call.c b/src/conversation/conversation_api_call.c index af05f3ea6..17e26465e 100644 --- a/src/conversation/conversation_api_call.c +++ b/src/conversation/conversation_api_call.c | |||
@@ -543,29 +543,29 @@ GNUNET_CONVERSATION_call_start (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
543 | GNUNET_CONVERSATION_CallEventHandler event_handler, | 543 | GNUNET_CONVERSATION_CallEventHandler event_handler, |
544 | void *event_handler_cls) | 544 | void *event_handler_cls) |
545 | { | 545 | { |
546 | GNUNET_MQ_hd_fixed_size (call_suspend, | ||
547 | GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_SUSPEND, | ||
548 | struct ClientPhoneSuspendMessage); | ||
549 | GNUNET_MQ_hd_fixed_size (call_resume, | ||
550 | GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_RESUME, | ||
551 | struct ClientPhoneResumeMessage); | ||
552 | GNUNET_MQ_hd_fixed_size (call_picked_up, | ||
553 | GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_PICKED_UP, | ||
554 | struct ClientPhonePickedupMessage); | ||
555 | GNUNET_MQ_hd_fixed_size (call_hangup, | ||
556 | GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_HANG_UP, | ||
557 | struct ClientPhoneHangupMessage); | ||
558 | GNUNET_MQ_hd_var_size (call_audio, | ||
559 | GNUNET_MESSAGE_TYPE_CONVERSATION_CS_AUDIO, | ||
560 | struct ClientAudioMessage); | ||
561 | struct GNUNET_CONVERSATION_Call *call | 546 | struct GNUNET_CONVERSATION_Call *call |
562 | = GNUNET_new (struct GNUNET_CONVERSATION_Call); | 547 | = GNUNET_new (struct GNUNET_CONVERSATION_Call); |
563 | struct GNUNET_MQ_MessageHandler handlers[] = { | 548 | struct GNUNET_MQ_MessageHandler handlers[] = { |
564 | make_call_suspend_handler (call), | 549 | GNUNET_MQ_hd_fixed_size (call_suspend, |
565 | make_call_resume_handler (call), | 550 | GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_SUSPEND, |
566 | make_call_picked_up_handler (call), | 551 | struct ClientPhoneSuspendMessage, |
567 | make_call_hangup_handler (call), | 552 | call), |
568 | make_call_audio_handler (call), | 553 | GNUNET_MQ_hd_fixed_size (call_resume, |
554 | GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_RESUME, | ||
555 | struct ClientPhoneResumeMessage, | ||
556 | call), | ||
557 | GNUNET_MQ_hd_fixed_size (call_picked_up, | ||
558 | GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_PICKED_UP, | ||
559 | struct ClientPhonePickedupMessage, | ||
560 | call), | ||
561 | GNUNET_MQ_hd_fixed_size (call_hangup, | ||
562 | GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_HANG_UP, | ||
563 | struct ClientPhoneHangupMessage, | ||
564 | call), | ||
565 | GNUNET_MQ_hd_var_size (call_audio, | ||
566 | GNUNET_MESSAGE_TYPE_CONVERSATION_CS_AUDIO, | ||
567 | struct ClientAudioMessage, | ||
568 | call), | ||
569 | GNUNET_MQ_handler_end () | 569 | GNUNET_MQ_handler_end () |
570 | }; | 570 | }; |
571 | struct GNUNET_CRYPTO_EcdsaPublicKey my_zone; | 571 | struct GNUNET_CRYPTO_EcdsaPublicKey my_zone; |