aboutsummaryrefslogtreecommitdiff
path: root/src/conversation/gnunet-service-conversation.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2018-06-06 08:20:53 +0200
committerChristian Grothoff <christian@grothoff.org>2018-06-06 08:20:53 +0200
commit561d9096a28037d65783cf40d4016e39a0cf3a2b (patch)
tree2591bb1ac9bb5d0b47c6d37447e1d40cfc8040a9 /src/conversation/gnunet-service-conversation.c
parent8eb738e7d6005ffd5e6cbb1ae80316ed0da6e3f9 (diff)
downloadgnunet-561d9096a28037d65783cf40d4016e39a0cf3a2b.tar.gz
gnunet-561d9096a28037d65783cf40d4016e39a0cf3a2b.zip
fix misc compiler warnings
Diffstat (limited to 'src/conversation/gnunet-service-conversation.c')
-rw-r--r--src/conversation/gnunet-service-conversation.c18
1 files changed, 16 insertions, 2 deletions
diff --git a/src/conversation/gnunet-service-conversation.c b/src/conversation/gnunet-service-conversation.c
index fb4f9fcad..2d6dd09f6 100644
--- a/src/conversation/gnunet-service-conversation.c
+++ b/src/conversation/gnunet-service-conversation.c
@@ -600,6 +600,8 @@ static int
600check_client_audio_message (void *cls, 600check_client_audio_message (void *cls,
601 const struct ClientAudioMessage *msg) 601 const struct ClientAudioMessage *msg)
602{ 602{
603 (void) cls;
604 (void) msg;
603 return GNUNET_OK; 605 return GNUNET_OK;
604} 606}
605 607
@@ -766,6 +768,7 @@ handle_cadet_hangup_message (void *cls,
766 enum ChannelStatus status; 768 enum ChannelStatus status;
767 uint32_t cid; 769 uint32_t cid;
768 770
771 (void) message;
769 GNUNET_CADET_receive_done (ch->channel); 772 GNUNET_CADET_receive_done (ch->channel);
770 cid = ch->cid; 773 cid = ch->cid;
771 status = ch->status; 774 status = ch->status;
@@ -811,6 +814,7 @@ handle_cadet_pickup_message (void *cls,
811 struct GNUNET_MQ_Envelope *env; 814 struct GNUNET_MQ_Envelope *env;
812 struct ClientPhonePickedupMessage *pick; 815 struct ClientPhonePickedupMessage *pick;
813 816
817 (void) message;
814 GNUNET_CADET_receive_done (ch->channel); 818 GNUNET_CADET_receive_done (ch->channel);
815 switch (ch->status) 819 switch (ch->status)
816 { 820 {
@@ -860,6 +864,7 @@ handle_cadet_suspend_message (void *cls,
860 struct GNUNET_MQ_Envelope *env; 864 struct GNUNET_MQ_Envelope *env;
861 struct ClientPhoneSuspendMessage *suspend; 865 struct ClientPhoneSuspendMessage *suspend;
862 866
867 (void) message;
863 GNUNET_CADET_receive_done (ch->channel); 868 GNUNET_CADET_receive_done (ch->channel);
864 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 869 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
865 "Suspending channel CID: %u\n", 870 "Suspending channel CID: %u\n",
@@ -909,6 +914,7 @@ handle_cadet_resume_message (void *cls,
909 struct GNUNET_MQ_Envelope *env; 914 struct GNUNET_MQ_Envelope *env;
910 struct ClientPhoneResumeMessage *resume; 915 struct ClientPhoneResumeMessage *resume;
911 916
917 (void) msg;
912 line = ch->line; 918 line = ch->line;
913 GNUNET_CADET_receive_done (ch->channel); 919 GNUNET_CADET_receive_done (ch->channel);
914 if (GNUNET_YES != ch->suspended_remote) 920 if (GNUNET_YES != ch->suspended_remote)
@@ -959,6 +965,8 @@ static int
959check_cadet_audio_message (void *cls, 965check_cadet_audio_message (void *cls,
960 const struct CadetAudioMessage *msg) 966 const struct CadetAudioMessage *msg)
961{ 967{
968 (void) cls;
969 (void) msg;
962 return GNUNET_OK; /* any payload is fine */ 970 return GNUNET_OK; /* any payload is fine */
963} 971}
964 972
@@ -1147,6 +1155,7 @@ inbound_channel (void *cls,
1147 struct Line *line = cls; 1155 struct Line *line = cls;
1148 struct Channel *ch; 1156 struct Channel *ch;
1149 1157
1158 (void) initiator;
1150 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 1159 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
1151 "Received incoming cadet channel on line %p\n", 1160 "Received incoming cadet channel on line %p\n",
1152 line); 1161 line);
@@ -1178,6 +1187,7 @@ client_connect_cb (void *cls,
1178{ 1187{
1179 struct Line *line; 1188 struct Line *line;
1180 1189
1190 (void) cls;
1181 line = GNUNET_new (struct Line); 1191 line = GNUNET_new (struct Line);
1182 line->client = client; 1192 line->client = client;
1183 line->mq = mq; 1193 line->mq = mq;
@@ -1198,9 +1208,10 @@ client_disconnect_cb (void *cls,
1198 void *app_ctx) 1208 void *app_ctx)
1199{ 1209{
1200 struct Line *line = app_ctx; 1210 struct Line *line = app_ctx;
1201 struct Channel *ch;
1202 struct Channel *chn; 1211 struct Channel *chn;
1203 1212
1213 (void) cls;
1214 (void) client;
1204 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 1215 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
1205 "Client disconnected, closing line\n"); 1216 "Client disconnected, closing line\n");
1206 if (NULL != line->port) 1217 if (NULL != line->port)
@@ -1208,7 +1219,7 @@ client_disconnect_cb (void *cls,
1208 GNUNET_CADET_close_port (line->port); 1219 GNUNET_CADET_close_port (line->port);
1209 line->port = NULL; 1220 line->port = NULL;
1210 } 1221 }
1211 for (ch = line->channel_head; NULL != ch; ch = chn) 1222 for (struct Channel *ch = line->channel_head; NULL != ch; ch = chn)
1212 { 1223 {
1213 chn = ch->next; 1224 chn = ch->next;
1214 ch->line = NULL; 1225 ch->line = NULL;
@@ -1285,6 +1296,7 @@ handle_client_register_message (void *cls,
1285static void 1296static void
1286do_shutdown (void *cls) 1297do_shutdown (void *cls)
1287{ 1298{
1299 (void) cls;
1288 if (NULL != cadet) 1300 if (NULL != cadet)
1289 { 1301 {
1290 GNUNET_CADET_disconnect (cadet); 1302 GNUNET_CADET_disconnect (cadet);
@@ -1305,6 +1317,8 @@ run (void *cls,
1305 const struct GNUNET_CONFIGURATION_Handle *c, 1317 const struct GNUNET_CONFIGURATION_Handle *c,
1306 struct GNUNET_SERVICE_Handle *service) 1318 struct GNUNET_SERVICE_Handle *service)
1307{ 1319{
1320 (void) cls;
1321 (void) service;
1308 cfg = c; 1322 cfg = c;
1309 GNUNET_assert (GNUNET_OK == 1323 GNUNET_assert (GNUNET_OK ==
1310 GNUNET_CRYPTO_get_peer_identity (cfg, 1324 GNUNET_CRYPTO_get_peer_identity (cfg,