-fix many more typos

7 files changed, 40 insertions, 37 deletions

diff --git a/src/rps/gnunet-rps-profiler.c b/src/rps/gnunet-rps-profiler.c
index 908dcca17..6d1236f08 100644
--- a/src/rps/gnunet-rps-profiler.c
+++ b/src/rps/gnunet-rps-profiler.c
@@ -44,7 +44,7 @@
 static uint32_t num_peers;
 
 /**
- * @brief numer of bits required to represent the largest peer id
+ * @brief number of bits required to represent the largest peer id
  */
 static unsigned bits_needed;
 
@@ -127,7 +127,7 @@ static char*stat_type_strings[] = {
   "# pushes sent",
   "# pull requests sent",
   "# pull requests sent (multi-hop peer)",
-  "# pull replys sent",
+  "# pull replies sent",
   "# push message received",
   "# push message received (multi-hop peer)",
   "# pull request message received",
@@ -1173,7 +1173,7 @@ trigger_shutdown (void *cls)
   (void) cls;
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Shutdown was triggerd by timeout, going down.\n");
+              "Shutdown was triggered by timeout, going down.\n");
   shutdown_task = NULL;
   GNUNET_SCHEDULER_shutdown ();
 }
@@ -2091,7 +2091,7 @@ profiler_cb (struct RPSPeer *rps_peer)
   }
 
   /* Only request peer ids at one peer.
-   * (It's the before-last because last one is target of the focussed attack.)
+   * (It's the before-last because last one is target of the focused attack.)
    */
   if (0 < rps_peer->num_ids_to_request)
     schedule_missing_requests (rps_peer);
