From: Bart Polot Date: Wed, 14 Sep 2011 15:27:34 +0000 (+0000) Subject: Fixed compiler warning in tests X-Git-Tag: initial-import-from-subversion-38251~17108 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4a9c4c7275860ca9b558eb7354ddd39af9cd8c3d;p=oweals%2Fgnunet.git Fixed compiler warning in tests --- diff --git a/src/mesh/gnunet-service-mesh.c b/src/mesh/gnunet-service-mesh.c index b30289ac0..b308477b7 100644 --- a/src/mesh/gnunet-service-mesh.c +++ b/src/mesh/gnunet-service-mesh.c @@ -2689,7 +2689,7 @@ handle_local_multicast (void *cls, struct GNUNET_SERVER_Client *client, /** * Functions to handle messages from clients */ -static struct GNUNET_SERVER_MessageHandler plugin_handlers[] = { +static struct GNUNET_SERVER_MessageHandler client_handlers[] = { {&handle_local_new_client, NULL, GNUNET_MESSAGE_TYPE_MESH_LOCAL_CONNECT, 0}, {&handle_local_tunnel_create, NULL, GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_CREATE, @@ -2857,7 +2857,7 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, const struct GNUNET_CONFIGURATION_Handle *c) { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: starting to run\n"); - GNUNET_SERVER_add_handlers (server, plugin_handlers); + GNUNET_SERVER_add_handlers (server, client_handlers); GNUNET_SERVER_disconnect_notify (server, &handle_client_disconnect, NULL); server_handle = server; core_handle = GNUNET_CORE_connect (c, /* Main configuration */ @@ -2897,7 +2897,7 @@ run (void *cls, struct GNUNET_SERVER_Handle *server, clients = NULL; clients_tail = NULL; - announce_applications_task = 0; + announce_applications_task = GNUNET_SCHEDULER_NO_TASK; /* Scheduled the task to clean up when shutdown is called */ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task, diff --git a/src/mesh/test_mesh_local_1.c b/src/mesh/test_mesh_local_1.c index 5c45f2895..d531dab6f 100644 --- a/src/mesh/test_mesh_local_1.c +++ b/src/mesh/test_mesh_local_1.c @@ -36,8 +36,8 @@ static struct GNUNET_OS_Process *arm_pid; static struct GNUNET_MESH_Handle *mesh_peer_1; static struct GNUNET_MESH_Handle *mesh_peer_2; static struct GNUNET_MESH_Tunnel *t; -static int one = 1; -static int two = 2; +static unsigned int one = 1; +static unsigned int two = 2; static int result; static GNUNET_SCHEDULER_TaskIdentifier abort_task; diff --git a/src/mesh/test_mesh_local_2.c b/src/mesh/test_mesh_local_2.c index b29921dd3..d841d63d9 100644 --- a/src/mesh/test_mesh_local_2.c +++ b/src/mesh/test_mesh_local_2.c @@ -36,6 +36,8 @@ static struct GNUNET_OS_Process *arm_pid; static struct GNUNET_MESH_Handle *mesh_peer_1; static struct GNUNET_MESH_Handle *mesh_peer_2; static struct GNUNET_MESH_Tunnel *t; +static unsigned int one = 1; +static unsigned int two = 2; static int result; static GNUNET_SCHEDULER_TaskIdentifier abort_task; @@ -132,7 +134,7 @@ inbound_tunnel (void *cls, struct GNUNET_MESH_Tunnel *tunnel, const struct GNUNET_PeerIdentity *initiator, const struct GNUNET_TRANSPORT_ATS_Information *atsi) { - unsigned int id = (unsigned int) cls; + unsigned int id = *(unsigned int *) cls; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: received incoming tunnel\n"); if (id != 1) @@ -158,7 +160,7 @@ static void inbound_end (void *cls, const struct GNUNET_MESH_Tunnel *tunnel, void *tunnel_ctx) { - unsigned int id = (unsigned int) cls; + unsigned int id = *(unsigned int *) cls; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: incoming tunnel closed\n"); if (id != 1) @@ -177,7 +179,8 @@ inbound_end (void *cls, const struct GNUNET_MESH_Tunnel *tunnel, * @param peer peer identity the tunnel stopped working with */ static void -peer_conected (void *cls, const struct GNUNET_PeerIdentity *peer) +peer_conected (void *cls, const struct GNUNET_PeerIdentity *peer, + const struct GNUNET_TRANSPORT_ATS_Information *atsi) { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: peer connected\n"); GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &do_shutdown, NULL); @@ -192,8 +195,7 @@ peer_conected (void *cls, const struct GNUNET_PeerIdentity *peer) * @param atsi performance data for the connection */ static void -peer_disconnected (void *cls, const struct GNUNET_PeerIdentity *peer, - const struct GNUNET_TRANSPORT_ATS_Information *atsi) +peer_disconnected (void *cls, const struct GNUNET_PeerIdentity *peer) { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: peer disconnected\n"); } @@ -226,7 +228,7 @@ do_connect_peer_1 (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) test_task = GNUNET_SCHEDULER_NO_TASK; mesh_peer_1 = GNUNET_MESH_connect (cfg, /* configuration */ 10, /* queue size */ - (void *) 1, /* cls */ + (void *) &one, /* cls */ &inbound_tunnel, /* inbound new hndlr */ &inbound_end, /* inbound end hndlr */ handlers1, /* traffic handlers */ @@ -247,7 +249,7 @@ test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) mesh_peer_2 = GNUNET_MESH_connect (cfg, /* configuration */ 10, /* queue size */ - (void *) 2, /* cls */ + (void *) &two, /* cls */ &inbound_tunnel, /* inbound new hndlr */ &inbound_end, /* inbound end hndlr */ handlers2, /* traffic handlers */ @@ -263,7 +265,7 @@ test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) } t = GNUNET_MESH_tunnel_create (mesh_peer_2, NULL, &peer_conected, - &peer_disconnected, (void *) 2); + &peer_disconnected, (void *) &two); GNUNET_MESH_peer_request_connect_by_type (t, 1); test_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,