diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/mesh/mesh_api_new.c | 4 | ||||
-rw-r--r-- | src/mesh/mesh_protocol.h | 3 | ||||
-rw-r--r-- | src/mesh/test_mesh_small.c | 10 |
3 files changed, 9 insertions, 8 deletions
diff --git a/src/mesh/mesh_api_new.c b/src/mesh/mesh_api_new.c index 6a58d14f0..273d35b2d 100644 --- a/src/mesh/mesh_api_new.c +++ b/src/mesh/mesh_api_new.c | |||
@@ -437,8 +437,8 @@ process_incoming_data (struct GNUNET_MESH_Handle *h, | |||
437 | if (handler->type == type) | 437 | if (handler->type == type) |
438 | { | 438 | { |
439 | if (GNUNET_OK == handler->callback (h->cls, t, NULL, /* FIXME ctx */ | 439 | if (GNUNET_OK == handler->callback (h->cls, t, NULL, /* FIXME ctx */ |
440 | peer, payload, NULL)) /* FIXME atsi */ | 440 | peer, payload, NULL)) |
441 | { | 441 | { /* FIXME atsi */ |
442 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 442 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
443 | "MESH: callback completed successfully\n"); | 443 | "MESH: callback completed successfully\n"); |
444 | } | 444 | } |
diff --git a/src/mesh/mesh_protocol.h b/src/mesh/mesh_protocol.h index ad62755e9..12723fdac 100644 --- a/src/mesh/mesh_protocol.h +++ b/src/mesh/mesh_protocol.h | |||
@@ -29,7 +29,8 @@ | |||
29 | #ifdef __cplusplus | 29 | #ifdef __cplusplus |
30 | extern "C" | 30 | extern "C" |
31 | { | 31 | { |
32 | #if 0 /* keep Emacsens' auto-indent happy */ | 32 | #if 0 |
33 | /* keep Emacsens' auto-indent happy */ | ||
33 | } | 34 | } |
34 | #endif | 35 | #endif |
35 | #endif | 36 | #endif |
diff --git a/src/mesh/test_mesh_small.c b/src/mesh/test_mesh_small.c index 6234d0359..cea1bef56 100644 --- a/src/mesh/test_mesh_small.c +++ b/src/mesh/test_mesh_small.c | |||
@@ -368,8 +368,9 @@ disconnect_mesh_peers (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
368 | GNUNET_assert (churn_task == GNUNET_SCHEDULER_NO_TASK); | 368 | GNUNET_assert (churn_task == GNUNET_SCHEDULER_NO_TASK); |
369 | churn_task = GNUNET_SCHEDULER_add_now (&churn_peers, NULL); | 369 | churn_task = GNUNET_SCHEDULER_add_now (&churn_peers, NULL); |
370 | } | 370 | } |
371 | else /* No more rounds, let's shut it down! */ | 371 | else |
372 | { | 372 | { /* No more rounds, let's shut it down! */ |
373 | |||
373 | stats_context = GNUNET_malloc (sizeof (struct StatsContext)); | 374 | stats_context = GNUNET_malloc (sizeof (struct StatsContext)); |
374 | GNUNET_SCHEDULER_cancel (shutdown_handle); | 375 | GNUNET_SCHEDULER_cancel (shutdown_handle); |
375 | shutdown_handle = GNUNET_SCHEDULER_NO_TASK; | 376 | shutdown_handle = GNUNET_SCHEDULER_NO_TASK; |
@@ -406,8 +407,8 @@ churn_callback (void *cls, const char *emsg) | |||
406 | { | 407 | { |
407 | char *temp_output_file; | 408 | char *temp_output_file; |
408 | 409 | ||
409 | if (emsg == NULL) /* Everything is okay! */ | 410 | if (emsg == NULL) |
410 | { | 411 | { /* Everything is okay! */ |
411 | peers_running = peers_next_round; | 412 | peers_running = peers_next_round; |
412 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 413 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, |
413 | "Round %llu, churn finished successfully.\n", current_round); | 414 | "Round %llu, churn finished successfully.\n", current_round); |
@@ -493,7 +494,6 @@ peergroup_ready (void *cls, const char *emsg) | |||
493 | GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL); | 494 | GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL); |
494 | return; | 495 | return; |
495 | } | 496 | } |
496 | |||
497 | #if VERBOSE | 497 | #if VERBOSE |
498 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer Group started successfully!\n"); | 498 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer Group started successfully!\n"); |
499 | #endif | 499 | #endif |