comments/docs: Fix couple of typos

https://bugzilla.gnome.org/show_bug.cgi?id=668857

diff --git a/glib/gbase64.c b/glib/gbase64.c
index 5839936..d0ab0ea 100644 (file)
--- a/glib/gbase64.c
+++ b/glib/gbase64.c
@@ -403,7 +403,7 @@ g_base64_decode (const gchar *text,
   input_length = strlen (text);
 
   /* We can use a smaller limit here, since we know the saved state is 0,
-     +1 used to avoid calling g_malloc0(0), and hence retruning NULL */
+     +1 used to avoid calling g_malloc0(0), and hence returning NULL */
   ret = g_malloc0 ((input_length / 4) * 3 + 1);
 
   *out_len = g_base64_decode_step (text, input_length, ret, &state, &save);

diff --git a/glib/gbookmarkfile.c b/glib/gbookmarkfile.c
index 4709cdf..7f1422a 100644 (file)
--- a/glib/gbookmarkfile.c
+++ b/glib/gbookmarkfile.c
@@ -1834,7 +1834,7 @@ find_file_in_data_dirs (const gchar   *file,
  * @full_path.  If the file could not be loaded then an %error is
  * set to either a #GFileError or #GBookmarkFileError.
  *
- * Return value: %TRUE if a key file could be loaded, %FALSE othewise
+ * Return value: %TRUE if a key file could be loaded, %FALSE otherwise
  *
  * Since: 2.12
  */

diff --git a/glib/gchecksum.c b/glib/gchecksum.c
index a503ddf..e860243 100644 (file)
--- a/glib/gchecksum.c
+++ b/glib/gchecksum.c
@@ -564,7 +564,7 @@ sha1_transform (guint32  buf[5],
   D = buf[3];
   E = buf[4];
 
-  /* Heavy mangling, in 4 sub-rounds of 20 interations each. */
+  /* Heavy mangling, in 4 sub-rounds of 20 iterations each. */
   subRound (A, B, C, D, E, f1, K1, in[0]);
   subRound (E, A, B, C, D, f1, K1, in[1]);
   subRound (D, E, A, B, C, f1, K1, in[2]);

diff --git a/glib/gdataset.c b/glib/gdataset.c
index df5203e..263ae18 100644 (file)
--- a/glib/gdataset.c
+++ b/glib/gdataset.c
@@ -203,7 +203,7 @@ static inline GQuark        g_quark_new                     (gchar          *string);
 G_LOCK_DEFINE_STATIC (g_dataset_global);
 static GHashTable   *g_dataset_location_ht = NULL;
 static GDataset     *g_dataset_cached = NULL; /* should this be
-                                                threadspecific? */
+                                                thread specific? */
 G_LOCK_DEFINE_STATIC (g_quark_global);
 static GHashTable   *g_quark_ht = NULL;
 static gchar       **g_quarks = NULL;
@@ -838,7 +838,7 @@ g_datalist_id_get_data (GData        **datalist,
  * @key: the string identifying a data element.
  * @Returns: the data element, or %NULL if it is not found.
  *
- * Gets a data element, using its string identifer. This is slower than
+ * Gets a data element, using its string identifier. This is slower than
  * g_datalist_id_get_data() because it compares strings.
  **/
 gpointer

diff --git a/glib/gdate.c b/glib/gdate.c
index 3292a03..d9b25f3 100644 (file)
--- a/glib/gdate.c
+++ b/glib/gdate.c
@@ -1879,7 +1879,7 @@ g_date_get_sunday_weeks_in_year (GDateYear year)
  * @lhs: first date to compare
  * @rhs: second date to compare
  *
- * qsort()-style comparsion function for dates.
+ * qsort()-style comparison function for dates.
  * Both dates must be valid.
  *
  * Returns: 0 for equal, less than zero if @lhs is less than @rhs,

diff --git a/glib/ggettext.c b/glib/ggettext.c
index 7af37bf..41b8abc 100644 (file)
--- a/glib/ggettext.c
+++ b/glib/ggettext.c
@@ -144,7 +144,7 @@ glib_gettext (const gchar *str)
  * This is an internal function and should only be used by
  * the internals of glib (such as libgio).
  *
- * Returns: the transation of @str to the current locale
+ * Returns: the translation of @str to the current locale
  */
 const gchar *
 glib_pgettext (const gchar *msgctxtid,

diff --git a/glib/grand.c b/glib/grand.c
index 1a99893..0405628 100644 (file)
--- a/glib/grand.c
+++ b/glib/grand.c
@@ -321,7 +321,7 @@ g_rand_set_seed (GRand* rand, guint32 seed)
       /* [KNUTH 1981, The Art of Computer Programming */
       /*    Vol. 2 (2nd Ed.), pp102]                  */
       
-      if (seed == 0) /* This would make the PRNG procude only zeros */
+      if (seed == 0) /* This would make the PRNG produce only zeros */
        seed = 0x6b842128; /* Just set it to another number */
       
       rand->mt[0]= seed;

diff --git a/glib/gsequence.c b/glib/gsequence.c
index 04e867b..c17357a 100644 (file)
--- a/glib/gsequence.c
+++ b/glib/gsequence.c
@@ -521,7 +521,7 @@ g_sequence_insert_before (GSequenceIter *iter,
  * Removes the item pointed to by @iter. It is an error to pass the
  * end iterator to this function.
  *
- * If the sequnce has a data destroy function associated with it, this
+ * If the sequence has a data destroy function associated with it, this
  * function is called on the data for the removed item.
  *
  * Since: 2.14

diff --git a/glib/gslice.c b/glib/gslice.c
index a1a7e9a..b70724d 100644 (file)
--- a/glib/gslice.c
+++ b/glib/gslice.c
@@ -410,7 +410,7 @@ g_slice_init_nomessage (void)
    * fit less than 8 times (see [4]) into 4KB pages.
    * we allow very small page sizes here, to reduce wastage in
    * threads if only small allocations are required (this does
-   * bear the risk of incresing allocation times and fragmentation
+   * bear the risk of increasing allocation times and fragmentation
    * though).
    */
   allocator->min_page_size = MAX (allocator->min_page_size, 4096);
@@ -1509,7 +1509,7 @@ smc_notify_free (void   *pointer,
 /* --- g-slice memory checker tree implementation --- */
 #define SMC_TRUNK_COUNT     (4093 /* 16381 */)          /* prime, to distribute trunk collisions (big, allocated just once) */
 #define SMC_BRANCH_COUNT    (511)                       /* prime, to distribute branch collisions */
-#define SMC_TRUNK_EXTENT    (SMC_BRANCH_COUNT * 2039)   /* key adress space per trunk, should distribute uniformly across BRANCH_COUNT */
+#define SMC_TRUNK_EXTENT    (SMC_BRANCH_COUNT * 2039)   /* key address space per trunk, should distribute uniformly across BRANCH_COUNT */
 #define SMC_TRUNK_HASH(k)   ((k / SMC_TRUNK_EXTENT) % SMC_TRUNK_COUNT)  /* generate new trunk hash per megabyte (roughly) */
 #define SMC_BRANCH_HASH(k)  (k % SMC_BRANCH_COUNT)
 

diff --git a/glib/gtester.c b/glib/gtester.c
index e9d695f..279f6f2 100644 (file)
--- a/glib/gtester.c
+++ b/glib/gtester.c
@@ -722,7 +722,7 @@ static int
 main_selftest (int    argc,
                char **argv)
 {
-  /* gtester main() for --gtester-selftest invokations */
+  /* gtester main() for --gtester-selftest invocations */
   g_test_init (&argc, &argv, NULL);
   g_test_add ("/gtester/fixture-test", guint, NULL, fixture_setup, fixture_test, fixture_teardown);
   return g_test_run();

diff --git a/glib/gthread-posix.c b/glib/gthread-posix.c
index 5d1344d..63b3313 100644 (file)
--- a/glib/gthread-posix.c
+++ b/glib/gthread-posix.c
@@ -834,7 +834,7 @@ g_cond_broadcast (GCond *cond)
  * Notice that the end time is calculated once, before entering the
  * loop and reused.  This is the motivation behind the use of absolute
  * time on this API -- if a relative time of 5 seconds were passed
- * directly to the call and a spurious wakeup occured, the program would
+ * directly to the call and a spurious wakeup occurred, the program would
  * have to start over waiting again (which would lead to a total wait
  * time of more than 5 seconds).
  *