From b479dddcac56ec8352b8730470ed6cdaf4b929c5 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Tue, 24 Dec 2013 14:48:36 +0000 Subject: -remove trailing whitespace --- src/conversation/conversation_api_call.c | 2 +- src/conversation/gnunet-service-conversation.c | 2 +- src/core/test_core_api_mq.c | 6 +++--- src/gns/w32nsp-resolve.c | 2 +- src/hostlist/gnunet-daemon-hostlist.c | 8 ++++---- src/hostlist/hostlist-client.c | 2 +- src/include/gnunet_mesh_service.h | 2 +- src/include/gnunet_secretsharing_service.h | 2 +- src/include/gnunet_testbed_service.h | 2 +- src/scalarproduct/scalarproduct_api.c | 4 ++-- src/secretsharing/gnunet-secretsharing-profiler.c | 10 +++++----- src/secretsharing/secretsharing.h | 2 +- src/set/gnunet-service-set.c | 2 +- src/set/gnunet-service-set_intersection.c | 22 +++++++++++----------- src/set/set_api.c | 2 +- src/set/set_protocol.h | 14 +++++++------- src/testbed/gnunet-service-testbed_cache.c | 2 +- .../gnunet-service-testbed_connectionpool.c | 2 +- src/testbed/gnunet-testbed-profiler.c | 2 +- src/testbed/testbed.h | 4 ++-- src/testbed/testbed_api_underlay.c | 8 ++++---- src/transport/gnunet-helper-transport-bluetooth.c | 2 +- src/transport/gnunet-helper-transport-wlan-dummy.c | 2 +- src/util/signal.c | 2 +- 24 files changed, 54 insertions(+), 54 deletions(-) (limited to 'src') diff --git a/src/conversation/conversation_api_call.c b/src/conversation/conversation_api_call.c index befbbc910..379947087 100644 --- a/src/conversation/conversation_api_call.c +++ b/src/conversation/conversation_api_call.c @@ -524,7 +524,7 @@ reconnect_call (struct GNUNET_CONVERSATION_Call *call) GNUNET_CONVERSATION_EC_CALL_ERROR); return; } - + call->mq = GNUNET_MQ_queue_for_connection_client (call->client, handlers, &call_error_handler, diff --git a/src/conversation/gnunet-service-conversation.c b/src/conversation/gnunet-service-conversation.c index 58d1254cc..0fc19c510 100644 --- a/src/conversation/gnunet-service-conversation.c +++ b/src/conversation/gnunet-service-conversation.c @@ -958,7 +958,7 @@ handle_mesh_ring_message (void *cls, cring.cid = ch->cid; cring.caller_id = msg->caller_id; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Sending RING message to client. CID %u:(%u, %u)\n", + "Sending RING message to client. CID %u:(%u, %u)\n", ch->cid, ch->remote_line, line->local_line); GNUNET_SERVER_notification_context_unicast (nc, line->client, diff --git a/src/core/test_core_api_mq.c b/src/core/test_core_api_mq.c index 7a255e00f..c71c26b76 100644 --- a/src/core/test_core_api_mq.c +++ b/src/core/test_core_api_mq.c @@ -65,7 +65,7 @@ connect_cb (void *cls, const struct GNUNET_PeerIdentity *peer) struct GNUNET_MQ_Envelope *ev; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Queueing messages.\n"); for (i = 0; i < NUM_MSG; i++) - { + { ev = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_TEST); GNUNET_MQ_send (mq, ev); } @@ -107,13 +107,13 @@ shutdown_task (void *cls, /** * Initialize framework and start test - * + * * @param cls Closure (unused). * @param cfg Configuration handle. * @param peer Testing peer handle. */ static void -run (void *cls, +run (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg, struct GNUNET_TESTING_Peer *peer) { diff --git a/src/gns/w32nsp-resolve.c b/src/gns/w32nsp-resolve.c index f8f4a43be..0259ddb55 100644 --- a/src/gns/w32nsp-resolve.c +++ b/src/gns/w32nsp-resolve.c @@ -385,7 +385,7 @@ main (int argc, char **argv) ADDRINFOW hints; ADDRINFOW *result; ADDRINFOW *pos; - + memset (&hints, 0, sizeof (struct addrinfo)); hints.ai_family = AF_UNSPEC; hints.ai_socktype = SOCK_STREAM; diff --git a/src/hostlist/gnunet-daemon-hostlist.c b/src/hostlist/gnunet-daemon-hostlist.c index b83356d10..a93d7e37d 100644 --- a/src/hostlist/gnunet-daemon-hostlist.c +++ b/src/hostlist/gnunet-daemon-hostlist.c @@ -204,7 +204,7 @@ disconnect_handler (void *cls, const struct GNUNET_PeerIdentity *peer) static void cleaning_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Hostlist daemon is shutting down\n"); if (core != NULL) { @@ -265,9 +265,9 @@ run (void *cls, char *const *args, const char *cfgfile, &client_adv_handler, learning); core = GNUNET_CORE_connect (cfg, NULL, - &core_init, + &core_init, &connect_handler, - &disconnect_handler, NULL, + &disconnect_handler, NULL, GNUNET_NO, NULL, GNUNET_NO, learning ? learn_handlers : no_learn_handlers); @@ -278,7 +278,7 @@ run (void *cls, char *const *args, const char *cfgfile, GNUNET_HOSTLIST_server_start (cfg, stats, core, &server_ch, &server_dh, advertising); #endif - GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, + GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &cleaning_task, NULL); diff --git a/src/hostlist/hostlist-client.c b/src/hostlist/hostlist-client.c index 42c4dc994..8271ecc0c 100644 --- a/src/hostlist/hostlist-client.c +++ b/src/hostlist/hostlist-client.c @@ -1277,7 +1277,7 @@ load_hostlist_file () } GNUNET_log (GNUNET_ERROR_TYPE_INFO, - _("Loading saved hostlist entries from file `%s' \n"), + _("Loading saved hostlist entries from file `%s' \n"), filename); if (GNUNET_NO == GNUNET_DISK_file_test (filename)) { diff --git a/src/include/gnunet_mesh_service.h b/src/include/gnunet_mesh_service.h index 785197471..a5ebcb1ce 100644 --- a/src/include/gnunet_mesh_service.h +++ b/src/include/gnunet_mesh_service.h @@ -145,7 +145,7 @@ struct GNUNET_MESH_MessageHandler * the other peer initiated. * Only called (once) upon reception of data with a message type which was * subscribed to in #GNUNET_MESH_connect. - * + * * A call to #GNUNET_MESH_channel_destroy causes te channel to be ignored. In * this case the handler MUST return NULL. * diff --git a/src/include/gnunet_secretsharing_service.h b/src/include/gnunet_secretsharing_service.h index 4479f0d80..7eb372ef5 100644 --- a/src/include/gnunet_secretsharing_service.h +++ b/src/include/gnunet_secretsharing_service.h @@ -246,7 +246,7 @@ GNUNET_SECRETSHARING_share_read (void *data, size_t len); * Convert a share to its binary representation. Use * #GNUNET_SECRETSHARING_share_size to get the necessary size for the binary * representation. - * + * * @param share share to write * @param buf buffer to write to * @param buflen number of writable bytes in @a buffer diff --git a/src/include/gnunet_testbed_service.h b/src/include/gnunet_testbed_service.h index b204804d1..60fcb64af 100644 --- a/src/include/gnunet_testbed_service.h +++ b/src/include/gnunet_testbed_service.h @@ -1653,7 +1653,7 @@ GNUNET_TESTBED_underlaylinkmodel_add_peer (struct GNUNET_TESTBED_UnderlayLinkMod /** * Set the metrics for a link to the given peer in the underlay model. The link * SHOULD be permittable according to the given model. - * + * * @ingroup underlay * @param model the model * @param peer the other end peer of the link diff --git a/src/scalarproduct/scalarproduct_api.c b/src/scalarproduct/scalarproduct_api.c index dcacd85c9..13c35a28d 100644 --- a/src/scalarproduct/scalarproduct_api.c +++ b/src/scalarproduct/scalarproduct_api.c @@ -318,7 +318,7 @@ transmit_request (void *cls, size_t size, * @param element_count Number of elements in the vector * @param cont Callback function * @param cont_cls Closure for the callback function - * + * * @return a new handle for this computation */ struct GNUNET_SCALARPRODUCT_ComputationHandle * @@ -408,7 +408,7 @@ GNUNET_SCALARPRODUCT_response (const struct GNUNET_CONFIGURATION_Handle * cfg, * @param mask_bytes number of bytes in the mask * @param cont Callback function * @param cont_cls Closure for the callback function - * + * * @return a new handle for this computation */ struct GNUNET_SCALARPRODUCT_ComputationHandle * diff --git a/src/secretsharing/gnunet-secretsharing-profiler.c b/src/secretsharing/gnunet-secretsharing-profiler.c index 6e06ede63..a9bce4a14 100755 --- a/src/secretsharing/gnunet-secretsharing-profiler.c +++ b/src/secretsharing/gnunet-secretsharing-profiler.c @@ -1,5 +1,5 @@ -int -main () -{ - return 0; -} +int +main () +{ + return 0; +} diff --git a/src/secretsharing/secretsharing.h b/src/secretsharing/secretsharing.h index 8bd1b05b5..0af21028d 100644 --- a/src/secretsharing/secretsharing.h +++ b/src/secretsharing/secretsharing.h @@ -53,7 +53,7 @@ struct GNUNET_SECRETSHARING_CreateMessage struct GNUNET_TIME_AbsoluteNBO deadline; /** - * Mininum number of cooperating peers to decrypt a + * Mininum number of cooperating peers to decrypt a * value. */ uint16_t threshold GNUNET_PACKED; diff --git a/src/set/gnunet-service-set.c b/src/set/gnunet-service-set.c index 9cc2e56f6..b5aa659be 100644 --- a/src/set/gnunet-service-set.c +++ b/src/set/gnunet-service-set.c @@ -517,7 +517,7 @@ incoming_suggest (struct Operation *incoming, struct Listener *listener) { struct GNUNET_MQ_Envelope *mqm; struct GNUNET_SET_RequestMessage *cmsg; - + GNUNET_assert (GNUNET_YES == incoming->is_incoming); GNUNET_assert (NULL != incoming->state); GNUNET_assert (NULL != incoming->spec); diff --git a/src/set/gnunet-service-set_intersection.c b/src/set/gnunet-service-set_intersection.c index 1bfda430a..a28938e04 100644 --- a/src/set/gnunet-service-set_intersection.c +++ b/src/set/gnunet-service-set_intersection.c @@ -93,12 +93,12 @@ struct OperationState * size of the bloomfilter */ uint32_t bf_data_size; - + /** * size of the bloomfilter */ uint32_t bf_bits_per_element; - + /** * Current state of the operation. */ @@ -445,7 +445,7 @@ send_bloomfilter (struct Operation *op) struct GNUNET_CONTAINER_BloomFilter * local_bf; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "sending bf of size %u\n"); - + CALCULATE_BF_SIZE(op->state->my_element_count, op->spec->remote_element_count, bf_size, @@ -586,7 +586,7 @@ static void process_bf (struct Operation *op){ uint32_t old_elements; uint32_t peer_elements; - + old_elements = op->state->my_element_count; peer_elements = op->spec->remote_element_count; switch (op->state->phase) @@ -650,18 +650,18 @@ handle_p2p_bf_part (void *cls, const struct GNUNET_MessageHeader *mh) const struct BFPart *msg = (const struct BFPart *) mh; uint32_t chunk_size; uint32_t chunk_offset; - + chunk_size = ntohl(msg->chunk_length); chunk_offset = ntohl(msg->chunk_offset); - - if ((NULL == op->state->bf_data) + + if ((NULL == op->state->bf_data) || (op->state->bf_data_size < chunk_size + chunk_offset)){ // unexpected multipart chunk GNUNET_break_op (0); fail_intersection_operation(op); return; } - + memcpy (&op->state->bf_data[chunk_offset], (const char*) &msg[1], chunk_size); if (op->state->bf_data_size != chunk_offset + chunk_size) @@ -671,10 +671,10 @@ handle_p2p_bf_part (void *cls, const struct GNUNET_MessageHeader *mh) op->state->remote_bf = GNUNET_CONTAINER_bloomfilter_init ((const char*) &msg[1], op->state->bf_data_size, op->state->bf_bits_per_element); - + GNUNET_free (op->state->bf_data); op->state->bf_data = NULL; - + process_bf (op); } @@ -750,7 +750,7 @@ handle_p2p_element_info (void *cls, const struct GNUNET_MessageHeader *mh) op->state->phase = PHASE_BF_EXCHANGE; op->state->my_elements = GNUNET_CONTAINER_multihashmap_create (1, GNUNET_YES); - + GNUNET_CONTAINER_multihashmap_iterate (op->spec->set->elements, &iterator_initialization, op); diff --git a/src/set/set_api.c b/src/set/set_api.c index 908fa1a1d..951ac2b5b 100644 --- a/src/set/set_api.c +++ b/src/set/set_api.c @@ -428,7 +428,7 @@ set_operation_cancel (struct GNUNET_SET_OperationHandle *oh) } GNUNET_free (oh); - + return ret; } diff --git a/src/set/set_protocol.h b/src/set/set_protocol.h index b48809a3c..9ed9c57d7 100644 --- a/src/set/set_protocol.h +++ b/src/set/set_protocol.h @@ -53,7 +53,7 @@ struct OperationRequestMessage * For Intersection: my element count */ uint32_t element_count; - + /** * Application-specific identifier of the request. */ @@ -104,7 +104,7 @@ struct BFMessage * mutator used with this bloomfilter. */ uint32_t sender_element_count GNUNET_PACKED; - + /** * mutator used with this bloomfilter. */ @@ -114,17 +114,17 @@ struct BFMessage * Length of the bloomfilter data */ uint32_t bloomfilter_total_length GNUNET_PACKED; - + /** * Length of the appended bloomfilter data block */ uint32_t bloomfilter_length GNUNET_PACKED; - + /** * Length of the bloomfilter data */ uint32_t bits_per_element GNUNET_PACKED; - + /** * rest: the sender's bloomfilter */ @@ -141,12 +141,12 @@ struct BFPart * Length of the appended bloomfilter data block */ uint32_t chunk_length GNUNET_PACKED; - + /** * offset in the bloolfilter data block, if multipart message */ uint32_t chunk_offset GNUNET_PACKED; - + /** * rest: the sender's bloomfilter */ diff --git a/src/testbed/gnunet-service-testbed_cache.c b/src/testbed/gnunet-service-testbed_cache.c index 7f2a35a7d..070aeefa5 100644 --- a/src/testbed/gnunet-service-testbed_cache.c +++ b/src/testbed/gnunet-service-testbed_cache.c @@ -121,7 +121,7 @@ static struct CacheEntry * add_entry (unsigned int peer_id) { struct CacheEntry *entry; - + GNUNET_assert (NULL != cache); if (cache_size == GNUNET_CONTAINER_multihashmap32_size (cache)) { diff --git a/src/testbed/gnunet-service-testbed_connectionpool.c b/src/testbed/gnunet-service-testbed_connectionpool.c index 0df5c300c..6d9a27972 100644 --- a/src/testbed/gnunet-service-testbed_connectionpool.c +++ b/src/testbed/gnunet-service-testbed_connectionpool.c @@ -895,7 +895,7 @@ GST_connection_pool_get_handle_done (struct GST_ConnectionPool_GetHandle *gh) } } if (gh->notify_waiting) - { + { GNUNET_CONTAINER_DLL_remove (entry->head_notify, entry->tail_notify, gh); gh->notify_waiting = 0; } diff --git a/src/testbed/gnunet-testbed-profiler.c b/src/testbed/gnunet-testbed-profiler.c index f5d7599c3..17f1d6ba9 100644 --- a/src/testbed/gnunet-testbed-profiler.c +++ b/src/testbed/gnunet-testbed-profiler.c @@ -230,7 +230,7 @@ test_run (void *cls, result = GNUNET_OK; fprintf (stdout, "\n"); print_overlay_links_summary (); - if (noninteractive) + if (noninteractive) { GNUNET_SCHEDULER_cancel (abort_task); abort_task = GNUNET_SCHEDULER_NO_TASK; diff --git a/src/testbed/testbed.h b/src/testbed/testbed.h index 107e1c5bb..6f6a3f31e 100644 --- a/src/testbed/testbed.h +++ b/src/testbed/testbed.h @@ -790,7 +790,7 @@ struct GNUNET_TESTBED_UnderlayLinkModelMsg * The number of link properties contained in this message */ uint32_t nprops GNUNET_PACKED; - + /** * Array of ids of peers to be in the blacklist/whitelist. Each id is of type * uint32_t. Number of ids should be equal to nentries. @@ -801,7 +801,7 @@ struct GNUNET_TESTBED_UnderlayLinkModelMsg * sequence of four integers of type uint32_t: peer_id, latency, loss and * bandwidth. */ - + }; diff --git a/src/testbed/testbed_api_underlay.c b/src/testbed/testbed_api_underlay.c index a1c90ac6e..0f90d0360 100644 --- a/src/testbed/testbed_api_underlay.c +++ b/src/testbed/testbed_api_underlay.c @@ -21,7 +21,7 @@ /** * @file testbed/testbed_api_underlay.c * @brief testbed underlay API implementation - * @author Sree Harsha Totakura + * @author Sree Harsha Totakura */ #include "testbed_api_peers.h" @@ -46,7 +46,7 @@ struct LinkProperty * latency of the link in microseconds */ uint32_t latency; - + /** * data loss on the link expressed as percentage */ @@ -154,7 +154,7 @@ GNUNET_TESTBED_underlaylinkmodel_create (struct GNUNET_TESTBED_Peer *peer, enum GNUNET_TESTBED_UnderlayLinkModelType type) { struct GNUNET_TESTBED_UnderlayLinkModel *m; - + GNUNET_assert (0 == peer->underlay_model_exists); m = GNUNET_new (struct GNUNET_TESTBED_UnderlayLinkModel); peer->underlay_model_exists = 1; @@ -188,7 +188,7 @@ GNUNET_TESTBED_underlaylinkmodel_add_peer (struct GNUNET_TESTBED_UnderlayLinkMod /** * Set the metrics for a link to the given peer in the underlay model. The link * SHOULD be permittable according to the given model. - * + * * @ingroup underlay * @param model the model * @param peer the other end peer of the link diff --git a/src/transport/gnunet-helper-transport-bluetooth.c b/src/transport/gnunet-helper-transport-bluetooth.c index 9d5318663..3f32edc45 100644 --- a/src/transport/gnunet-helper-transport-bluetooth.c +++ b/src/transport/gnunet-helper-transport-bluetooth.c @@ -1088,7 +1088,7 @@ open_device (struct HardwareInfos *dev) addr.btAddr = 0; addr.port = BT_PORT_ANY; - if (GNUNET_OK != + if (GNUNET_OK != GNUNET_NETWORK_socket_bind (dev->handle, (const SOCKADDR*)&addr, sizeof (SOCKADDR_BTH))) { fprintf (stderr, "Failed to bind the socket: "); diff --git a/src/transport/gnunet-helper-transport-wlan-dummy.c b/src/transport/gnunet-helper-transport-wlan-dummy.c index e6be00a73..162774b5d 100644 --- a/src/transport/gnunet-helper-transport-wlan-dummy.c +++ b/src/transport/gnunet-helper-transport-wlan-dummy.c @@ -315,7 +315,7 @@ main (int argc, char *argv[]) signal (SIGINT, &sigfunc); signal (SIGTERM, &sigfunc); signal (GNUNET_TERM_SIG, &sigfunc); - + write_std.size = 0; write_std.pos = 0; write_pout.size = 0; diff --git a/src/util/signal.c b/src/util/signal.c index b76c658c8..84237f65d 100644 --- a/src/util/signal.c +++ b/src/util/signal.c @@ -120,7 +120,7 @@ void GNUNET_SIGNAL_raise (const int sig) { struct GNUNET_SIGNAL_Context *ctx; - + for (ctx = sc_head; NULL != ctx; ctx = ctx->next) { if (sig != ctx->sig) -- cgit v1.2.3