aboutsummaryrefslogtreecommitdiff
path: root/src/dht
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/dht
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/dht')
-rw-r--r--src/dht/dht_api.c40
-rw-r--r--src/dht/gnunet-service-dht_neighbours.c24
-rw-r--r--src/dht/gnunet-service-wdht_neighbours.c32
-rw-r--r--src/dht/gnunet-service-xdht_neighbours.c96
4 files changed, 96 insertions, 96 deletions
diff --git a/src/dht/dht_api.c b/src/dht/dht_api.c
index 0ada41662..57880165e 100644
--- a/src/dht/dht_api.c
+++ b/src/dht/dht_api.c
@@ -842,27 +842,27 @@ handle_put_confirmation (void *cls,
842static int 842static int
843try_connect (struct GNUNET_DHT_Handle *h) 843try_connect (struct GNUNET_DHT_Handle *h)
844{ 844{
845 GNUNET_MQ_hd_var_size (monitor_get,
846 GNUNET_MESSAGE_TYPE_DHT_MONITOR_GET,
847 struct GNUNET_DHT_MonitorGetMessage);
848 GNUNET_MQ_hd_var_size (monitor_get_resp,
849 GNUNET_MESSAGE_TYPE_DHT_MONITOR_GET_RESP,
850 struct GNUNET_DHT_MonitorGetRespMessage);
851 GNUNET_MQ_hd_var_size (monitor_put,
852 GNUNET_MESSAGE_TYPE_DHT_MONITOR_PUT,
853 struct GNUNET_DHT_MonitorPutMessage);
854 GNUNET_MQ_hd_var_size (client_result,
855 GNUNET_MESSAGE_TYPE_DHT_CLIENT_RESULT,
856 struct GNUNET_DHT_ClientResultMessage);
857 GNUNET_MQ_hd_fixed_size (put_confirmation,
858 GNUNET_MESSAGE_TYPE_DHT_CLIENT_PUT_OK,
859 struct GNUNET_DHT_ClientPutConfirmationMessage);
860 struct GNUNET_MQ_MessageHandler handlers[] = { 845 struct GNUNET_MQ_MessageHandler handlers[] = {
861 make_monitor_get_handler (h), 846 GNUNET_MQ_hd_var_size (monitor_get,
862 make_monitor_get_resp_handler (h), 847 GNUNET_MESSAGE_TYPE_DHT_MONITOR_GET,
863 make_monitor_put_handler (h), 848 struct GNUNET_DHT_MonitorGetMessage,
864 make_client_result_handler (h), 849 h),
865 make_put_confirmation_handler (h), 850 GNUNET_MQ_hd_var_size (monitor_get_resp,
851 GNUNET_MESSAGE_TYPE_DHT_MONITOR_GET_RESP,
852 struct GNUNET_DHT_MonitorGetRespMessage,
853 h),
854 GNUNET_MQ_hd_var_size (monitor_put,
855 GNUNET_MESSAGE_TYPE_DHT_MONITOR_PUT,
856 struct GNUNET_DHT_MonitorPutMessage,
857 h),
858 GNUNET_MQ_hd_var_size (client_result,
859 GNUNET_MESSAGE_TYPE_DHT_CLIENT_RESULT,
860 struct GNUNET_DHT_ClientResultMessage,
861 h),
862 GNUNET_MQ_hd_fixed_size (put_confirmation,
863 GNUNET_MESSAGE_TYPE_DHT_CLIENT_PUT_OK,
864 struct GNUNET_DHT_ClientPutConfirmationMessage,
865 h),
866 GNUNET_MQ_handler_end () 866 GNUNET_MQ_handler_end ()
867 }; 867 };
868 if (NULL != h->mq) 868 if (NULL != h->mq)
diff --git a/src/dht/gnunet-service-dht_neighbours.c b/src/dht/gnunet-service-dht_neighbours.c
index 2dd6c800b..683e0991a 100644
--- a/src/dht/gnunet-service-dht_neighbours.c
+++ b/src/dht/gnunet-service-dht_neighbours.c
@@ -2298,19 +2298,19 @@ handle_dht_p2p_result (void *cls,
2298int 2298int
2299GDS_NEIGHBOURS_init () 2299GDS_NEIGHBOURS_init ()
2300{ 2300{
2301 GNUNET_MQ_hd_var_size (dht_p2p_get,
2302 GNUNET_MESSAGE_TYPE_DHT_P2P_GET,
2303 struct PeerGetMessage);
2304 GNUNET_MQ_hd_var_size (dht_p2p_put,
2305 GNUNET_MESSAGE_TYPE_DHT_P2P_PUT,
2306 struct PeerPutMessage);
2307 GNUNET_MQ_hd_var_size (dht_p2p_result,
2308 GNUNET_MESSAGE_TYPE_DHT_P2P_RESULT,
2309 struct PeerResultMessage);
2310 struct GNUNET_MQ_MessageHandler core_handlers[] = { 2301 struct GNUNET_MQ_MessageHandler core_handlers[] = {
2311 make_dht_p2p_get_handler (NULL), 2302 GNUNET_MQ_hd_var_size (dht_p2p_get,
2312 make_dht_p2p_put_handler (NULL), 2303 GNUNET_MESSAGE_TYPE_DHT_P2P_GET,
2313 make_dht_p2p_result_handler (NULL), 2304 struct PeerGetMessage,
2305 NULL),
2306 GNUNET_MQ_hd_var_size (dht_p2p_put,
2307 GNUNET_MESSAGE_TYPE_DHT_P2P_PUT,
2308 struct PeerPutMessage,
2309 NULL),
2310 GNUNET_MQ_hd_var_size (dht_p2p_result,
2311 GNUNET_MESSAGE_TYPE_DHT_P2P_RESULT,
2312 struct PeerResultMessage,
2313 NULL),
2314 GNUNET_MQ_handler_end () 2314 GNUNET_MQ_handler_end ()
2315 }; 2315 };
2316 unsigned long long temp_config_num; 2316 unsigned long long temp_config_num;
diff --git a/src/dht/gnunet-service-wdht_neighbours.c b/src/dht/gnunet-service-wdht_neighbours.c
index 1d5fd67c0..a6ebdb033 100644
--- a/src/dht/gnunet-service-wdht_neighbours.c
+++ b/src/dht/gnunet-service-wdht_neighbours.c
@@ -1666,23 +1666,23 @@ handle_dht_p2p_trail_route (void *cls,
1666int 1666int
1667GDS_NEIGHBOURS_init (void) 1667GDS_NEIGHBOURS_init (void)
1668{ 1668{
1669 GNUNET_MQ_hd_fixed_size (dht_p2p_random_walk,
1670 GNUNET_MESSAGE_TYPE_WDHT_RANDOM_WALK,
1671 struct RandomWalkMessage);
1672 GNUNET_MQ_hd_fixed_size (dht_p2p_random_walk_response,
1673 GNUNET_MESSAGE_TYPE_WDHT_RANDOM_WALK_RESPONSE,
1674 struct RandomWalkResponseMessage);
1675 GNUNET_MQ_hd_fixed_size (dht_p2p_trail_destroy,
1676 GNUNET_MESSAGE_TYPE_WDHT_TRAIL_DESTROY,
1677 struct TrailDestroyMessage);
1678 GNUNET_MQ_hd_var_size (dht_p2p_trail_route,
1679 GNUNET_MESSAGE_TYPE_WDHT_TRAIL_ROUTE,
1680 struct TrailRouteMessage);
1681 struct GNUNET_MQ_MessageHandler core_handlers[] = { 1669 struct GNUNET_MQ_MessageHandler core_handlers[] = {
1682 make_dht_p2p_random_walk_handler (NULL), 1670 GNUNET_MQ_hd_fixed_size (dht_p2p_random_walk,
1683 make_dht_p2p_random_walk_response_handler (NULL), 1671 GNUNET_MESSAGE_TYPE_WDHT_RANDOM_WALK,
1684 make_dht_p2p_trail_destroy_handler (NULL), 1672 struct RandomWalkMessage,
1685 make_dht_p2p_trail_route_handler (NULL), 1673 NULL),
1674 GNUNET_MQ_hd_fixed_size (dht_p2p_random_walk_response,
1675 GNUNET_MESSAGE_TYPE_WDHT_RANDOM_WALK_RESPONSE,
1676 struct RandomWalkResponseMessage,
1677 NULL),
1678 GNUNET_MQ_hd_fixed_size (dht_p2p_trail_destroy,
1679 GNUNET_MESSAGE_TYPE_WDHT_TRAIL_DESTROY,
1680 struct TrailDestroyMessage,
1681 NULL),
1682 GNUNET_MQ_hd_var_size (dht_p2p_trail_route,
1683 GNUNET_MESSAGE_TYPE_WDHT_TRAIL_ROUTE,
1684 struct TrailRouteMessage,
1685 NULL),
1686 GNUNET_MQ_handler_end () 1686 GNUNET_MQ_handler_end ()
1687 }; 1687 };
1688 1688
diff --git a/src/dht/gnunet-service-xdht_neighbours.c b/src/dht/gnunet-service-xdht_neighbours.c
index 7bfc11918..9ae39e0a0 100644
--- a/src/dht/gnunet-service-xdht_neighbours.c
+++ b/src/dht/gnunet-service-xdht_neighbours.c
@@ -6039,55 +6039,55 @@ finger_table_init ()
6039int 6039int
6040GDS_NEIGHBOURS_init (void) 6040GDS_NEIGHBOURS_init (void)
6041{ 6041{
6042 GNUNET_MQ_hd_var_size (dht_p2p_put,
6043 GNUNET_MESSAGE_TYPE_XDHT_P2P_PUT,
6044 struct PeerPutMessage);
6045 GNUNET_MQ_hd_var_size (dht_p2p_get,
6046 GNUNET_MESSAGE_TYPE_XDHT_P2P_GET,
6047 struct PeerGetMessage);
6048 GNUNET_MQ_hd_var_size (dht_p2p_get_result,
6049 GNUNET_MESSAGE_TYPE_XDHT_P2P_GET_RESULT,
6050 struct PeerGetResultMessage);
6051 GNUNET_MQ_hd_var_size (dht_p2p_trail_setup,
6052 GNUNET_MESSAGE_TYPE_XDHT_P2P_TRAIL_SETUP,
6053 struct PeerTrailSetupMessage);
6054 GNUNET_MQ_hd_var_size (dht_p2p_trail_setup_result,
6055 GNUNET_MESSAGE_TYPE_XDHT_P2P_TRAIL_SETUP_RESULT,
6056 struct PeerTrailSetupResultMessage);
6057 GNUNET_MQ_hd_var_size (dht_p2p_verify_successor,
6058 GNUNET_MESSAGE_TYPE_XDHT_P2P_VERIFY_SUCCESSOR,
6059 struct PeerVerifySuccessorMessage);
6060 GNUNET_MQ_hd_var_size (dht_p2p_verify_successor_result,
6061 GNUNET_MESSAGE_TYPE_XDHT_P2P_VERIFY_SUCCESSOR_RESULT,
6062 struct PeerVerifySuccessorResultMessage);
6063 GNUNET_MQ_hd_var_size (dht_p2p_notify_new_successor,
6064 GNUNET_MESSAGE_TYPE_XDHT_P2P_NOTIFY_NEW_SUCCESSOR,
6065 struct PeerNotifyNewSuccessorMessage);
6066 GNUNET_MQ_hd_var_size (dht_p2p_trail_setup_rejection,
6067 GNUNET_MESSAGE_TYPE_XDHT_P2P_TRAIL_SETUP_REJECTION,
6068 struct PeerTrailRejectionMessage);
6069 GNUNET_MQ_hd_fixed_size (dht_p2p_trail_teardown,
6070 GNUNET_MESSAGE_TYPE_XDHT_P2P_TRAIL_TEARDOWN,
6071 struct PeerTrailTearDownMessage);
6072 GNUNET_MQ_hd_var_size (dht_p2p_add_trail,
6073 GNUNET_MESSAGE_TYPE_XDHT_P2P_ADD_TRAIL,
6074 struct PeerAddTrailMessage);
6075 GNUNET_MQ_hd_fixed_size (dht_p2p_notify_succ_confirmation,
6076 GNUNET_MESSAGE_TYPE_XDHT_P2P_NOTIFY_SUCCESSOR_CONFIRMATION,
6077 struct PeerNotifyConfirmationMessage);
6078 struct GNUNET_MQ_MessageHandler core_handlers[] = { 6042 struct GNUNET_MQ_MessageHandler core_handlers[] = {
6079 make_dht_p2p_put_handler (NULL), 6043 GNUNET_MQ_hd_var_size (dht_p2p_put,
6080 make_dht_p2p_get_handler (NULL), 6044 GNUNET_MESSAGE_TYPE_XDHT_P2P_PUT,
6081 make_dht_p2p_get_result_handler (NULL), 6045 struct PeerPutMessage,
6082 make_dht_p2p_trail_setup_handler (NULL), 6046 NULL),
6083 make_dht_p2p_trail_setup_result_handler (NULL), 6047 GNUNET_MQ_hd_var_size (dht_p2p_get,
6084 make_dht_p2p_verify_successor_handler (NULL), 6048 GNUNET_MESSAGE_TYPE_XDHT_P2P_GET,
6085 make_dht_p2p_verify_successor_result_handler (NULL), 6049 struct PeerGetMessage,
6086 make_dht_p2p_notify_new_successor_handler (NULL), 6050 NULL),
6087 make_dht_p2p_trail_setup_rejection_handler (NULL), 6051 GNUNET_MQ_hd_var_size (dht_p2p_get_result,
6088 make_dht_p2p_trail_teardown_handler (NULL), 6052 GNUNET_MESSAGE_TYPE_XDHT_P2P_GET_RESULT,
6089 make_dht_p2p_add_trail_handler (NULL), 6053 struct PeerGetResultMessage,
6090 make_dht_p2p_notify_succ_confirmation_handler (NULL), 6054 NULL),
6055 GNUNET_MQ_hd_var_size (dht_p2p_trail_setup,
6056 GNUNET_MESSAGE_TYPE_XDHT_P2P_TRAIL_SETUP,
6057 struct PeerTrailSetupMessage,
6058 NULL),
6059 GNUNET_MQ_hd_var_size (dht_p2p_trail_setup_result,
6060 GNUNET_MESSAGE_TYPE_XDHT_P2P_TRAIL_SETUP_RESULT,
6061 struct PeerTrailSetupResultMessag,
6062 NULL),
6063 GNUNET_MQ_hd_var_size (dht_p2p_verify_successor,
6064 GNUNET_MESSAGE_TYPE_XDHT_P2P_VERIFY_SUCCESSOR,
6065 struct PeerVerifySuccessorMessage,
6066 NULL),
6067 GNUNET_MQ_hd_var_size (dht_p2p_verify_successor_result,
6068 GNUNET_MESSAGE_TYPE_XDHT_P2P_VERIFY_SUCCESSOR_RESULT,
6069 struct PeerVerifySuccessorResultMessage,
6070 NULL),
6071 GNUNET_MQ_hd_var_size (dht_p2p_notify_new_successor,
6072 GNUNET_MESSAGE_TYPE_XDHT_P2P_NOTIFY_NEW_SUCCESSOR,
6073 struct PeerNotifyNewSuccessorMessage,
6074 NULL),
6075 GNUNET_MQ_hd_var_size (dht_p2p_trail_setup_rejection,
6076 GNUNET_MESSAGE_TYPE_XDHT_P2P_TRAIL_SETUP_REJECTION,
6077 struct PeerTrailRejectionMessage,
6078 NULL),
6079 GNUNET_MQ_hd_fixed_size (dht_p2p_trail_teardown,
6080 GNUNET_MESSAGE_TYPE_XDHT_P2P_TRAIL_TEARDOWN,
6081 struct PeerTrailTearDownMessage,
6082 NULL),
6083 GNUNET_MQ_hd_var_size (dht_p2p_add_trail,
6084 GNUNET_MESSAGE_TYPE_XDHT_P2P_ADD_TRAIL,
6085 struct PeerAddTrailMessage,
6086 NULL),
6087 GNUNET_MQ_hd_fixed_size (dht_p2p_notify_succ_confirmation,
6088 GNUNET_MESSAGE_TYPE_XDHT_P2P_NOTIFY_SUCCESSOR_CONFIRMATION,
6089 struct PeerNotifyConfirmationMessage,
6090 NULL),
6091 GNUNET_MQ_handler_end () 6091 GNUNET_MQ_handler_end ()
6092 }; 6092 };
6093 6093
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-19 02:22:30 +0000