diff options
author | Christian Grothoff <christian@grothoff.org> | 2018-06-06 08:20:53 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2018-06-06 08:20:53 +0200 |
commit | 561d9096a28037d65783cf40d4016e39a0cf3a2b (patch) | |
tree | 2591bb1ac9bb5d0b47c6d37447e1d40cfc8040a9 /src/conversation | |
parent | 8eb738e7d6005ffd5e6cbb1ae80316ed0da6e3f9 (diff) | |
download | gnunet-561d9096a28037d65783cf40d4016e39a0cf3a2b.tar.gz gnunet-561d9096a28037d65783cf40d4016e39a0cf3a2b.zip |
fix misc compiler warnings
Diffstat (limited to 'src/conversation')
-rw-r--r-- | src/conversation/gnunet-conversation-test.c | 29 | ||||
-rw-r--r-- | src/conversation/gnunet-helper-audio-playback.c | 39 | ||||
-rw-r--r-- | src/conversation/gnunet-helper-audio-record.c | 48 | ||||
-rw-r--r-- | src/conversation/gnunet-service-conversation.c | 18 | ||||
-rw-r--r-- | src/conversation/plugin_gnsrecord_conversation.c | 5 |
5 files changed, 108 insertions, 31 deletions
diff --git a/src/conversation/gnunet-conversation-test.c b/src/conversation/gnunet-conversation-test.c index 75605384f..ac99e4d14 100644 --- a/src/conversation/gnunet-conversation-test.c +++ b/src/conversation/gnunet-conversation-test.c | |||
@@ -97,6 +97,7 @@ do_shutdown (void *cls) | |||
97 | { | 97 | { |
98 | struct Recording *rec; | 98 | struct Recording *rec; |
99 | 99 | ||
100 | (void) cls; | ||
100 | if (NULL != switch_task) | 101 | if (NULL != switch_task) |
101 | GNUNET_SCHEDULER_cancel (switch_task); | 102 | GNUNET_SCHEDULER_cancel (switch_task); |
102 | if (NULL != microphone) | 103 | if (NULL != microphone) |
@@ -123,8 +124,7 @@ do_shutdown (void *cls) | |||
123 | static void | 124 | static void |
124 | switch_to_speaker (void *cls) | 125 | switch_to_speaker (void *cls) |
125 | { | 126 | { |
126 | struct Recording *rec; | 127 | (void) cls; |
127 | |||
128 | switch_task = NULL; | 128 | switch_task = NULL; |
129 | microphone->disable_microphone (microphone->cls); | 129 | microphone->disable_microphone (microphone->cls); |
130 | if (GNUNET_OK != | 130 | if (GNUNET_OK != |
@@ -138,7 +138,7 @@ switch_to_speaker (void *cls) | |||
138 | } | 138 | } |
139 | fprintf (stderr, | 139 | fprintf (stderr, |
140 | _("\nWe are now playing your recording back. If you can hear it, your audio settings are working...")); | 140 | _("\nWe are now playing your recording back. If you can hear it, your audio settings are working...")); |
141 | for (rec=rec_head; NULL != rec; rec = rec->next) | 141 | for (struct Recording *rec=rec_head; NULL != rec; rec = rec->next) |
142 | { | 142 | { |
143 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 143 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
144 | "Replaying %u bytes\n", | 144 | "Replaying %u bytes\n", |
@@ -168,6 +168,7 @@ record (void *cls, | |||
168 | { | 168 | { |
169 | struct Recording *rec; | 169 | struct Recording *rec; |
170 | 170 | ||
171 | (void) cls; | ||
171 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 172 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
172 | "Recorded %u bytes\n", | 173 | "Recorded %u bytes\n", |
173 | (unsigned int) data_size); | 174 | (unsigned int) data_size); |
@@ -189,9 +190,14 @@ record (void *cls, | |||
189 | * @param cfg configuration | 190 | * @param cfg configuration |
190 | */ | 191 | */ |
191 | static void | 192 | static void |
192 | run (void *cls, char *const *args, const char *cfgfile, | 193 | run (void *cls, |
194 | char *const *args, | ||
195 | const char *cfgfile, | ||
193 | const struct GNUNET_CONFIGURATION_Handle *cfg) | 196 | const struct GNUNET_CONFIGURATION_Handle *cfg) |
194 | { | 197 | { |
198 | (void) cls; | ||
199 | (void) args; | ||
200 | (void) cfgfile; | ||
195 | microphone = GNUNET_MICROPHONE_create_from_hardware (cfg); | 201 | microphone = GNUNET_MICROPHONE_create_from_hardware (cfg); |
196 | GNUNET_assert (NULL != microphone); | 202 | GNUNET_assert (NULL != microphone); |
197 | speaker = GNUNET_SPEAKER_create_from_hardware (cfg); | 203 | speaker = GNUNET_SPEAKER_create_from_hardware (cfg); |
@@ -225,17 +231,24 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
225 | * @return 0 ok, 1 on error | 231 | * @return 0 ok, 1 on error |
226 | */ | 232 | */ |
227 | int | 233 | int |
228 | main (int argc, char *const *argv) | 234 | main (int argc, |
235 | char *const *argv) | ||
229 | { | 236 | { |
230 | static const struct GNUNET_GETOPT_CommandLineOption options[] = { | 237 | static const struct GNUNET_GETOPT_CommandLineOption options[] = { |
231 | GNUNET_GETOPT_OPTION_END | 238 | GNUNET_GETOPT_OPTION_END |
232 | }; | 239 | }; |
233 | if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) | 240 | |
241 | if (GNUNET_OK != | ||
242 | GNUNET_STRINGS_get_utf8_args (argc, argv, | ||
243 | &argc, &argv)) | ||
234 | return 2; | 244 | return 2; |
235 | 245 | ||
236 | ret = (GNUNET_OK == | 246 | ret = (GNUNET_OK == |
237 | GNUNET_PROGRAM_run (argc, argv, "gnunet-conversation-test", | 247 | GNUNET_PROGRAM_run (argc, argv, |
238 | gettext_noop ("help text"), options, &run, | 248 | "gnunet-conversation-test", |
249 | gettext_noop ("help text"), | ||
250 | options, | ||
251 | &run, | ||
239 | NULL)) ? ret : 1; | 252 | NULL)) ? ret : 1; |
240 | GNUNET_free ((void*) argv); | 253 | GNUNET_free ((void*) argv); |
241 | return ret; | 254 | return ret; |
diff --git a/src/conversation/gnunet-helper-audio-playback.c b/src/conversation/gnunet-helper-audio-playback.c index f96878051..5c13f2877 100644 --- a/src/conversation/gnunet-helper-audio-playback.c +++ b/src/conversation/gnunet-helper-audio-playback.c | |||
@@ -144,17 +144,22 @@ process_header (ogg_packet *op) | |||
144 | OpusDecoder *dec; | 144 | OpusDecoder *dec; |
145 | struct OpusHeadPacket header; | 145 | struct OpusHeadPacket header; |
146 | 146 | ||
147 | if (op->bytes < sizeof (header)) | 147 | if ( ((unsigned int) op->bytes) < sizeof (header)) |
148 | return NULL; | 148 | return NULL; |
149 | GNUNET_memcpy (&header, op->packet, sizeof (header)); | 149 | GNUNET_memcpy (&header, |
150 | op->packet, | ||
151 | sizeof (header)); | ||
150 | header.preskip = GNUNET_le16toh (header.preskip); | 152 | header.preskip = GNUNET_le16toh (header.preskip); |
151 | header.sampling_rate = GNUNET_le32toh (header.sampling_rate); | 153 | header.sampling_rate = GNUNET_le32toh (header.sampling_rate); |
152 | header.gain = GNUNET_le16toh (header.gain); | 154 | header.gain = GNUNET_le16toh (header.gain); |
153 | 155 | ||
154 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 156 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
155 | "Header: v%u, %u-ch, skip %u, %uHz, %u gain\n", | 157 | "Header: v%u, %u-ch, skip %u, %uHz, %u gain\n", |
156 | header.version, header.channels, header.preskip, header.sampling_rate, header.gain); | 158 | header.version, |
157 | 159 | header.channels, | |
160 | header.preskip, | ||
161 | header.sampling_rate, | ||
162 | header.gain); | ||
158 | channels = header.channels; | 163 | channels = header.channels; |
159 | preskip = header.preskip; | 164 | preskip = header.preskip; |
160 | 165 | ||
@@ -333,7 +338,8 @@ audio_write (int64_t maxout) | |||
333 | static void | 338 | static void |
334 | quit (int ret) | 339 | quit (int ret) |
335 | { | 340 | { |
336 | mainloop_api->quit (mainloop_api, ret); | 341 | mainloop_api->quit (mainloop_api, |
342 | ret); | ||
337 | exit (ret); | 343 | exit (ret); |
338 | } | 344 | } |
339 | 345 | ||
@@ -539,6 +545,7 @@ ogg_demux_and_decode () | |||
539 | } | 545 | } |
540 | } | 546 | } |
541 | 547 | ||
548 | |||
542 | /** | 549 | /** |
543 | * Message callback | 550 | * Message callback |
544 | * | 551 | * |
@@ -555,6 +562,7 @@ stdin_receiver (void *cls, | |||
555 | char *data; | 562 | char *data; |
556 | size_t payload_len; | 563 | size_t payload_len; |
557 | 564 | ||
565 | (void) cls; | ||
558 | switch (ntohs (msg->type)) | 566 | switch (ntohs (msg->type)) |
559 | { | 567 | { |
560 | case GNUNET_MESSAGE_TYPE_CONVERSATION_AUDIO: | 568 | case GNUNET_MESSAGE_TYPE_CONVERSATION_AUDIO: |
@@ -585,6 +593,9 @@ stream_write_callback (pa_stream *s, | |||
585 | void *userdata) | 593 | void *userdata) |
586 | { | 594 | { |
587 | /* unblock 'main' */ | 595 | /* unblock 'main' */ |
596 | (void) userdata; | ||
597 | (void) length; | ||
598 | (void) s; | ||
588 | if (-1 != ready_pipe[1]) | 599 | if (-1 != ready_pipe[1]) |
589 | { | 600 | { |
590 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 601 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
@@ -603,6 +614,10 @@ exit_signal_callback (pa_mainloop_api *m, | |||
603 | int sig, | 614 | int sig, |
604 | void *userdata) | 615 | void *userdata) |
605 | { | 616 | { |
617 | (void) m; | ||
618 | (void) e; | ||
619 | (void) sig; | ||
620 | (void) userdata; | ||
606 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 621 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
607 | _("gnunet-helper-audio-playback - Got signal, exiting\n")); | 622 | _("gnunet-helper-audio-playback - Got signal, exiting\n")); |
608 | quit (1); | 623 | quit (1); |
@@ -618,6 +633,7 @@ context_state_callback (pa_context *c, | |||
618 | { | 633 | { |
619 | int p; | 634 | int p; |
620 | 635 | ||
636 | (void) userdata; | ||
621 | GNUNET_assert (NULL != c); | 637 | GNUNET_assert (NULL != c); |
622 | switch (pa_context_get_state (c)) | 638 | switch (pa_context_get_state (c)) |
623 | { | 639 | { |
@@ -730,7 +746,11 @@ ogg_init () | |||
730 | static void | 746 | static void |
731 | drain_callback (pa_stream*s, int success, void *userdata) | 747 | drain_callback (pa_stream*s, int success, void *userdata) |
732 | { | 748 | { |
733 | pa_threaded_mainloop_signal (m, 0); | 749 | (void) s; |
750 | (void) success; | ||
751 | (void) userdata; | ||
752 | pa_threaded_mainloop_signal (m, | ||
753 | 0); | ||
734 | } | 754 | } |
735 | 755 | ||
736 | 756 | ||
@@ -745,7 +765,6 @@ int | |||
745 | main (int argc, char *argv[]) | 765 | main (int argc, char *argv[]) |
746 | { | 766 | { |
747 | static unsigned long long toff; | 767 | static unsigned long long toff; |
748 | |||
749 | char readbuf[MAXLINE]; | 768 | char readbuf[MAXLINE]; |
750 | struct GNUNET_MessageStreamTokenizer *stdin_mst; | 769 | struct GNUNET_MessageStreamTokenizer *stdin_mst; |
751 | char c; | 770 | char c; |
@@ -754,6 +773,8 @@ main (int argc, char *argv[]) | |||
754 | int read_pure_ogg = getenv ("GNUNET_READ_PURE_OGG") ? 1 : 0; | 773 | int read_pure_ogg = getenv ("GNUNET_READ_PURE_OGG") ? 1 : 0; |
755 | #endif | 774 | #endif |
756 | 775 | ||
776 | (void) argc; | ||
777 | (void) argv; | ||
757 | GNUNET_assert (GNUNET_OK == | 778 | GNUNET_assert (GNUNET_OK == |
758 | GNUNET_log_setup ("gnunet-helper-audio-playback", | 779 | GNUNET_log_setup ("gnunet-helper-audio-playback", |
759 | "WARNING", | 780 | "WARNING", |
@@ -778,7 +799,9 @@ main (int argc, char *argv[]) | |||
778 | #endif | 799 | #endif |
779 | while (1) | 800 | while (1) |
780 | { | 801 | { |
781 | ret = read (0, readbuf, sizeof (readbuf)); | 802 | ret = read (STDIN_FILENO, |
803 | readbuf, | ||
804 | sizeof (readbuf)); | ||
782 | toff += ret; | 805 | toff += ret; |
783 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 806 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
784 | "Received %d bytes of audio data (total: %llu)\n", | 807 | "Received %d bytes of audio data (total: %llu)\n", |
diff --git a/src/conversation/gnunet-helper-audio-record.c b/src/conversation/gnunet-helper-audio-record.c index 9442e9b45..dd8c8f447 100644 --- a/src/conversation/gnunet-helper-audio-record.c +++ b/src/conversation/gnunet-helper-audio-record.c | |||
@@ -264,30 +264,36 @@ static int dump_pure_ogg; | |||
264 | static void | 264 | static void |
265 | quit (int ret) | 265 | quit (int ret) |
266 | { | 266 | { |
267 | mainloop_api->quit (mainloop_api, ret); | 267 | mainloop_api->quit (mainloop_api, |
268 | ret); | ||
268 | exit (ret); | 269 | exit (ret); |
269 | } | 270 | } |
270 | 271 | ||
271 | 272 | ||
272 | static void | 273 | static void |
273 | write_data (const char *ptr, size_t msg_size) | 274 | write_data (const char *ptr, |
275 | size_t msg_size) | ||
274 | { | 276 | { |
275 | ssize_t ret; | 277 | ssize_t ret; |
276 | size_t off; | 278 | size_t off; |
277 | off = 0; | 279 | off = 0; |
278 | while (off < msg_size) | 280 | while (off < msg_size) |
279 | { | 281 | { |
280 | ret = write (1, &ptr[off], msg_size - off); | 282 | ret = write (STDOUT_FILENO, |
283 | &ptr[off], | ||
284 | msg_size - off); | ||
281 | if (0 >= ret) | 285 | if (0 >= ret) |
282 | { | 286 | { |
283 | if (-1 == ret) | 287 | if (-1 == ret) |
284 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "write"); | 288 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, |
289 | "write"); | ||
285 | quit (2); | 290 | quit (2); |
286 | } | 291 | } |
287 | off += ret; | 292 | off += ret; |
288 | } | 293 | } |
289 | } | 294 | } |
290 | 295 | ||
296 | |||
291 | static void | 297 | static void |
292 | write_page (ogg_page *og) | 298 | write_page (ogg_page *og) |
293 | { | 299 | { |
@@ -305,12 +311,15 @@ write_page (ogg_page *og) | |||
305 | toff); | 311 | toff); |
306 | #ifdef DEBUG_RECORD_PURE_OGG | 312 | #ifdef DEBUG_RECORD_PURE_OGG |
307 | if (dump_pure_ogg) | 313 | if (dump_pure_ogg) |
308 | write_data ((const char *) &audio_message[1], og->header_len + og->body_len); | 314 | write_data ((const char *) &audio_message[1], |
315 | og->header_len + og->body_len); | ||
309 | else | 316 | else |
310 | #endif | 317 | #endif |
311 | write_data ((const char *) audio_message, msg_size); | 318 | write_data ((const char *) audio_message, |
319 | msg_size); | ||
312 | } | 320 | } |
313 | 321 | ||
322 | |||
314 | /** | 323 | /** |
315 | * Creates OPUS packets from PCM data | 324 | * Creates OPUS packets from PCM data |
316 | */ | 325 | */ |
@@ -340,7 +349,7 @@ packetizer () | |||
340 | opus_strerror (len)); | 349 | opus_strerror (len)); |
341 | quit (5); | 350 | quit (5); |
342 | } | 351 | } |
343 | if (len > UINT16_MAX - sizeof (struct AudioMessage)) | 352 | if (((uint32_t)len) > UINT16_MAX - sizeof (struct AudioMessage)) |
344 | { | 353 | { |
345 | GNUNET_break (0); | 354 | GNUNET_break (0); |
346 | continue; | 355 | continue; |
@@ -360,7 +369,9 @@ packetizer () | |||
360 | 369 | ||
361 | while (ogg_stream_flush_fill (&os, &og, PAGE_WATERLINE)) | 370 | while (ogg_stream_flush_fill (&os, &og, PAGE_WATERLINE)) |
362 | { | 371 | { |
363 | if (og.header_len + og.body_len > UINT16_MAX - sizeof (struct AudioMessage)) | 372 | if ( ((unsigned long long) og.header_len) + |
373 | ((unsigned long long) og.body_len) > | ||
374 | UINT16_MAX - sizeof (struct AudioMessage)) | ||
364 | { | 375 | { |
365 | GNUNET_assert (0); | 376 | GNUNET_assert (0); |
366 | continue; | 377 | continue; |
@@ -399,6 +410,7 @@ stream_read_callback (pa_stream * s, | |||
399 | { | 410 | { |
400 | const void *data; | 411 | const void *data; |
401 | 412 | ||
413 | (void) userdata; | ||
402 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 414 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
403 | "Got %u/%d bytes of PCM data\n", | 415 | "Got %u/%d bytes of PCM data\n", |
404 | (unsigned int) length, | 416 | (unsigned int) length, |
@@ -449,6 +461,10 @@ exit_signal_callback (pa_mainloop_api * m, | |||
449 | int sig, | 461 | int sig, |
450 | void *userdata) | 462 | void *userdata) |
451 | { | 463 | { |
464 | (void) m; | ||
465 | (void) e; | ||
466 | (void) sig; | ||
467 | (void) userdata; | ||
452 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 468 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
453 | _("Got signal, exiting.\n")); | 469 | _("Got signal, exiting.\n")); |
454 | quit (1); | 470 | quit (1); |
@@ -459,10 +475,11 @@ exit_signal_callback (pa_mainloop_api * m, | |||
459 | * Pulseaudio stream state callback | 475 | * Pulseaudio stream state callback |
460 | */ | 476 | */ |
461 | static void | 477 | static void |
462 | stream_state_callback (pa_stream * s, void *userdata) | 478 | stream_state_callback (pa_stream * s, |
479 | void *userdata) | ||
463 | { | 480 | { |
481 | (void) userdata; | ||
464 | GNUNET_assert (NULL != s); | 482 | GNUNET_assert (NULL != s); |
465 | |||
466 | switch (pa_stream_get_state (s)) | 483 | switch (pa_stream_get_state (s)) |
467 | { | 484 | { |
468 | case PA_STREAM_CREATING: | 485 | case PA_STREAM_CREATING: |
@@ -522,6 +539,7 @@ static void | |||
522 | context_state_callback (pa_context * c, | 539 | context_state_callback (pa_context * c, |
523 | void *userdata) | 540 | void *userdata) |
524 | { | 541 | { |
542 | (void) userdata; | ||
525 | GNUNET_assert (c); | 543 | GNUNET_assert (c); |
526 | 544 | ||
527 | switch (pa_context_get_state (c)) | 545 | switch (pa_context_get_state (c)) |
@@ -654,6 +672,7 @@ opus_init () | |||
654 | OPUS_SET_SIGNAL (CONV_OPUS_SIGNAL)); | 672 | OPUS_SET_SIGNAL (CONV_OPUS_SIGNAL)); |
655 | } | 673 | } |
656 | 674 | ||
675 | |||
657 | static void | 676 | static void |
658 | ogg_init () | 677 | ogg_init () |
659 | { | 678 | { |
@@ -662,8 +681,8 @@ ogg_init () | |||
662 | struct OpusCommentsPacket *commentspacket; | 681 | struct OpusCommentsPacket *commentspacket; |
663 | size_t commentspacket_len; | 682 | size_t commentspacket_len; |
664 | 683 | ||
665 | serialno = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_STRONG, 0x7FFFFFFF); | 684 | serialno = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_STRONG, |
666 | 685 | 0x7FFFFFFF); | |
667 | /*Initialize Ogg stream struct*/ | 686 | /*Initialize Ogg stream struct*/ |
668 | if (-1 == ogg_stream_init (&os, serialno)) | 687 | if (-1 == ogg_stream_init (&os, serialno)) |
669 | { | 688 | { |
@@ -750,8 +769,11 @@ ogg_init () | |||
750 | * @return 0 ok, 1 on error | 769 | * @return 0 ok, 1 on error |
751 | */ | 770 | */ |
752 | int | 771 | int |
753 | main (int argc, char *argv[]) | 772 | main (int argc, |
773 | char *argv[]) | ||
754 | { | 774 | { |
775 | (void) argc; | ||
776 | (void) argv; | ||
755 | GNUNET_assert (GNUNET_OK == | 777 | GNUNET_assert (GNUNET_OK == |
756 | GNUNET_log_setup ("gnunet-helper-audio-record", | 778 | GNUNET_log_setup ("gnunet-helper-audio-record", |
757 | "WARNING", | 779 | "WARNING", |
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 | |||
600 | check_client_audio_message (void *cls, | 600 | check_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 | |||
959 | check_cadet_audio_message (void *cls, | 965 | check_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, | |||
1285 | static void | 1296 | static void |
1286 | do_shutdown (void *cls) | 1297 | do_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, |
diff --git a/src/conversation/plugin_gnsrecord_conversation.c b/src/conversation/plugin_gnsrecord_conversation.c index dd81ec917..3fee68782 100644 --- a/src/conversation/plugin_gnsrecord_conversation.c +++ b/src/conversation/plugin_gnsrecord_conversation.c | |||
@@ -46,6 +46,7 @@ conversation_value_to_string (void *cls, | |||
46 | { | 46 | { |
47 | char *s; | 47 | char *s; |
48 | 48 | ||
49 | (void) cls; | ||
49 | switch (type) | 50 | switch (type) |
50 | { | 51 | { |
51 | case GNUNET_GNSRECORD_TYPE_PHONE: | 52 | case GNUNET_GNSRECORD_TYPE_PHONE: |
@@ -103,6 +104,7 @@ conversation_string_to_value (void *cls, | |||
103 | void **data, | 104 | void **data, |
104 | size_t *data_size) | 105 | size_t *data_size) |
105 | { | 106 | { |
107 | (void) cls; | ||
106 | if (NULL == s) | 108 | if (NULL == s) |
107 | { | 109 | { |
108 | GNUNET_break (0); | 110 | GNUNET_break (0); |
@@ -181,6 +183,7 @@ conversation_typename_to_number (void *cls, | |||
181 | { | 183 | { |
182 | unsigned int i; | 184 | unsigned int i; |
183 | 185 | ||
186 | (void) cls; | ||
184 | i=0; | 187 | i=0; |
185 | while ( (name_map[i].name != NULL) && | 188 | while ( (name_map[i].name != NULL) && |
186 | (0 != strcasecmp (gns_typename, name_map[i].name)) ) | 189 | (0 != strcasecmp (gns_typename, name_map[i].name)) ) |
@@ -202,6 +205,7 @@ conversation_number_to_typename (void *cls, | |||
202 | { | 205 | { |
203 | unsigned int i; | 206 | unsigned int i; |
204 | 207 | ||
208 | (void) cls; | ||
205 | i=0; | 209 | i=0; |
206 | while ( (name_map[i].name != NULL) && | 210 | while ( (name_map[i].name != NULL) && |
207 | (type != name_map[i].number) ) | 211 | (type != name_map[i].number) ) |
@@ -221,6 +225,7 @@ libgnunet_plugin_gnsrecord_conversation_init (void *cls) | |||
221 | { | 225 | { |
222 | struct GNUNET_GNSRECORD_PluginFunctions *api; | 226 | struct GNUNET_GNSRECORD_PluginFunctions *api; |
223 | 227 | ||
228 | (void) cls; | ||
224 | api = GNUNET_new (struct GNUNET_GNSRECORD_PluginFunctions); | 229 | api = GNUNET_new (struct GNUNET_GNSRECORD_PluginFunctions); |
225 | api->value_to_string = &conversation_value_to_string; | 230 | api->value_to_string = &conversation_value_to_string; |
226 | api->string_to_value = &conversation_string_to_value; | 231 | api->string_to_value = &conversation_string_to_value; |