From 6f0f8a7cd334bfeeeeea31c2b615a0875f7b546f Mon Sep 17 00:00:00 2001 From: Bart Polot Date: Tue, 13 Sep 2011 17:43:33 +0000 Subject: Fixed compiler warnings --- src/mesh/test_mesh_local_1.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/mesh/test_mesh_local_1.c b/src/mesh/test_mesh_local_1.c index 7ccab0916..4e8d0b78e 100644 --- a/src/mesh/test_mesh_local_1.c +++ b/src/mesh/test_mesh_local_1.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 int one = 1; +static 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) @@ -159,7 +161,7 @@ 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) @@ -179,7 +181,8 @@ inbound_end (void *cls, */ static void peer_conected ( void *cls, - const struct GNUNET_PeerIdentity * peer) + 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); @@ -195,8 +198,7 @@ static void peer_conected ( */ static void peer_disconnected ( void *cls, - const struct GNUNET_PeerIdentity * peer, - const struct GNUNET_TRANSPORT_ATS_Information * atsi) + const struct GNUNET_PeerIdentity * peer) { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: peer disconnected\n"); } @@ -240,7 +242,7 @@ test (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 */ @@ -248,7 +250,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 */ @@ -267,7 +269,7 @@ test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) NULL, &peer_conected, &peer_disconnected, - (void *) 2); + (void *) &two); GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_UNIT_SECONDS, &do_find, NULL); } -- cgit v1.2.3