16 files changed, 63 insertions, 63 deletions

diff --git a/src/fs/fs_api.c b/src/fs/fs_api.c
index 920786146..63b17a93e 100644
--- a/src/fs/fs_api.c
+++ b/src/fs/fs_api.c
@@ -584,7 +584,7 @@ GNUNET_FS_data_reader_copy_ (void *cls,
  *
  * @param h master context
  * @param ext component of the path
- * @param ent entity identifier (or emtpy string for the directory)
+ * @param ent entity identifier (or empty string for the directory)
  * @return NULL on error
  */
 static char *
@@ -624,7 +624,7 @@ get_serialization_file_name (struct GNUNET_FS_Handle *h,
  * @param h master context
  * @param ext component of the path
  * @param uni name of the parent operation
- * @param ent entity identifier (or emtpy string for the directory)
+ * @param ent entity identifier (or empty string for the directory)
  * @return NULL on error
  */
 static char *
@@ -664,7 +664,7 @@ get_serialization_file_name_in_dir (struct GNUNET_FS_Handle *h,
  *
  * @param h master context
  * @param ext component of the path
- * @param ent entity identifier (or emtpy string for the directory)
+ * @param ent entity identifier (or empty string for the directory)
  * @return NULL on error
  */
 static struct GNUNET_BIO_ReadHandle *
@@ -687,7 +687,7 @@ get_read_handle (struct GNUNET_FS_Handle *h, const char *ext, const char *ent)
  *
  * @param h master context
  * @param ext component of the path
- * @param ent entity identifier (or emtpy string for the directory)
+ * @param ent entity identifier (or empty string for the directory)
  * @return NULL on error
  */
 static struct GNUNET_BIO_WriteHandle *
@@ -712,7 +712,7 @@ get_write_handle (struct GNUNET_FS_Handle *h, const char *ext, const char *ent)
  * @param h master context
  * @param ext component of the path
  * @param uni name of parent
- * @param ent entity identifier (or emtpy string for the directory)
+ * @param ent entity identifier (or empty string for the directory)
  * @return NULL on error
  */
 static struct GNUNET_BIO_WriteHandle *
@@ -877,7 +877,7 @@ read_start_time (struct GNUNET_BIO_ReadHandle *rh,
  *
  * @param h master context
  * @param filename name of the file (without directory) with
- *        the infromation
+ *        the information
  * @return NULL on error
  */
 static struct GNUNET_FS_FileInformation *
@@ -890,7 +890,7 @@ deserialize_file_information (struct GNUNET_FS_Handle *h, const char *filename);
  *
  * @param h master context
  * @param fn name of the file (without directory) with
- *        the infromation
+ *        the information
  * @param rh handle for reading
  * @return NULL on error
  */
@@ -1152,7 +1152,7 @@ cleanup:
  *
  * @param h master context
  * @param filename name of the file (without directory) with
- *        the infromation
+ *        the information
  * @return NULL on error
  */
 static struct GNUNET_FS_FileInformation *
@@ -1230,7 +1230,7 @@ get_serialization_short_name (const char *fullname)
  *
  * @param h master context
  * @param ext component of the path
- * @return NULL on errror
+ * @return NULL on error
  */
 static char *
 make_serialization_file_name (struct GNUNET_FS_Handle *h, const char *ext)
@@ -1266,7 +1266,7 @@ make_serialization_file_name (struct GNUNET_FS_Handle *h, const char *ext)
  * @param h master context
  * @param ext component of the path
  * @param uni name of parent
- * @return NULL on errror
+ * @return NULL on error
  */
 static char *
 make_serialization_file_name_in_dir (struct GNUNET_FS_Handle *h,
@@ -2535,7 +2535,7 @@ static int
 deserialize_search_result (void *cls, const char *filename)
 {
   struct GNUNET_FS_SearchContext *sc = cls;
-  char *ser;
+  char *serialized;
   char *uris;
   char *emsg;
   char *download;
@@ -2544,19 +2544,19 @@ deserialize_search_result (void *cls, const char *filename)
   struct GNUNET_BIO_ReadHandle *drh;
   struct GNUNET_FS_SearchResult *sr;
 
-  ser = get_serialization_short_name (filename);
+  serialized = get_serialization_short_name (filename);
   rh = GNUNET_BIO_read_open_file (filename);
   if (NULL == rh)
   {
-    if (NULL != ser)
+    if (NULL != serialized)
     {
       remove_sync_file_in_dir (sc->h,
                                (NULL == sc->psearch_result)
                                ? GNUNET_FS_SYNC_PATH_MASTER_SEARCH
                                : GNUNET_FS_SYNC_PATH_CHILD_SEARCH,
                                sc->serialization,
-                               ser);
-      GNUNET_free (ser);
+                               serialized);
+      GNUNET_free (serialized);
     }
     return GNUNET_OK;
   }
@@ -2567,7 +2567,7 @@ deserialize_search_result (void *cls, const char *filename)
   sr = GNUNET_new (struct GNUNET_FS_SearchResult);
   sr->h = sc->h;
   sr->sc = sc;
-  sr->serialization = ser;
+  sr->serialization = serialized;
   if ((GNUNET_OK !=
        GNUNET_BIO_read_string (rh, "result-uri", &uris, 10 * 1024)) ||
       (NULL == (sr->uri = GNUNET_FS_uri_parse (uris, &emsg))) ||
@@ -2850,32 +2850,32 @@ static int
 deserialize_subdownload (void *cls, const char *filename)
 {
   struct GNUNET_FS_DownloadContext *parent = cls;
-  char *ser;
+  char *serialized;
   char *emsg;
   struct GNUNET_BIO_ReadHandle *rh;
 
-  ser = get_serialization_short_name (filename);
+  serialized = get_serialization_short_name (filename);
   rh = GNUNET_BIO_read_open_file (filename);
   if (NULL == rh)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                 _ (
                   "Failed to resume sub-download `%s': could not open file `%s'\n"),
-                ser,
+                serialized,
                 filename);
-    GNUNET_free (ser);
+    GNUNET_free (serialized);
     return GNUNET_OK;
   }
-  deserialize_download (parent->h, rh, parent, NULL, ser);
+  deserialize_download (parent->h, rh, parent, NULL, serialized);
   if (GNUNET_OK != GNUNET_BIO_read_close (rh, &emsg))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                 _ ("Failed to resume sub-download `%s': %s\n"),
-                ser,
+                serialized,
                 emsg);
     GNUNET_free (emsg);
   }
-  GNUNET_free (ser);
+  GNUNET_free (serialized);
   return GNUNET_OK;
 }
 
@@ -3146,7 +3146,7 @@ static int
 deserialize_search_file (void *cls, const char *filename)
 {
   struct GNUNET_FS_Handle *h = cls;
-  char *ser;
+  char *set;
   char *emsg;
   struct GNUNET_BIO_ReadHandle *rh;
   struct GNUNET_FS_SearchContext *sc;
@@ -3159,21 +3159,21 @@ deserialize_search_file (void *cls, const char *filename)
   }
   if (S_ISDIR (buf.st_mode))
     return GNUNET_OK; /* skip directories */
-  ser = get_serialization_short_name (filename);
+  set = get_serialization_short_name (filename);
   rh = GNUNET_BIO_read_open_file (filename);
   if (NULL == rh)
   {
-    if (NULL != ser)
+    if (NULL != set)
     {
-      GNUNET_FS_remove_sync_file_ (h, GNUNET_FS_SYNC_PATH_MASTER_SEARCH, ser);
-      GNUNET_free (ser);
+      GNUNET_FS_remove_sync_file_ (h, GNUNET_FS_SYNC_PATH_MASTER_SEARCH, set);
+      GNUNET_free (set);
     }
     return GNUNET_OK;
   }
-  sc = deserialize_search (h, rh, NULL, ser);
+  sc = deserialize_search (h, rh, NULL, set);
   if (NULL != sc)
     sc->top = GNUNET_FS_make_top (h, &GNUNET_FS_search_signal_suspend_, sc);
-  GNUNET_free (ser);
+  GNUNET_free (set);
   if (GNUNET_OK != GNUNET_BIO_read_close (rh, &emsg))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
@@ -3198,21 +3198,21 @@ static int
 deserialize_download_file (void *cls, const char *filename)
 {
   struct GNUNET_FS_Handle *h = cls;
-  char *ser;
+  char *set;
   char *emsg;
   struct GNUNET_BIO_ReadHandle *rh;
 
-  ser = get_serialization_short_name (filename);
+  set = get_serialization_short_name (filename);
   rh = GNUNET_BIO_read_open_file (filename);
   if (NULL == rh)
   {
     if (0 != unlink (filename))
       GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "unlink", filename);
-    GNUNET_free (ser);
+    GNUNET_free (set);
     return GNUNET_OK;
   }
-  deserialize_download (h, rh, NULL, NULL, ser);
-  GNUNET_free (ser);
+  deserialize_download (h, rh, NULL, NULL, set);
+  GNUNET_free (set);
   if (GNUNET_OK != GNUNET_BIO_read_close (rh, &emsg))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
@@ -3226,7 +3226,7 @@ deserialize_download_file (void *cls, const char *filename)
 
 
 /**
- * Deserialize informatin about pending operations.
+ * Deserialize information about pending operations.
  *
  * @param master_path which master directory should be scanned
  * @param proc function to call for each entry (will get @a h for 'cls')
diff --git a/src/fs/fs_directory.c b/src/fs/fs_directory.c
index 9f0f12611..eb7aac5bb 100644
--- a/src/fs/fs_directory.c
+++ b/src/fs/fs_directory.c
@@ -350,7 +350,7 @@ struct GNUNET_FS_DirectoryBuilder
   struct BuilderEntry *head;
 
   /**
-   * Number of entires in the directory.
+   * Number of entries in the directory.
    */
   unsigned int count;
 };
@@ -401,7 +401,7 @@ GNUNET_FS_directory_builder_add (struct GNUNET_FS_DirectoryBuilder *bld,
   size_t mds;
   size_t mdxs;
   char *uris;
-  char *ser;
+  char *serialized;
   char *sptr;
   size_t slen;
   struct GNUNET_CONTAINER_MetaData *meta;
@@ -456,10 +456,10 @@ GNUNET_FS_directory_builder_add (struct GNUNET_FS_DirectoryBuilder *bld,
     mds = GNUNET_MAX_MALLOC_CHECKED / 2;
   e = GNUNET_malloc (sizeof(struct BuilderEntry) + slen + mds
                      + sizeof(uint32_t));
-  ser = (char *) &e[1];
-  GNUNET_memcpy (ser, uris, slen);
+  serialized = (char *) &e[1];
+  GNUNET_memcpy (serialized, uris, slen);
   GNUNET_free (uris);
-  sptr = &ser[slen + sizeof(uint32_t)];
+  sptr = &serialized[slen + sizeof(uint32_t)];
   ret =
     GNUNET_CONTAINER_meta_data_serialize (meta_use, &sptr, mds,
                                           GNUNET_CONTAINER_META_DATA_SERIALIZE_PART);
@@ -470,7 +470,7 @@ GNUNET_FS_directory_builder_add (struct GNUNET_FS_DirectoryBuilder *bld,
   else
     mds = ret;
   big = htonl (mds);
-  GNUNET_memcpy (&ser[slen], &big, sizeof(uint32_t));
+  GNUNET_memcpy (&serialized[slen], &big, sizeof(uint32_t));
   e->len = slen + sizeof(uint32_t) + mds;
   e->next = bld->head;
   bld->head = e;
@@ -496,7 +496,7 @@ do_align (size_t start_position, size_t end_position)
 
 
 /**
- * Compute a permuation of the blocks to
+ * Compute a permutation of the blocks to
  * minimize the cost of alignment.  Greedy packer.
  *
  * @param start starting position for the first block
diff --git a/src/fs/fs_download.c b/src/fs/fs_download.c
index 1f8ce7c05..5c98d224a 100644
--- a/src/fs/fs_download.c
+++ b/src/fs/fs_download.c
@@ -343,7 +343,7 @@ full_recursive_download (struct GNUNET_FS_DownloadContext *dc)
       GNUNET_log (
         GNUNET_ERROR_TYPE_WARNING,
         _ (
-          "Failed to access full directroy contents of `%s' for recursive download\n"),
+          "Failed to access full directory contents of `%s' for recursive download\n"),
         dc->filename);
     }
     GNUNET_DISK_file_unmap (m);
@@ -1431,7 +1431,7 @@ try_reconnect (struct GNUNET_FS_DownloadContext *dc)
  * We're allowed to ask the FS service for our blocks.  Start the download.
  *
  * @param cls the 'struct GNUNET_FS_DownloadContext'
- * @param mq handle to use for communcation with FS (we must destroy it!)
+ * @param mq handle to use for communication with FS (we must destroy it!)
  */
 static void
 activate_fs_download (void *cls)
diff --git a/src/fs/fs_publish.c b/src/fs/fs_publish.c
index fddc65d67..f891f37a1 100644
--- a/src/fs/fs_publish.c
+++ b/src/fs/fs_publish.c
@@ -1431,7 +1431,7 @@ compute_contents_size (struct GNUNET_FS_FileInformation *fi)
  * @param h handle to the file sharing subsystem
  * @param fi information about the file or directory structure to publish
  * @param ns namespace to publish the file in, NULL for no namespace
- * @param nid identifier to use for the publishd content in the namespace
+ * @param nid identifier to use for the published content in the namespace
  *        (can be NULL, must be NULL if namespace is NULL)
  * @param nuid update-identifier that will be used for future updates
  *        (can be NULL, must be NULL if namespace or nid is NULL)
@@ -1560,7 +1560,7 @@ fip_signal_stop (void *cls,
 
 /**
  * Stop an upload.  Will abort incomplete uploads (but
- * not remove blocks that have already been publishd) or
+ * not remove blocks that have already been published) or
  * simply clean up the state for completed uploads.
  * Must NOT be called from within the event callback!
  *
diff --git a/src/fs/fs_sharetree.c b/src/fs/fs_sharetree.c
index d5e75f9be..3610b202e 100644
--- a/src/fs/fs_sharetree.c
+++ b/src/fs/fs_sharetree.c
@@ -32,7 +32,7 @@
 
 /**
  * Entry for each unique keyword to track how often
- * it occured.  Contains the keyword and the counter.
+ * it occurred.  Contains the keyword and the counter.
  */
 struct KeywordCounter
 {
diff --git a/src/fs/fs_tree.c b/src/fs/fs_tree.c
index 6203690d2..4d49809f8 100644
--- a/src/fs/fs_tree.c
+++ b/src/fs/fs_tree.c
@@ -434,7 +434,7 @@ GNUNET_FS_tree_encoder_get_uri (struct GNUNET_FS_TreeEncoder *te)
  * about possible errors.
  *
  * @param te the tree encoder to clean up
- * @param emsg set to an error message (if an error occured
+ * @param emsg set to an error message (if an error occurred
  *        within the tree encoder; if this function is called
  *        prior to completion and prior to an internal error,
  *        both "*emsg" will be set to NULL).
diff --git a/src/fs/fs_uri.c b/src/fs/fs_uri.c
index 4d1b7c6f0..73ea5d60d 100644
--- a/src/fs/fs_uri.c
+++ b/src/fs/fs_uri.c
@@ -25,7 +25,7 @@
  *
  * GNUnet URIs are of the general form "gnunet://MODULE/IDENTIFIER".
  * The specific structure of "IDENTIFIER" depends on the module and
- * maybe differenciated into additional subcategories if applicable.
+ * maybe differentiated into additional subcategories if applicable.
  * This module only deals with fs identifiers (MODULE = "fs").
  * <p>
  *
@@ -213,7 +213,7 @@ GNUNET_FS_uri_ksk_to_string_fancy (const struct GNUNET_FS_Uri *uri)
  *
  * @param in string with %-encoding
  * @param emsg where to store the parser error message (if any)
- * @return decodded string with leading space (or preserved plus)
+ * @return decoded string with leading space (or preserved plus)
  */
 static char *
 percent_decode_keyword (const char *in, char **emsg)
diff --git a/src/fs/gnunet-publish.c b/src/fs/gnunet-publish.c
index dea467669..c62edcd61 100644
--- a/src/fs/gnunet-publish.c
+++ b/src/fs/gnunet-publish.c
@@ -508,7 +508,7 @@ uri_ksk_continuation (void *cls,
  * Iterate over the results from the directory scan and extract
  * the desired information for the publishing operation.
  *
- * @param item root with the data from the directroy scan
+ * @param item root with the data from the directory scan
  * @return handle with the information for the publishing operation
  */
 static struct GNUNET_FS_FileInformation *
diff --git a/src/fs/gnunet-service-fs.c b/src/fs/gnunet-service-fs.c
index cf9069918..e90ba4c8b 100644
--- a/src/fs/gnunet-service-fs.c
+++ b/src/fs/gnunet-service-fs.c
@@ -63,7 +63,7 @@
     GNUNET_TIME_UNIT_SECONDS, 5)
 
 /**
- * Collect an instane number of statistics?  May cause excessive IPC.
+ * Collect an instance number of statistics?  May cause excessive IPC.
  */
 #define INSANE_STATISTICS GNUNET_NO
 
diff --git a/src/fs/gnunet-service-fs_cadet_client.c b/src/fs/gnunet-service-fs_cadet_client.c
index 96ccf8232..398fcd604 100644
--- a/src/fs/gnunet-service-fs_cadet_client.c
+++ b/src/fs/gnunet-service-fs_cadet_client.c
@@ -655,7 +655,7 @@ GSF_cadet_query (const struct GNUNET_PeerIdentity *target,
 
 /**
  * Cancel an active request; must not be called after 'proc'
- * was calld.
+ * was called.
  *
  * @param sr request to cancel
  */
diff --git a/src/fs/gnunet-service-fs_cp.c b/src/fs/gnunet-service-fs_cp.c
index dca8ae2a8..c174ad611 100644
--- a/src/fs/gnunet-service-fs_cp.c
+++ b/src/fs/gnunet-service-fs_cp.c
@@ -53,7 +53,7 @@
                                                      2)
 
 /**
- * Collect an instane number of statistics?  May cause excessive IPC.
+ * Collect an instance number of statistics?  May cause excessive IPC.
  */
 #define INSANE_STATISTICS GNUNET_NO
 
diff --git a/src/fs/gnunet-service-fs_pe.c b/src/fs/gnunet-service-fs_pe.c
index bb4b07c02..60dd0ab70 100644
--- a/src/fs/gnunet-service-fs_pe.c
+++ b/src/fs/gnunet-service-fs_pe.c
@@ -30,7 +30,7 @@
 #include "gnunet-service-fs_pr.h"
 
 /**
- * Collect an instane number of statistics?  May cause excessive IPC.
+ * Collect an instance number of statistics?  May cause excessive IPC.
  */
 #define INSANE_STATISTICS GNUNET_NO
 
diff --git a/src/fs/gnunet-service-fs_pr.c b/src/fs/gnunet-service-fs_pr.c
index 150dd72e2..a5db4b6b7 100644
--- a/src/fs/gnunet-service-fs_pr.c
+++ b/src/fs/gnunet-service-fs_pr.c
@@ -49,7 +49,7 @@
 /**
  * Bandwidth value of a 0-priority content (must be fairly high
  * compared to query since content is typically significantly larger
- * -- and more valueable since it can take many queries to get one
+ * -- and more valuable since it can take many queries to get one
  * piece of content).
  */
 #define CONTENT_BANDWIDTH_VALUE 800
@@ -60,7 +60,7 @@
 #define MAX_RESULTS (100 * 1024)
 
 /**
- * Collect an instane number of statistics?  May cause excessive IPC.
+ * Collect an instance number of statistics?  May cause excessive IPC.
  */
 #define INSANE_STATISTICS GNUNET_NO
 
@@ -241,7 +241,7 @@ static unsigned long long max_pending_requests = (32 * 1024);
  * will create a new bloom filter from scratch, so it should only be
  * called if we have no bloomfilter at all (and hence can create a
  * fresh one of minimal size without problems) OR if our peer is the
- * initiator (in which case we may resize to larger than mimimum size).
+ * initiator (in which case we may resize to larger than minimum size).
  *
  * @param type type of the request
  * @param pr request for which the BF is to be recomputed
@@ -287,7 +287,7 @@ refresh_bloomfilter (enum GNUNET_BLOCK_Type type, struct GSF_PendingRequest *pr)
  * @param bf_size number of bytes in @a bf_data
  * @param mingle mingle value for bf
  * @param anonymity_level desired anonymity level
- * @param priority maximum outgoing cummulative request priority to use
+ * @param priority maximum outgoing cumulative request priority to use
  * @param ttl current time-to-live for the request
  * @param sender_pid peer ID to use for the sender when forwarding, 0 for none
  * @param origin_pid peer ID of origin of query (do not loop back)
diff --git a/src/fs/gnunet-service-fs_put.c b/src/fs/gnunet-service-fs_put.c
index ddc15820a..93333b7a2 100644
--- a/src/fs/gnunet-service-fs_put.c
+++ b/src/fs/gnunet-service-fs_put.c
@@ -66,7 +66,7 @@ struct PutOperator
   struct GNUNET_SCHEDULER_Task *dht_task;
 
   /**
-   * How many entires with zero anonymity of our type do we currently
+   * How many entries with zero anonymity of our type do we currently
    * estimate to have in the database?
    */
   uint64_t zero_anonymity_count_estimate;
diff --git a/src/fs/test_fs_directory.c b/src/fs/test_fs_directory.c
index 1b109c4d4..908e7c555 100644
--- a/src/fs/test_fs_directory.c
+++ b/src/fs/test_fs_directory.c
@@ -139,7 +139,7 @@ testDirectory (unsigned int i)
                                                 (start),
                                               GNUNET_YES);
   fprintf (stdout,
-           "Creating directory with %u entires and total size %llu took %s\n",
+           "Creating directory with %u entries and total size %llu took %s\n",
            i, (unsigned long long) dlen, s);
   if (i < 100)
   {
diff --git a/src/fs/test_fs_file_information.c b/src/fs/test_fs_file_information.c
index 9d0978e06..22013db27 100644
--- a/src/fs/test_fs_file_information.c
+++ b/src/fs/test_fs_file_information.c
@@ -24,7 +24,7 @@
  * @author Christian Grothoff
  *
  * TODO:
- * - test that metatdata, etc. are all correct (for example,
+ * - test that metadata, etc. are all correct (for example,
  *   there is a known bug with dirname never being set that is
  *   not detected!)
  * - need to iterate over file-information structure