@@ -2468,7 +2468,7 @@ void
 compute_diversity ()
 {
   uint32_t i;
-  /* ith entry represents the numer of occurrences in other peer's views */
+  /* ith entry represents the number of occurrences in other peer's views */
   uint32_t *count_peers = GNUNET_new_array (num_peers, uint32_t);
   uint32_t views_total_size;
   double expected;
diff --git a/src/rps/gnunet-service-rps.c b/src/rps/gnunet-service-rps.c
index 56eab288e..f6fcf3ae7 100644
--- a/src/rps/gnunet-service-rps.c
+++ b/src/rps/gnunet-service-rps.c
@@ -569,7 +569,7 @@ static struct GNUNET_PeerIdentity attacked_peer;
  * This is an assumption of the Brahms protocol and either implemented
  * via proof of work
  * or
- * assumend to be the bandwidth limitation.
+ * assumed to be the bandwidth limitation.
  */
 static uint32_t push_limit = 10000;
 #endif /* ENABLE_MALICIOUS */
@@ -599,6 +599,7 @@ do_round (void *cls);
 #if ENABLE_MALICIOUS
 static void
 do_mal_round (void *cls);
+
 #endif /* ENABLE_MALICIOUS */
 
 
@@ -634,7 +635,7 @@ get_peer_ctx (const struct GNUNET_CONTAINER_MultiPeerMap *peer_map,
  * @param peer peer in question
  *
  * @return #GNUNET_YES if peer is known
- *         #GNUNET_NO  if peer is not knwon
+ *         #GNUNET_NO  if peer is not known
  */
 static int
 check_peer_known (const struct GNUNET_CONTAINER_MultiPeerMap *peer_map,
@@ -1036,9 +1037,9 @@ get_channel (struct PeerContext *peer_ctx)
  * Get the message queue (#GNUNET_MQ_Handle) of a specific peer.
  *
  * If we already have a message queue open to this client,
- * simply return it, otherways create one.
+ * simply return it, otherwise create one.
  *
- * @param peer_ctx Context of the peer of whicht to get the mq
+ * @param peer_ctx Context of the peer of which to get the mq
  * @return the #GNUNET_MQ_Handle
  */
 static struct GNUNET_MQ_Handle *
@@ -1119,7 +1120,7 @@ mq_online_check_successful (void *cls)
   if (NULL != peer_ctx->online_check_pending)
   {
     LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Online check for peer %s was successfull\n",
+         "Online check for peer %s was successful\n",
          GNUNET_i2s (&peer_ctx->peer_id));
     remove_pending_message (peer_ctx->online_check_pending, GNUNET_YES);
     peer_ctx->online_check_pending = NULL;
@@ -1292,7 +1293,7 @@ destroy_peer (struct PeerContext *peer_ctx)
     LOG (GNUNET_ERROR_TYPE_DEBUG,
          "Removing unsent %s\n",
          peer_ctx->pending_messages_head->type);
-    /* Cancle pending message, too */
+    /* Cancel pending message, too */
     if ((NULL != peer_ctx->online_check_pending) &&
         (0 == memcmp (peer_ctx->pending_messages_head,
                       peer_ctx->online_check_pending,
@@ -1402,7 +1403,7 @@ mq_notify_sent_cb (void *cls)
   if (pending_msg->peer_ctx->sub == msub)
   {
     if (0 == strncmp ("PULL REPLY", pending_msg->type, 10))
-      GNUNET_STATISTICS_update (stats, "# pull replys sent", 1, GNUNET_NO);
+      GNUNET_STATISTICS_update (stats, "# pull replies sent", 1, GNUNET_NO);
     if (0 == strncmp ("PULL REQUEST", pending_msg->type, 12))
       GNUNET_STATISTICS_update (stats, "# pull requests sent", 1, GNUNET_NO);
     if (0 == strncmp ("PUSH", pending_msg->type, 4))
@@ -1417,7 +1418,7 @@ mq_notify_sent_cb (void *cls)
                                 1,
                                 GNUNET_NO);
   }
-  /* Do not cancle message */
+  /* Do not cancel message */
   remove_pending_message (pending_msg, GNUNET_NO);
 }
 
@@ -1544,7 +1545,7 @@ s2i_full (const char *string_repr)
   {
     LOG (GNUNET_ERROR_TYPE_WARNING,
          "Not able to convert string representation of PeerID to PeerID\n"
-         "Sting representation: %s (len %lu) - too short\n",
+         "String representation: %s (len %lu) - too short\n",
          string_repr,
          len);
     GNUNET_break (0);
@@ -1560,7 +1561,7 @@ s2i_full (const char *string_repr)
   {
     LOG (GNUNET_ERROR_TYPE_WARNING,
          "Not able to convert string representation of PeerID to PeerID\n"
-         "Sting representation: %s\n",
+         "String representation: %s\n",
          string_repr);
     GNUNET_break (0);
   }
@@ -2428,7 +2429,7 @@ hist_update (const struct GNUNET_PeerIdentity *ids,
     }
 #ifdef TO_FILE_FULL
     to_file (sub->file_name_view_log,
-             "+%s\t(hist)",
+             "+%s\t(history)",
              GNUNET_i2s_full (ids));
 #endif /* TO_FILE_FULL */
   }
@@ -2502,6 +2503,8 @@ add_peer_array_to_set (const struct GNUNET_PeerIdentity *peer_array,
     }
   }
 }
+
+
 #endif /* ENABLE_MALICIOUS */
 
 
@@ -2845,7 +2848,7 @@ cleanup_destroyed_channel (void *cls,
   else
   {
     /* We need this if-else construct because we need to make sure the channel
-     * (context) is cleaned up before removing the peer, but still neet to
+     * (context) is cleaned up before removing the peer, but still need to
      * compare it while checking the condition */
     remove_channel_ctx (channel_ctx);
   }
@@ -2998,7 +3001,7 @@ new_sub (const struct GNUNET_HashCode *hash,
 // /**
 //  * @brief Write all numbers in the given array into the given file
 //  *
-//  * Single numbers devided by a newline
+//  * Single numbers divided by a newline
 //  *
 //  * FIXME: The call to store_prefix_file_name expects the index of the peer,
 //  * which cannot be known to the service.
@@ -3014,14 +3017,14 @@ new_sub (const struct GNUNET_HashCode *hash,
 //   char collect_str[SIZE_DUMP_FILE + 1] = "";
 //   char *recv_str_iter;
 //   char *file_name_full;
-// 
+//
 //   recv_str_iter = collect_str;
 //   file_name_full = store_prefix_file_name (&own_identity,
 //                                            file_name);
 //   for (uint32_t i = 0; i < HISTOGRAM_FILE_SLOTS; i++)
 //   {
 //     char collect_str_tmp[8];
-// 
+//
 //     GNUNET_snprintf (collect_str_tmp,
 //                      sizeof(collect_str_tmp),
 //                      "%" PRIu32 "\n",
@@ -3213,7 +3216,7 @@ adapt_sizes (struct Sub *sub, double logestimate, double std_dev)
 {
   double estimate;
 
-  // double scale; // TODO this might go gloabal/config
+  // double scale; // TODO this might go global/config
 
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Received a ns estimate - logest: %f, std_dev: %f (old_size: %u)\n",
@@ -3359,7 +3362,7 @@ handle_client_seed (void *cls,
  * Handle RPS request from the client.
  *
  * @param cls Client context
- * @param message Message containing the numer of updates the client wants to
+ * @param message Message containing the number of updates the client wants to
  * receive
  */
 static void
diff --git a/src/rps/gnunet-service-rps_custommap.c b/src/rps/gnunet-service-rps_custommap.c
index 392c29397..b1e73be17 100644
--- a/src/rps/gnunet-service-rps_custommap.c
+++ b/src/rps/gnunet-service-rps_custommap.c
@@ -48,10 +48,10 @@
  *
  * This list is expected to
  * - be altered in small steps frequently
- * - be cleared regularily
+ * - be cleared regularly
  * - often being queried whether a peer is contained
  * - alter indices of peers
- * - contain continous indices 0 <= i < len
+ * - contain continuous indices 0 <= i < len
  * - not contain duplicate peers
  */
 struct CustomPeerMap
diff --git a/src/rps/rps-sampler_common.c b/src/rps/rps-sampler_common.c
index 488ed8e01..a30ba06a1 100644
--- a/src/rps/rps-sampler_common.c
+++ b/src/rps/rps-sampler_common.c
@@ -661,7 +661,7 @@ RPS_sampler_get_rand_peer_info (struct RPS_Sampler *sampler,
 
 
 /**
- * Cancle a request issued through #RPS_sampler_n_rand_peers_ready_cb.
+ * Cancel a request issued through #RPS_sampler_n_rand_peers_ready_cb.
  *
  * @param req_handle the handle to the request
  */
@@ -699,7 +699,7 @@ RPS_sampler_request_cancel (struct RPS_SamplerRequestHandle *req_handle)
 
 
 /**
- * Cancle a request issued through #RPS_sampler_sinlge_info_ready_cb.
+ * Cancel a request issued through #RPS_sampler_sinlge_info_ready_cb.
  *
  * @param req_handle the handle to the request
  */
diff --git a/src/rps/rps-test_util.c b/src/rps/rps-test_util.c
index 6dee20c95..8fd82f7b3 100644
--- a/src/rps/rps-test_util.c
+++ b/src/rps/rps-test_util.c
@@ -20,7 +20,7 @@
 
 /**
  * @file rps/rps-test_util.c
- * @brief Some utils faciliating the view into the internals for the sampler
+ * @brief Some utils facilitating the view into the internals for the sampler
  *        needed for evaluation
  *
  * @author Julius Bünger
diff --git a/src/rps/rps_api.c b/src/rps/rps_api.c
index 8b69dae96..bb4c3597e 100644
--- a/src/rps/rps_api.c
+++ b/src/rps/rps_api.c
@@ -714,7 +714,7 @@ reconnect (struct GNUNET_RPS_Handle *h);
 /**
  * Error handler for mq.
  *
- * This function is called whan mq encounters an error.
+ * This function is called when mq encounters an error.
  * Until now mq doesn't provide useful error messages.
  *
  * @param cls the closure
@@ -1192,9 +1192,9 @@ GNUNET_RPS_act_malicious (struct GNUNET_RPS_Handle *h,
 
 
 /**
- * Cancle an issued request.
+ * Cancel an issued request.
  *
- * @param rh request handle of request to cancle
+ * @param rh request handle of request to cancel
  */
 void
 GNUNET_RPS_request_cancel (struct GNUNET_RPS_Request_Handle *rh)
@@ -1223,9 +1223,9 @@ GNUNET_RPS_request_cancel (struct GNUNET_RPS_Request_Handle *rh)
 
 
 /**
- * Cancle an issued single info request.
+ * Cancel an issued single info request.
  *
- * @param rhs request handle of request to cancle
+ * @param rhs request handle of request to cancel
  */
 void
 GNUNET_RPS_request_single_info_cancel (
diff --git a/src/rps/test_rps.c b/src/rps/test_rps.c
index de09b423f..ab132ec8a 100644
--- a/src/rps/test_rps.c
+++ b/src/rps/test_rps.c
@@ -1957,7 +1957,7 @@ profiler_cb (struct RPSPeer *rps_peer)
   }
 
   /* Only request peer ids at one peer.
-   * (It's the before-last because last one is target of the focussed attack.)
+   * (It's the before-last because last one is target of the focused attack.)
    */
   if (eval_peer == rps_peer)
     schedule_missing_requests (rps_peer);
@@ -2306,7 +2306,7 @@ void
 compute_diversity ()
 {
   uint32_t i;
-  /* ith entry represents the numer of occurrences in other peer's views */
+  /* ith entry represents the number of occurrences in other peer's views */
   uint32_t *count_peers = GNUNET_new_array (num_peers, uint32_t);
   uint32_t views_total_size;
   double expected;
@@ -2596,8 +2596,8 @@ stat_str_2_type (const char *stat_str)
   {
     return STAT_TYPE_SENT_PULL_REQ;
   }
-  else if (0 == strncmp ("# pull replys sent", stat_str, strlen (
-                           "# pull replys sent")))
+  else if (0 == strncmp ("# pull replies sent", stat_str, strlen (
+                           "# pull replies sent")))
   {
     return STAT_TYPE_SENT_PULL_REP;
   }
@@ -2670,7 +2670,7 @@ stat_type_2_str (enum STAT_TYPE stat_type)
     return "# pull requests sent";
 
   case STAT_TYPE_SENT_PULL_REP:
-    return "# pull replys sent";
+    return "# pull replies sent";
 
   case STAT_TYPE_RECV_PUSH_SEND:
     return "# push message received";