From 33e87eb7680148006b7c9fc8f89040ad104597ea Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 19 Jun 2019 21:20:39 +0200 Subject: fix socket cmp, fix compiler warnings about unused args --- src/nse/gnunet-nse.c | 38 ++++++++++++++++++++------------------ src/nse/nse_api.c | 43 ++++++++++++++++--------------------------- 2 files changed, 36 insertions(+), 45 deletions(-) (limited to 'src/nse') diff --git a/src/nse/gnunet-nse.c b/src/nse/gnunet-nse.c index bf2fe11c3..c8ffa152e 100644 --- a/src/nse/gnunet-nse.c +++ b/src/nse/gnunet-nse.c @@ -46,6 +46,7 @@ static int status; static void do_shutdown (void *cls) { + (void) cls; if (NULL != nse) { GNUNET_NSE_disconnect (nse); @@ -65,12 +66,14 @@ do_shutdown (void *cls) */ static void handle_estimate (void *cls, - struct GNUNET_TIME_Absolute timestamp, + struct GNUNET_TIME_Absolute timestamp, double estimate, - double std_dev) + double std_dev) { + (void) cls; status = 0; - FPRINTF (stdout, "%llu %f %f %f\n", + FPRINTF (stdout, + "%llu %f %f %f\n", (unsigned long long) timestamp.abs_value_us, GNUNET_NSE_log_estimate_to_n (estimate), estimate, @@ -92,11 +95,11 @@ run (void *cls, const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg) { - nse = GNUNET_NSE_connect (cfg, - &handle_estimate, - NULL); - GNUNET_SCHEDULER_add_shutdown (&do_shutdown, - NULL); + (void) cls; + (void) args; + (void) cfgfile; + nse = GNUNET_NSE_connect (cfg, &handle_estimate, NULL); + GNUNET_SCHEDULER_add_shutdown (&do_shutdown, NULL); } @@ -106,22 +109,21 @@ run (void *cls, * @return 0 on success */ int -main (int argc, - char *const *argv) +main (int argc, char *const *argv) { static struct GNUNET_GETOPT_CommandLineOption options[] = { - GNUNET_GETOPT_OPTION_END - }; + GNUNET_GETOPT_OPTION_END}; status = 1; if (GNUNET_OK != GNUNET_PROGRAM_run (argc, - argv, - "gnunet-nse", - gettext_noop - ("Show network size estimates from NSE service."), - options, - &run, NULL)) + argv, + "gnunet-nse", + gettext_noop ( + "Show network size estimates from NSE service."), + options, + &run, + NULL)) return 2; return status; } diff --git a/src/nse/nse_api.c b/src/nse/nse_api.c index e9eaada93..259be75ed 100644 --- a/src/nse/nse_api.c +++ b/src/nse/nse_api.c @@ -32,7 +32,7 @@ #include "gnunet_nse_service.h" #include "nse.h" -#define LOG(kind,...) GNUNET_log_from (kind, "nse-api",__VA_ARGS__) +#define LOG(kind, ...) GNUNET_log_from (kind, "nse-api", __VA_ARGS__) /** * Handle for talking with the NSE service. @@ -68,7 +68,6 @@ struct GNUNET_NSE_Handle * Closure to pass to @e recv_cb callback. */ void *recv_cb_cls; - }; @@ -91,17 +90,15 @@ reconnect (void *cls); * @param error error code */ static void -mq_error_handler (void *cls, - enum GNUNET_MQ_Error error) +mq_error_handler (void *cls, enum GNUNET_MQ_Error error) { struct GNUNET_NSE_Handle *h = cls; + (void) error; GNUNET_MQ_destroy (h->mq); h->mq = NULL; - h->reconnect_task - = GNUNET_SCHEDULER_add_delayed (h->reconnect_delay, - &reconnect, - h); + h->reconnect_task = + GNUNET_SCHEDULER_add_delayed (h->reconnect_delay, &reconnect, h); h->reconnect_delay = GNUNET_TIME_STD_BACKOFF (h->reconnect_delay); } @@ -114,8 +111,7 @@ mq_error_handler (void *cls, * @param client_msg message received */ static void -handle_estimate (void *cls, - const struct GNUNET_NSE_ClientMessage *client_msg) +handle_estimate (void *cls, const struct GNUNET_NSE_ClientMessage *client_msg) { struct GNUNET_NSE_Handle *h = cls; @@ -123,7 +119,7 @@ handle_estimate (void *cls, h->recv_cb (h->recv_cb_cls, GNUNET_TIME_absolute_ntoh (client_msg->timestamp), GNUNET_ntoh_double (client_msg->size_estimate), - GNUNET_ntoh_double (client_msg->std_deviation)); + GNUNET_ntoh_double (client_msg->std_deviation)); } @@ -136,13 +132,12 @@ static void reconnect (void *cls) { struct GNUNET_NSE_Handle *h = cls; - struct GNUNET_MQ_MessageHandler handlers[] = { - GNUNET_MQ_hd_fixed_size (estimate, - GNUNET_MESSAGE_TYPE_NSE_ESTIMATE, - struct GNUNET_NSE_ClientMessage, - h), - GNUNET_MQ_handler_end () - }; + struct GNUNET_MQ_MessageHandler handlers[] = + {GNUNET_MQ_hd_fixed_size (estimate, + GNUNET_MESSAGE_TYPE_NSE_ESTIMATE, + struct GNUNET_NSE_ClientMessage, + h), + GNUNET_MQ_handler_end ()}; struct GNUNET_MessageHeader *msg; struct GNUNET_MQ_Envelope *env; @@ -150,17 +145,11 @@ reconnect (void *cls) LOG (GNUNET_ERROR_TYPE_DEBUG, "Connecting to network size estimation service.\n"); GNUNET_assert (NULL == h->mq); - h->mq = GNUNET_CLIENT_connect (h->cfg, - "nse", - handlers, - &mq_error_handler, - h); + h->mq = GNUNET_CLIENT_connect (h->cfg, "nse", handlers, &mq_error_handler, h); if (NULL == h->mq) return; - env = GNUNET_MQ_msg (msg, - GNUNET_MESSAGE_TYPE_NSE_START); - GNUNET_MQ_send (h->mq, - env); + env = GNUNET_MQ_msg (msg, GNUNET_MESSAGE_TYPE_NSE_START); + GNUNET_MQ_send (h->mq, env); } -- cgit v1.2.3 From 2111b3716776f2a1e6e6b38888c8dea42907c09d Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 19 Jun 2019 21:25:50 +0200 Subject: fix compiler warnings about unused args --- src/core/core_api.c | 5 ++- src/core/core_api_monitor_peers.c | 34 +++++++---------- src/core/gnunet-core.c | 80 ++++++++++++++++++++------------------- src/nse/gnunet-service-nse.c | 21 +++++++++- 4 files changed, 78 insertions(+), 62 deletions(-) (limited to 'src/nse') diff --git a/src/core/core_api.c b/src/core/core_api.c index 6381d9097..223677a5b 100644 --- a/src/core/core_api.c +++ b/src/core/core_api.c @@ -341,6 +341,7 @@ core_mq_cancel_impl (struct GNUNET_MQ_Handle *mq, void *impl_state) { struct PeerRecord *pr = impl_state; + (void) mq; GNUNET_assert (NULL != pr->env); GNUNET_MQ_discard (pr->env); pr->env = NULL; @@ -359,7 +360,8 @@ static void core_mq_error_handler (void *cls, enum GNUNET_MQ_Error error) { /* struct PeerRecord *pr = cls; */ - + (void) cls; + (void) error; GNUNET_break_op (0); } @@ -530,6 +532,7 @@ check_notify_inbound (void *cls, const struct NotifyTrafficMessage *ntm) uint16_t msize; const struct GNUNET_MessageHeader *em; + (void) cls; msize = ntohs (ntm->header.size) - sizeof (struct NotifyTrafficMessage); if (msize < sizeof (struct GNUNET_MessageHeader)) { diff --git a/src/core/core_api_monitor_peers.c b/src/core/core_api_monitor_peers.c index 0ebb94d7b..165f741d2 100644 --- a/src/core/core_api_monitor_peers.c +++ b/src/core/core_api_monitor_peers.c @@ -54,7 +54,6 @@ struct GNUNET_CORE_MonitorHandle * Closure for @e peer_cb. */ void *peer_cb_cls; - }; @@ -77,11 +76,11 @@ reconnect (struct GNUNET_CORE_MonitorHandle *mh); * @param error error code */ static void -handle_mq_error (void *cls, - enum GNUNET_MQ_Error error) +handle_mq_error (void *cls, enum GNUNET_MQ_Error error) { struct GNUNET_CORE_MonitorHandle *mh = cls; + (void) error; reconnect (mh); } @@ -93,8 +92,7 @@ handle_mq_error (void *cls, * @param mon_message monitor message */ static void -handle_receive_info (void *cls, - const struct MonitorNotifyMessage *mon_message) +handle_receive_info (void *cls, const struct MonitorNotifyMessage *mon_message) { struct GNUNET_CORE_MonitorHandle *mh = cls; @@ -114,24 +112,20 @@ handle_receive_info (void *cls, static void reconnect (struct GNUNET_CORE_MonitorHandle *mh) { - struct GNUNET_MQ_MessageHandler handlers[] = { - GNUNET_MQ_hd_fixed_size (receive_info, - GNUNET_MESSAGE_TYPE_CORE_MONITOR_NOTIFY, - struct MonitorNotifyMessage, - mh), - GNUNET_MQ_handler_end () - }; + struct GNUNET_MQ_MessageHandler handlers[] = + {GNUNET_MQ_hd_fixed_size (receive_info, + GNUNET_MESSAGE_TYPE_CORE_MONITOR_NOTIFY, + struct MonitorNotifyMessage, + mh), + GNUNET_MQ_handler_end ()}; struct GNUNET_MQ_Envelope *env; struct GNUNET_MessageHeader *msg; if (NULL != mh->mq) GNUNET_MQ_destroy (mh->mq); /* FIXME: use backoff? */ - mh->mq = GNUNET_CLIENT_connect (mh->cfg, - "core", - handlers, - &handle_mq_error, - mh); + mh->mq = + GNUNET_CLIENT_connect (mh->cfg, "core", handlers, &handle_mq_error, mh); if (NULL == mh->mq) return; /* notify callback about reconnect */ @@ -140,10 +134,8 @@ reconnect (struct GNUNET_CORE_MonitorHandle *mh) NULL, GNUNET_CORE_KX_CORE_DISCONNECT, GNUNET_TIME_UNIT_FOREVER_ABS); - env = GNUNET_MQ_msg (msg, - GNUNET_MESSAGE_TYPE_CORE_MONITOR_PEERS); - GNUNET_MQ_send (mh->mq, - env); + env = GNUNET_MQ_msg (msg, GNUNET_MESSAGE_TYPE_CORE_MONITOR_PEERS); + GNUNET_MQ_send (mh->mq, env); } diff --git a/src/core/gnunet-core.c b/src/core/gnunet-core.c index 7180754a9..674da705a 100644 --- a/src/core/gnunet-core.c +++ b/src/core/gnunet-core.c @@ -48,6 +48,7 @@ static struct GNUNET_CORE_MonitorHandle *mh; static void shutdown_task (void *cls) { + (void) cls; if (NULL != mh) { GNUNET_CORE_monitor_stop (mh); @@ -71,13 +72,13 @@ monitor_cb (void *cls, enum GNUNET_CORE_KxState state, struct GNUNET_TIME_Absolute timeout) { - struct GNUNET_TIME_Absolute now = GNUNET_TIME_absolute_get(); + struct GNUNET_TIME_Absolute now = GNUNET_TIME_absolute_get (); const char *now_str; const char *state_str; - if ( ( (NULL == peer) || - (GNUNET_CORE_KX_ITERATION_FINISHED == state) ) && - (GNUNET_NO == monitor_connections) ) + (void) cls; + if (((NULL == peer) || (GNUNET_CORE_KX_ITERATION_FINISHED == state)) && + (GNUNET_NO == monitor_connections)) { GNUNET_SCHEDULER_shutdown (); return; @@ -87,42 +88,43 @@ monitor_cb (void *cls, { case GNUNET_CORE_KX_STATE_DOWN: /* should never happen, as we immediately send the key */ - state_str = _("fresh connection"); + state_str = _ ("fresh connection"); break; case GNUNET_CORE_KX_STATE_KEY_SENT: - state_str = _("key sent"); + state_str = _ ("key sent"); break; case GNUNET_CORE_KX_STATE_KEY_RECEIVED: - state_str = _("key received"); + state_str = _ ("key received"); break; case GNUNET_CORE_KX_STATE_UP: - state_str = _("connection established"); + state_str = _ ("connection established"); break; case GNUNET_CORE_KX_STATE_REKEY_SENT: - state_str = _("rekeying"); + state_str = _ ("rekeying"); break; case GNUNET_CORE_KX_PEER_DISCONNECT: - state_str = _("disconnected"); + state_str = _ ("disconnected"); break; case GNUNET_CORE_KX_ITERATION_FINISHED: return; case GNUNET_CORE_KX_CORE_DISCONNECT: FPRINTF (stderr, "%s\n", - _("Connection to CORE service lost (reconnecting)")); + _ ("Connection to CORE service lost (reconnecting)")); return; default: - state_str = _("unknown state"); + state_str = _ ("unknown state"); break; } now_str = GNUNET_STRINGS_absolute_time_to_string (now); FPRINTF (stdout, - _("%24s: %-30s %4s (timeout in %6s)\n"), + _ ("%24s: %-30s %4s (timeout in %6s)\n"), now_str, state_str, GNUNET_i2s (peer), - GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_remaining (timeout), - GNUNET_YES)); + GNUNET_STRINGS_relative_time_to_string ( + GNUNET_TIME_absolute_get_remaining (timeout), + GNUNET_YES)); } @@ -135,24 +137,22 @@ monitor_cb (void *cls, * @param cfg configuration */ static void -run (void *cls, char *const *args, const char *cfgfile, +run (void *cls, + char *const *args, + const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg) { + (void) cls; + (void) cfgfile; if (NULL != args[0]) { - FPRINTF (stderr, - _("Invalid command line argument `%s'\n"), - args[0]); + FPRINTF (stderr, _ ("Invalid command line argument `%s'\n"), args[0]); return; } - mh = GNUNET_CORE_monitor_start (cfg, - &monitor_cb, - NULL); + mh = GNUNET_CORE_monitor_start (cfg, &monitor_cb, NULL); if (NULL == mh) { - FPRINTF (stderr, - "%s", - _("Failed to connect to CORE service!\n")); + FPRINTF (stderr, "%s", _ ("Failed to connect to CORE service!\n")); return; } GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL); @@ -167,24 +167,28 @@ run (void *cls, char *const *args, const char *cfgfile, * @return 0 ok, 1 on error */ int -main (int argc, - char *const *argv) +main (int argc, char *const *argv) { int res; - struct GNUNET_GETOPT_CommandLineOption options[] = { - GNUNET_GETOPT_option_flag ('m', - "monitor", - gettext_noop ("provide information about all current connections (continuously)"), - &monitor_connections), - GNUNET_GETOPT_OPTION_END - }; + struct GNUNET_GETOPT_CommandLineOption options[] = + {GNUNET_GETOPT_option_flag ( + 'm', + "monitor", + gettext_noop ( + "provide information about all current connections (continuously)"), + &monitor_connections), + GNUNET_GETOPT_OPTION_END}; if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) return 2; - res = GNUNET_PROGRAM_run (argc, argv, "gnunet-core", - gettext_noop - ("Print information about connected peers."), - options, &run, NULL); + res = GNUNET_PROGRAM_run (argc, + argv, + "gnunet-core", + gettext_noop ( + "Print information about connected peers."), + options, + &run, + NULL); GNUNET_free ((void *) argv); if (GNUNET_OK == res) diff --git a/src/nse/gnunet-service-nse.c b/src/nse/gnunet-service-nse.c index 09316dbcf..fd83d2b67 100644 --- a/src/nse/gnunet-service-nse.c +++ b/src/nse/gnunet-service-nse.c @@ -430,6 +430,7 @@ handle_start (void *cls, const struct GNUNET_MessageHeader *message) struct GNUNET_NSE_ClientMessage em; struct GNUNET_MQ_Envelope *env; + (void) message; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received START message from client\n"); mq = GNUNET_SERVICE_client_get_mq (client); GNUNET_notification_context_add (nc, mq); @@ -717,6 +718,8 @@ schedule_current_round (void *cls, struct NSEPeerEntry *peer_entry = value; struct GNUNET_TIME_Relative delay; + (void) cls; + (void) key; if (NULL != peer_entry->transmit_task) { GNUNET_SCHEDULER_cancel (peer_entry->transmit_task); @@ -749,8 +752,8 @@ static void update_flood_message (void *cls) { struct GNUNET_TIME_Relative offset; - unsigned int i; + (void) cls; flood_task = NULL; offset = GNUNET_TIME_absolute_get_remaining (next_timestamp); if (0 != offset.rel_value_us) @@ -780,7 +783,7 @@ update_flood_message (void *cls) setup_flood_message (estimate_index, current_timestamp); next_message.matching_bits = htonl (0); /* reset for 'next' round */ hop_count_max = 0; - for (i = 0; i < HISTORY_SIZE; i++) + for (unsigned int i = 0; i < HISTORY_SIZE; i++) hop_count_max = GNUNET_MAX (ntohl (size_estimate_messages[i].hop_count), hop_count_max); GNUNET_CONTAINER_multipeermap_iterate (peers, &schedule_current_round, NULL); @@ -869,6 +872,7 @@ find_proof (void *cls) struct GNUNET_HashCode result; unsigned int i; + (void) cls; proof_task = NULL; GNUNET_memcpy (&buf[sizeof (uint64_t)], &my_identity, @@ -967,6 +971,7 @@ update_flood_times (void *cls, struct NSEPeerEntry *peer_entry = value; struct GNUNET_TIME_Relative delay; + (void) key; if (peer_entry == exclude) return GNUNET_OK; /* trigger of the update */ if (GNUNET_NO == peer_entry->previous_round) @@ -1178,6 +1183,7 @@ handle_core_connect (void *cls, { struct NSEPeerEntry *peer_entry; + (void) cls; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer `%s' connected to us\n", GNUNET_i2s (peer)); @@ -1217,6 +1223,7 @@ handle_core_disconnect (void *cls, { struct NSEPeerEntry *pos = internal_cls; + (void) cls; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer `%s' disconnected from us\n", GNUNET_i2s (peer)); @@ -1243,6 +1250,8 @@ handle_core_disconnect (void *cls, static void flush_comp_cb (void *cls, size_t size) { + (void) cls; + (void) size; GNUNET_TESTBED_LOGGER_disconnect (lh); lh = NULL; } @@ -1257,6 +1266,7 @@ flush_comp_cb (void *cls, size_t size) static void shutdown_task (void *cls) { + (void) cls; if (NULL != flood_task) { GNUNET_SCHEDULER_cancel (flood_task); @@ -1324,6 +1334,7 @@ core_init (void *cls, const struct GNUNET_PeerIdentity *identity) struct GNUNET_TIME_Absolute now; struct GNUNET_TIME_Absolute prev_time; + (void) cls; if (NULL == identity) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Connection to core FAILED!\n"); @@ -1365,6 +1376,7 @@ core_init (void *cls, const struct GNUNET_PeerIdentity *identity) static void status_cb (void *cls, int status) { + (void) cls; logger_test = NULL; if (GNUNET_YES != status) { @@ -1402,6 +1414,8 @@ run (void *cls, char *proof; struct GNUNET_CRYPTO_EddsaPrivateKey *pk; + (void) cls; + (void) service; cfg = c; if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_time (cfg, "NSE", @@ -1524,6 +1538,8 @@ client_connect_cb (void *cls, struct GNUNET_SERVICE_Client *c, struct GNUNET_MQ_Handle *mq) { + (void) cls; + (void) mq; return c; } @@ -1540,6 +1556,7 @@ client_disconnect_cb (void *cls, struct GNUNET_SERVICE_Client *c, void *internal_cls) { + (void) cls; GNUNET_assert (c == internal_cls); } -- cgit v1.2.3