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/core | |
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/core')
-rw-r--r-- | src/core/core_api.c | 50 | ||||
-rw-r--r-- | src/core/core_api_2.c | 40 | ||||
-rw-r--r-- | src/core/core_api_monitor_peers.c | 8 | ||||
-rw-r--r-- | src/core/gnunet-service-core_kx.c | 32 | ||||
-rw-r--r-- | src/core/test_core_api.c | 16 | ||||
-rw-r--r-- | src/core/test_core_api_reliability.c | 16 | ||||
-rw-r--r-- | src/core/test_core_api_send_to_self.c | 8 | ||||
-rw-r--r-- | src/core/test_core_quota_compliance.c | 16 |
8 files changed, 93 insertions, 93 deletions
diff --git a/src/core/core_api.c b/src/core/core_api.c index caf614afc..6055b99c1 100644 --- a/src/core/core_api.c +++ b/src/core/core_api.c | |||
@@ -767,31 +767,31 @@ handle_send_ready (void *cls, | |||
767 | static void | 767 | static void |
768 | reconnect (struct GNUNET_CORE_Handle *h) | 768 | reconnect (struct GNUNET_CORE_Handle *h) |
769 | { | 769 | { |
770 | GNUNET_MQ_hd_fixed_size (init_reply, | 770 | struct GNUNET_MQ_MessageHandler handlers[] = { |
771 | GNUNET_MESSAGE_TYPE_CORE_INIT_REPLY, | 771 | GNUNET_MQ_hd_fixed_size (init_reply, |
772 | struct InitReplyMessage); | 772 | GNUNET_MESSAGE_TYPE_CORE_INIT_REPLY, |
773 | GNUNET_MQ_hd_fixed_size (connect_notify, | 773 | struct InitReplyMessage, |
774 | GNUNET_MESSAGE_TYPE_CORE_NOTIFY_CONNECT, | 774 | h), |
775 | struct ConnectNotifyMessage); | 775 | GNUNET_MQ_hd_fixed_size (connect_notify, |
776 | GNUNET_MQ_hd_fixed_size (disconnect_notify, | 776 | GNUNET_MESSAGE_TYPE_CORE_NOTIFY_CONNECT, |
777 | GNUNET_MESSAGE_TYPE_CORE_NOTIFY_DISCONNECT, | 777 | struct ConnectNotifyMessage, |
778 | struct DisconnectNotifyMessage); | 778 | h), |
779 | GNUNET_MQ_hd_var_size (notify_inbound, | 779 | GNUNET_MQ_hd_fixed_size (disconnect_notify, |
780 | GNUNET_MESSAGE_TYPE_CORE_NOTIFY_INBOUND, | 780 | GNUNET_MESSAGE_TYPE_CORE_NOTIFY_DISCONNECT, |
781 | struct NotifyTrafficMessage); | 781 | struct DisconnectNotifyMessage, |
782 | GNUNET_MQ_hd_var_size (notify_outbound, | 782 | h), |
783 | GNUNET_MESSAGE_TYPE_CORE_NOTIFY_OUTBOUND, | 783 | GNUNET_MQ_hd_var_size (notify_inbound, |
784 | struct NotifyTrafficMessage); | 784 | GNUNET_MESSAGE_TYPE_CORE_NOTIFY_INBOUND, |
785 | GNUNET_MQ_hd_fixed_size (send_ready, | 785 | struct NotifyTrafficMessage, |
786 | GNUNET_MESSAGE_TYPE_CORE_SEND_READY, | 786 | h), |
787 | struct SendMessageReady); | 787 | GNUNET_MQ_hd_var_size (notify_outbound, |
788 | struct GNUNET_MQ_MessageHandler handlers[] = { | 788 | GNUNET_MESSAGE_TYPE_CORE_NOTIFY_OUTBOUND, |
789 | make_init_reply_handler (h), | 789 | struct NotifyTrafficMessage, |
790 | make_connect_notify_handler (h), | 790 | h), |
791 | make_disconnect_notify_handler (h), | 791 | GNUNET_MQ_hd_fixed_size (send_ready, |
792 | make_notify_inbound_handler (h), | 792 | GNUNET_MESSAGE_TYPE_CORE_SEND_READY, |
793 | make_notify_outbound_handler (h), | 793 | struct SendMessageReady, |
794 | make_send_ready_handler (h), | 794 | h), |
795 | GNUNET_MQ_handler_end () | 795 | GNUNET_MQ_handler_end () |
796 | }; | 796 | }; |
797 | struct InitMessage *init; | 797 | struct InitMessage *init; |
diff --git a/src/core/core_api_2.c b/src/core/core_api_2.c index 536fe597c..d810bf2ec 100644 --- a/src/core/core_api_2.c +++ b/src/core/core_api_2.c | |||
@@ -700,27 +700,27 @@ handle_send_ready (void *cls, | |||
700 | static void | 700 | static void |
701 | reconnect (struct GNUNET_CORE_Handle *h) | 701 | reconnect (struct GNUNET_CORE_Handle *h) |
702 | { | 702 | { |
703 | GNUNET_MQ_hd_fixed_size (init_reply, | ||
704 | GNUNET_MESSAGE_TYPE_CORE_INIT_REPLY, | ||
705 | struct InitReplyMessage); | ||
706 | GNUNET_MQ_hd_fixed_size (connect_notify, | ||
707 | GNUNET_MESSAGE_TYPE_CORE_NOTIFY_CONNECT, | ||
708 | struct ConnectNotifyMessage); | ||
709 | GNUNET_MQ_hd_fixed_size (disconnect_notify, | ||
710 | GNUNET_MESSAGE_TYPE_CORE_NOTIFY_DISCONNECT, | ||
711 | struct DisconnectNotifyMessage); | ||
712 | GNUNET_MQ_hd_var_size (notify_inbound, | ||
713 | GNUNET_MESSAGE_TYPE_CORE_NOTIFY_INBOUND, | ||
714 | struct NotifyTrafficMessage); | ||
715 | GNUNET_MQ_hd_fixed_size (send_ready, | ||
716 | GNUNET_MESSAGE_TYPE_CORE_SEND_READY, | ||
717 | struct SendMessageReady); | ||
718 | struct GNUNET_MQ_MessageHandler handlers[] = { | 703 | struct GNUNET_MQ_MessageHandler handlers[] = { |
719 | make_init_reply_handler (h), | 704 | GNUNET_MQ_hd_fixed_size (init_reply, |
720 | make_connect_notify_handler (h), | 705 | GNUNET_MESSAGE_TYPE_CORE_INIT_REPLY, |
721 | make_disconnect_notify_handler (h), | 706 | struct InitReplyMessage, |
722 | make_notify_inbound_handler (h), | 707 | h), |
723 | make_send_ready_handler (h), | 708 | GNUNET_MQ_hd_fixed_size (connect_notify, |
709 | GNUNET_MESSAGE_TYPE_CORE_NOTIFY_CONNECT, | ||
710 | struct ConnectNotifyMessage, | ||
711 | h), | ||
712 | GNUNET_MQ_hd_fixed_size (disconnect_notify, | ||
713 | GNUNET_MESSAGE_TYPE_CORE_NOTIFY_DISCONNECT, | ||
714 | struct DisconnectNotifyMessage, | ||
715 | h), | ||
716 | GNUNET_MQ_hd_var_size (notify_inbound, | ||
717 | GNUNET_MESSAGE_TYPE_CORE_NOTIFY_INBOUND, | ||
718 | struct NotifyTrafficMessage, | ||
719 | h), | ||
720 | GNUNET_MQ_hd_fixed_size (send_ready, | ||
721 | GNUNET_MESSAGE_TYPE_CORE_SEND_READY, | ||
722 | struct SendMessageReady, | ||
723 | h), | ||
724 | GNUNET_MQ_handler_end () | 724 | GNUNET_MQ_handler_end () |
725 | }; | 725 | }; |
726 | struct InitMessage *init; | 726 | struct InitMessage *init; |
diff --git a/src/core/core_api_monitor_peers.c b/src/core/core_api_monitor_peers.c index bafcd3e94..1455eb2b0 100644 --- a/src/core/core_api_monitor_peers.c +++ b/src/core/core_api_monitor_peers.c | |||
@@ -114,11 +114,11 @@ handle_receive_info (void *cls, | |||
114 | static void | 114 | static void |
115 | reconnect (struct GNUNET_CORE_MonitorHandle *mh) | 115 | reconnect (struct GNUNET_CORE_MonitorHandle *mh) |
116 | { | 116 | { |
117 | GNUNET_MQ_hd_fixed_size (receive_info, | ||
118 | GNUNET_MESSAGE_TYPE_CORE_MONITOR_NOTIFY, | ||
119 | struct MonitorNotifyMessage); | ||
120 | struct GNUNET_MQ_MessageHandler handlers[] = { | 117 | struct GNUNET_MQ_MessageHandler handlers[] = { |
121 | make_receive_info_handler (mh), | 118 | GNUNET_MQ_hd_fixed_size (receive_info, |
119 | GNUNET_MESSAGE_TYPE_CORE_MONITOR_NOTIFY, | ||
120 | struct MonitorNotifyMessage, | ||
121 | mh), | ||
122 | GNUNET_MQ_handler_end () | 122 | GNUNET_MQ_handler_end () |
123 | }; | 123 | }; |
124 | struct GNUNET_MQ_Envelope *env; | 124 | struct GNUNET_MQ_Envelope *env; |
diff --git a/src/core/gnunet-service-core_kx.c b/src/core/gnunet-service-core_kx.c index b2949a688..6f6786d89 100644 --- a/src/core/gnunet-service-core_kx.c +++ b/src/core/gnunet-service-core_kx.c | |||
@@ -1814,23 +1814,23 @@ int | |||
1814 | GSC_KX_init (struct GNUNET_CRYPTO_EddsaPrivateKey *pk, | 1814 | GSC_KX_init (struct GNUNET_CRYPTO_EddsaPrivateKey *pk, |
1815 | struct GNUNET_SERVER_Handle *server) | 1815 | struct GNUNET_SERVER_Handle *server) |
1816 | { | 1816 | { |
1817 | GNUNET_MQ_hd_fixed_size (ephemeral_key, | ||
1818 | GNUNET_MESSAGE_TYPE_CORE_EPHEMERAL_KEY, | ||
1819 | struct EphemeralKeyMessage); | ||
1820 | GNUNET_MQ_hd_fixed_size (ping, | ||
1821 | GNUNET_MESSAGE_TYPE_CORE_PING, | ||
1822 | struct PingMessage); | ||
1823 | GNUNET_MQ_hd_fixed_size (pong, | ||
1824 | GNUNET_MESSAGE_TYPE_CORE_PONG, | ||
1825 | struct PongMessage); | ||
1826 | GNUNET_MQ_hd_var_size (encrypted, | ||
1827 | GNUNET_MESSAGE_TYPE_CORE_ENCRYPTED_MESSAGE, | ||
1828 | struct EncryptedMessage); | ||
1829 | struct GNUNET_MQ_MessageHandler handlers[] = { | 1817 | struct GNUNET_MQ_MessageHandler handlers[] = { |
1830 | make_ephemeral_key_handler (NULL), | 1818 | GNUNET_MQ_hd_fixed_size (ephemeral_key, |
1831 | make_ping_handler (NULL), | 1819 | GNUNET_MESSAGE_TYPE_CORE_EPHEMERAL_KEY, |
1832 | make_pong_handler (NULL), | 1820 | struct EphemeralKeyMessage, |
1833 | make_encrypted_handler (NULL), | 1821 | NULL), |
1822 | GNUNET_MQ_hd_fixed_size (ping, | ||
1823 | GNUNET_MESSAGE_TYPE_CORE_PING, | ||
1824 | struct PingMessage, | ||
1825 | NULL), | ||
1826 | GNUNET_MQ_hd_fixed_size (pong, | ||
1827 | GNUNET_MESSAGE_TYPE_CORE_PONG, | ||
1828 | struct PongMessage, | ||
1829 | NULL), | ||
1830 | GNUNET_MQ_hd_var_size (encrypted, | ||
1831 | GNUNET_MESSAGE_TYPE_CORE_ENCRYPTED_MESSAGE, | ||
1832 | struct EncryptedMessage, | ||
1833 | NULL), | ||
1834 | GNUNET_MQ_handler_end() | 1834 | GNUNET_MQ_handler_end() |
1835 | }; | 1835 | }; |
1836 | 1836 | ||
diff --git a/src/core/test_core_api.c b/src/core/test_core_api.c index 772ded991..650c89cda 100644 --- a/src/core/test_core_api.c +++ b/src/core/test_core_api.c | |||
@@ -225,12 +225,12 @@ static void | |||
225 | init_notify (void *cls, | 225 | init_notify (void *cls, |
226 | const struct GNUNET_PeerIdentity *my_identity) | 226 | const struct GNUNET_PeerIdentity *my_identity) |
227 | { | 227 | { |
228 | GNUNET_MQ_hd_fixed_size (test, | ||
229 | MTYPE, | ||
230 | struct GNUNET_MessageHeader); | ||
231 | struct PeerContext *p = cls; | 228 | struct PeerContext *p = cls; |
232 | struct GNUNET_MQ_MessageHandler handlers[] = { | 229 | struct GNUNET_MQ_MessageHandler handlers[] = { |
233 | make_test_handler (NULL), | 230 | GNUNET_MQ_hd_fixed_size (test, |
231 | MTYPE, | ||
232 | struct GNUNET_MessageHeader, | ||
233 | NULL); | ||
234 | GNUNET_MQ_handler_end () | 234 | GNUNET_MQ_handler_end () |
235 | }; | 235 | }; |
236 | 236 | ||
@@ -298,11 +298,11 @@ run (void *cls, | |||
298 | const char *cfgfile, | 298 | const char *cfgfile, |
299 | const struct GNUNET_CONFIGURATION_Handle *cfg) | 299 | const struct GNUNET_CONFIGURATION_Handle *cfg) |
300 | { | 300 | { |
301 | GNUNET_MQ_hd_fixed_size (test, | ||
302 | MTYPE, | ||
303 | struct GNUNET_MessageHeader); | ||
304 | struct GNUNET_MQ_MessageHandler handlers[] = { | 301 | struct GNUNET_MQ_MessageHandler handlers[] = { |
305 | make_test_handler (NULL), | 302 | GNUNET_MQ_hd_fixed_size (test, |
303 | MTYPE, | ||
304 | struct GNUNET_MessageHeader, | ||
305 | NULL); | ||
306 | GNUNET_MQ_handler_end () | 306 | GNUNET_MQ_handler_end () |
307 | }; | 307 | }; |
308 | 308 | ||
diff --git a/src/core/test_core_api_reliability.c b/src/core/test_core_api_reliability.c index d7d4a6bd6..4d8d54028 100644 --- a/src/core/test_core_api_reliability.c +++ b/src/core/test_core_api_reliability.c | |||
@@ -322,12 +322,12 @@ static void | |||
322 | init_notify (void *cls, | 322 | init_notify (void *cls, |
323 | const struct GNUNET_PeerIdentity *my_identity) | 323 | const struct GNUNET_PeerIdentity *my_identity) |
324 | { | 324 | { |
325 | GNUNET_MQ_hd_var_size (test, | ||
326 | MTYPE, | ||
327 | struct TestMessage); | ||
328 | struct PeerContext *p = cls; | 325 | struct PeerContext *p = cls; |
329 | struct GNUNET_MQ_MessageHandler handlers[] = { | 326 | struct GNUNET_MQ_MessageHandler handlers[] = { |
330 | make_test_handler (NULL), | 327 | GNUNET_MQ_hd_var_size (test, |
328 | MTYPE, | ||
329 | struct TestMessage, | ||
330 | NULL); | ||
331 | GNUNET_MQ_handler_end () | 331 | GNUNET_MQ_handler_end () |
332 | }; | 332 | }; |
333 | 333 | ||
@@ -442,11 +442,11 @@ run (void *cls, | |||
442 | const char *cfgfile, | 442 | const char *cfgfile, |
443 | const struct GNUNET_CONFIGURATION_Handle *cfg) | 443 | const struct GNUNET_CONFIGURATION_Handle *cfg) |
444 | { | 444 | { |
445 | GNUNET_MQ_hd_fixed_size (test, | ||
446 | MTYPE, | ||
447 | struct TestMessage); | ||
448 | struct GNUNET_MQ_MessageHandler handlers[] = { | 445 | struct GNUNET_MQ_MessageHandler handlers[] = { |
449 | make_test_handler (NULL), | 446 | GNUNET_MQ_hd_fixed_size (test, |
447 | MTYPE, | ||
448 | struct TestMessage, | ||
449 | NULL); | ||
450 | GNUNET_MQ_handler_end () | 450 | GNUNET_MQ_handler_end () |
451 | }; | 451 | }; |
452 | 452 | ||
diff --git a/src/core/test_core_api_send_to_self.c b/src/core/test_core_api_send_to_self.c index 111aea900..d29da651b 100644 --- a/src/core/test_core_api_send_to_self.c +++ b/src/core/test_core_api_send_to_self.c | |||
@@ -150,11 +150,11 @@ run (void *cls, | |||
150 | const struct GNUNET_CONFIGURATION_Handle *cfg, | 150 | const struct GNUNET_CONFIGURATION_Handle *cfg, |
151 | struct GNUNET_TESTING_Peer *peer) | 151 | struct GNUNET_TESTING_Peer *peer) |
152 | { | 152 | { |
153 | GNUNET_MQ_hd_fixed_size (test, | ||
154 | GNUNET_MESSAGE_TYPE_DUMMY, | ||
155 | struct GNUNET_MessageHeader); | ||
156 | struct GNUNET_MQ_MessageHandler handlers[] = { | 153 | struct GNUNET_MQ_MessageHandler handlers[] = { |
157 | make_test_handler (NULL), | 154 | GNUNET_MQ_hd_fixed_size (test, |
155 | GNUNET_MESSAGE_TYPE_DUMMY, | ||
156 | struct GNUNET_MessageHeader, | ||
157 | NULL), | ||
158 | GNUNET_MQ_handler_end () | 158 | GNUNET_MQ_handler_end () |
159 | }; | 159 | }; |
160 | 160 | ||
diff --git a/src/core/test_core_quota_compliance.c b/src/core/test_core_quota_compliance.c index 31063b814..4dee958f2 100644 --- a/src/core/test_core_quota_compliance.c +++ b/src/core/test_core_quota_compliance.c | |||
@@ -461,12 +461,12 @@ static void | |||
461 | init_notify (void *cls, | 461 | init_notify (void *cls, |
462 | const struct GNUNET_PeerIdentity *my_identity) | 462 | const struct GNUNET_PeerIdentity *my_identity) |
463 | { | 463 | { |
464 | GNUNET_MQ_hd_fixed_size (test, | ||
465 | MTYPE, | ||
466 | struct TestMessage); | ||
467 | struct PeerContext *p = cls; | 464 | struct PeerContext *p = cls; |
468 | struct GNUNET_MQ_MessageHandler handlers[] = { | 465 | struct GNUNET_MQ_MessageHandler handlers[] = { |
469 | make_test_handler (NULL), | 466 | GNUNET_MQ_hd_fixed_size (test, |
467 | MTYPE, | ||
468 | struct TestMessage, | ||
469 | NULL), | ||
470 | GNUNET_MQ_handler_end () | 470 | GNUNET_MQ_handler_end () |
471 | }; | 471 | }; |
472 | 472 | ||
@@ -593,11 +593,11 @@ run (void *cls, | |||
593 | const char *cfgfile, | 593 | const char *cfgfile, |
594 | const struct GNUNET_CONFIGURATION_Handle *cfg) | 594 | const struct GNUNET_CONFIGURATION_Handle *cfg) |
595 | { | 595 | { |
596 | GNUNET_MQ_hd_fixed_size (test, | ||
597 | MTYPE, | ||
598 | struct TestMessage); | ||
599 | struct GNUNET_MQ_MessageHandler handlers[] = { | 596 | struct GNUNET_MQ_MessageHandler handlers[] = { |
600 | make_test_handler (NULL), | 597 | GNUNET_MQ_hd_fixed_size (test, |
598 | MTYPE, | ||
599 | struct TestMessage, | ||
600 | NULL), | ||
601 | GNUNET_MQ_handler_end () | 601 | GNUNET_MQ_handler_end () |
602 | }; | 602 | }; |
603 | 603 | ||