typofix: in-code comments

Signed-off-by: Ondřej Bílka <neleai@seznam.cz>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/compat/nedmalloc/Readme.txt b/compat/nedmalloc/Readme.txt
index e46d8f112cc6a2c39f5ae922ef8b2ca5203d50b1..07cbf50c0f9a7b0ace9a54fe01b481db873ae971 100644 (file)
--- a/compat/nedmalloc/Readme.txt
+++ b/compat/nedmalloc/Readme.txt
@@ -97,7 +97,7 @@ Chew for reporting this.
 
 v1.04alpha_svn915 7th October 2006:
  * Fixed failure to unlock thread cache list if allocating a new list failed.
 
 v1.04alpha_svn915 7th October 2006:
  * Fixed failure to unlock thread cache list if allocating a new list failed.

-Thanks to Dmitry Chichkov for reporting this. Futher thanks to Aleksey Sanin.
+Thanks to Dmitry Chichkov for reporting this. Further thanks to Aleksey Sanin.

  * Fixed realloc(0, <size>) segfaulting. Thanks to Dmitry Chichkov for
 reporting this.
  * Made config defines #ifndef so they can be overridden by the build system.
  * Fixed realloc(0, <size>) segfaulting. Thanks to Dmitry Chichkov for
 reporting this.
  * Made config defines #ifndef so they can be overridden by the build system.

diff --git a/compat/nedmalloc/malloc.c.h b/compat/nedmalloc/malloc.c.h
index 5a44dead9dd51cbf194d14f7f367844f780298d0..ed4f1fa5af8d911382101116c8ee522ef1e9b629 100644 (file)
--- a/compat/nedmalloc/malloc.c.h
+++ b/compat/nedmalloc/malloc.c.h
@@ -3602,8 +3602,8 @@ static void internal_malloc_stats(mstate m) {
      and choose its bk node as its replacement.
   2. If x was the last node of its size, but not a leaf node, it must
      be replaced with a leaf node (not merely one with an open left or
      and choose its bk node as its replacement.
   2. If x was the last node of its size, but not a leaf node, it must
      be replaced with a leaf node (not merely one with an open left or

-     right), to make sure that lefts and rights of descendents
-     correspond properly to bit masks.  We use the rightmost descendent
+     right), to make sure that lefts and rights of descendants
+     correspond properly to bit masks.  We use the rightmost descendant

      of x.  We could use any other leaf, but this is easy to locate and
      tends to counteract removal of leftmosts elsewhere, and so keeps
      paths shorter than minimally guaranteed.  This doesn't loop much
      of x.  We could use any other leaf, but this is easy to locate and
      tends to counteract removal of leftmosts elsewhere, and so keeps
      paths shorter than minimally guaranteed.  This doesn't loop much

diff --git a/compat/regex/regcomp.c b/compat/regex/regcomp.c
index d0025bd58d48cfcf137e5ef3bba90881dc00ec68..b2c5d465acd2bd37c1d316353eae544e564fc334 100644 (file)
--- a/compat/regex/regcomp.c
+++ b/compat/regex/regcomp.c
@@ -2617,7 +2617,7 @@ parse_dup_op (bin_tree_t *elem, re_string_t *regexp, re_dfa_t *dfa,
      Build the range expression which starts from START_ELEM, and ends
      at END_ELEM.  The result are written to MBCSET and SBCSET.
      RANGE_ALLOC is the allocated size of mbcset->range_starts, and
      Build the range expression which starts from START_ELEM, and ends
      at END_ELEM.  The result are written to MBCSET and SBCSET.
      RANGE_ALLOC is the allocated size of mbcset->range_starts, and

-     mbcset->range_ends, is a pointer argument sinse we may
+     mbcset->range_ends, is a pointer argument since we may

      update it.  */
 
 static reg_errcode_t
      update it.  */
 
 static reg_errcode_t


@@ -2788,7 +2788,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
   const int32_t *symb_table;
   const unsigned char *extra;
 
   const int32_t *symb_table;
   const unsigned char *extra;
 

-  /* Local function for parse_bracket_exp used in _LIBC environement.
+  /* Local function for parse_bracket_exp used in _LIBC environment.

      Seek the collating symbol entry correspondings to NAME.
      Return the index of the symbol in the SYMB_TABLE.  */
 
      Seek the collating symbol entry correspondings to NAME.
      Return the index of the symbol in the SYMB_TABLE.  */
 


@@ -2892,11 +2892,11 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
       return UINT_MAX;
     }
 
       return UINT_MAX;
     }
 

-  /* Local function for parse_bracket_exp used in _LIBC environement.
+  /* Local function for parse_bracket_exp used in _LIBC environment.

      Build the range expression which starts from START_ELEM, and ends
      at END_ELEM.  The result are written to MBCSET and SBCSET.
      RANGE_ALLOC is the allocated size of mbcset->range_starts, and
      Build the range expression which starts from START_ELEM, and ends
      at END_ELEM.  The result are written to MBCSET and SBCSET.
      RANGE_ALLOC is the allocated size of mbcset->range_starts, and

-     mbcset->range_ends, is a pointer argument sinse we may
+     mbcset->range_ends, is a pointer argument since we may

      update it.  */
 
   auto inline reg_errcode_t
      update it.  */
 
   auto inline reg_errcode_t


@@ -2976,11 +2976,11 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
       return REG_NOERROR;
     }
 
       return REG_NOERROR;
     }
 

-  /* Local function for parse_bracket_exp used in _LIBC environement.
+  /* Local function for parse_bracket_exp used in _LIBC environment.

      Build the collating element which is represented by NAME.
      The result are written to MBCSET and SBCSET.
      COLL_SYM_ALLOC is the allocated size of mbcset->coll_sym, is a
      Build the collating element which is represented by NAME.
      The result are written to MBCSET and SBCSET.
      COLL_SYM_ALLOC is the allocated size of mbcset->coll_sym, is a

-     pointer argument sinse we may update it.  */
+     pointer argument since we may update it.  */

 
   auto inline reg_errcode_t
   __attribute ((always_inline))
 
   auto inline reg_errcode_t
   __attribute ((always_inline))


@@ -3419,7 +3419,7 @@ parse_bracket_symbol (bracket_elem_t *elem, re_string_t *regexp,
      Build the equivalence class which is represented by NAME.
      The result are written to MBCSET and SBCSET.
      EQUIV_CLASS_ALLOC is the allocated size of mbcset->equiv_classes,
      Build the equivalence class which is represented by NAME.
      The result are written to MBCSET and SBCSET.
      EQUIV_CLASS_ALLOC is the allocated size of mbcset->equiv_classes,

-     is a pointer argument sinse we may update it.  */
+     is a pointer argument since we may update it.  */

 
 static reg_errcode_t
 #ifdef RE_ENABLE_I18N
 
 static reg_errcode_t
 #ifdef RE_ENABLE_I18N


@@ -3515,7 +3515,7 @@ build_equiv_class (bitset_t sbcset, const unsigned char *name)
      Build the character class which is represented by NAME.
      The result are written to MBCSET and SBCSET.
      CHAR_CLASS_ALLOC is the allocated size of mbcset->char_classes,
      Build the character class which is represented by NAME.
      The result are written to MBCSET and SBCSET.
      CHAR_CLASS_ALLOC is the allocated size of mbcset->char_classes,

-     is a pointer argument sinse we may update it.  */
+     is a pointer argument since we may update it.  */

 
 static reg_errcode_t
 #ifdef RE_ENABLE_I18N
 
 static reg_errcode_t
 #ifdef RE_ENABLE_I18N

diff --git a/compat/regex/regexec.c b/compat/regex/regexec.c
index 0cd6e0ef98ae1f53a8a32e448064bfbf5d1c29dc..eb5e1d44397cdad8f0db910e39037cf6b39f35a9 100644 (file)
--- a/compat/regex/regexec.c
+++ b/compat/regex/regexec.c
@@ -455,7 +455,7 @@ re_search_stub (struct re_pattern_buffer *bufp,
 
   rval = 0;
 
 
   rval = 0;
 

-  /* I hope we needn't fill ther regs with -1's when no match was found.  */
+  /* I hope we needn't fill their regs with -1's when no match was found.  */

   if (result != REG_NOERROR)
     rval = -1;
   else if (regs != NULL)
   if (result != REG_NOERROR)
     rval = -1;
   else if (regs != NULL)


@@ -1071,7 +1071,7 @@ acquire_init_state_context (reg_errcode_t *err, const re_match_context_t *mctx,
    FL_LONGEST_MATCH means we want the POSIX longest matching.
    If P_MATCH_FIRST is not NULL, and the match fails, it is set to the
    next place where we may want to try matching.
    FL_LONGEST_MATCH means we want the POSIX longest matching.
    If P_MATCH_FIRST is not NULL, and the match fails, it is set to the
    next place where we may want to try matching.

-   Note that the matcher assume that the maching starts from the current
+   Note that the matcher assume that the matching starts from the current

    index of the buffer.  */
 
 static int
    index of the buffer.  */
 
 static int


@@ -2239,7 +2239,7 @@ sift_states_iter_mb (const re_match_context_t *mctx, re_sift_context_t *sctx,
                            dfa->nexts[node_idx]))
     /* The node can't accept the `multi byte', or the
        destination was already thrown away, then the node
                            dfa->nexts[node_idx]))
     /* The node can't accept the `multi byte', or the
        destination was already thrown away, then the node

-       could't accept the current input `multi byte'.   */
+       couldn't accept the current input `multi byte'.   */

     naccepted = 0;
   /* Otherwise, it is sure that the node could accept
      `naccepted' bytes input.  */
     naccepted = 0;
   /* Otherwise, it is sure that the node could accept
      `naccepted' bytes input.  */

diff --git a/convert.c b/convert.c
index 2a2e46c2012de3af673b9d8d8647ec894f07b65a..11a95fc8b5b5eea6de2014b9209e16f9a3422186 100644 (file)
--- a/convert.c
+++ b/convert.c
@@ -835,7 +835,7 @@ int renormalize_buffer(const char *path, const char *src, size_t len, struct str
 
 /*****************************************************************
  *
 
 /*****************************************************************
  *

- * Streaming converison support
+ * Streaming conversion support

  *
  *****************************************************************/
 
  *
  *****************************************************************/
 

diff --git a/convert.h b/convert.h
index ec5fd69430908915cf9c0de62a2021882fd2c658..0c2143c152734feb3bdc7ba44b61b8327f02881c 100644 (file)
--- a/convert.h
+++ b/convert.h
@@ -48,7 +48,7 @@ static inline int would_convert_to_git(const char *path, const char *src,
 
 /*****************************************************************
  *
 
 /*****************************************************************
  *

- * Streaming converison support
+ * Streaming conversion support

  *
  *****************************************************************/
 
  *
  *****************************************************************/
 

diff --git a/diff.c b/diff.c
index a4583f01107c4534c1939ffcd5effcb959ea732e..76c6d8df5a720fbc941896464be36b9bec4e6074 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -4466,7 +4466,7 @@ void diff_flush(struct diff_options *options)
            DIFF_OPT_TST(options, DIFF_FROM_CONTENTS)) {
                /*
                 * run diff_flush_patch for the exit status. setting
            DIFF_OPT_TST(options, DIFF_FROM_CONTENTS)) {
                /*
                 * run diff_flush_patch for the exit status. setting

-                * options->file to /dev/null should be safe, becaue we
+                * options->file to /dev/null should be safe, because we

                 * aren't supposed to produce any output anyway.
                 */
                if (options->close_file)
                 * aren't supposed to produce any output anyway.
                 */
                if (options->close_file)

diff --git a/kwset.c b/kwset.c
index 5800999b4c16cd8f5eeb2301f72c33ec62c5ea71..a0f49b3aca934008465842dd37e52d11d099e23e 100644 (file)
--- a/kwset.c
+++ b/kwset.c
@@ -65,7 +65,7 @@ struct trie
   struct trie *fail;           /* Aho-Corasick failure function. */
   int depth;                   /* Depth of this node from the root. */
   int shift;                   /* Shift function for search failures. */
   struct trie *fail;           /* Aho-Corasick failure function. */
   int depth;                   /* Depth of this node from the root. */
   int shift;                   /* Shift function for search failures. */

-  int maxshift;                        /* Max shift of self and descendents. */
+  int maxshift;                        /* Max shift of self and descendants. */

 };
 
 /* Structure returned opaquely to the caller, containing everything. */
 };
 
 /* Structure returned opaquely to the caller, containing everything. */


@@ -308,7 +308,7 @@ treefails (register struct tree const *tree, struct trie const *fail,
   treefails(tree->rlink, fail, recourse);
 
   /* Find, in the chain of fails going back to the root, the first
   treefails(tree->rlink, fail, recourse);
 
   /* Find, in the chain of fails going back to the root, the first

-     node that has a descendent on the current label. */
+     node that has a descendant on the current label. */

   while (fail)
     {
       link = fail->links;
   while (fail)
     {
       link = fail->links;


@@ -426,13 +426,13 @@ kwsprep (kwset_t kws)
         computing the delta table, failure function, and shift function. */
       for (curr = last = kwset->trie; curr; curr = curr->next)
        {
         computing the delta table, failure function, and shift function. */
       for (curr = last = kwset->trie; curr; curr = curr->next)
        {

-         /* Enqueue the immediate descendents in the level order queue. */
+         /* Enqueue the immediate descendants in the level order queue. */

          enqueue(curr->links, &last);
 
          curr->shift = kwset->mind;
          curr->maxshift = kwset->mind;
 
          enqueue(curr->links, &last);
 
          curr->shift = kwset->mind;
          curr->maxshift = kwset->mind;
 

-         /* Update the delta table for the descendents of this node. */
+         /* Update the delta table for the descendants of this node. */

          treedelta(curr->links, curr->depth, delta);
 
          /* Compute the failure function for the descendants of this node. */
          treedelta(curr->links, curr->depth, delta);
 
          /* Compute the failure function for the descendants of this node. */


@@ -450,7 +450,7 @@ kwsprep (kwset_t kws)
                  fail->shift = curr->depth - fail->depth;
 
              /* If the current node is accepting then the shift at the
                  fail->shift = curr->depth - fail->depth;
 
              /* If the current node is accepting then the shift at the

-                fail and its descendents should be no larger than the
+                fail and its descendants should be no larger than the

                 difference of their depths. */
              if (curr->accepting && fail->maxshift > curr->depth - fail->depth)
                fail->maxshift = curr->depth - fail->depth;
                 difference of their depths. */
              if (curr->accepting && fail->maxshift > curr->depth - fail->depth)
                fail->maxshift = curr->depth - fail->depth;

diff --git a/sha1_name.c b/sha1_name.c
index 543bf9d9eceb81f97107437b30f4f150270b949a..6f7d4d13d7393968b7c82a7fc51505296b5b67d3 100644 (file)
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -52,7 +52,7 @@ static void update_candidates(struct disambiguate_state *ds, const unsigned char
        }
 
        if (!ds->candidate_ok) {
        }
 
        if (!ds->candidate_ok) {

-               /* discard the candidate; we know it does not satisify fn */
+               /* discard the candidate; we know it does not satisfy fn */

                hashcpy(ds->candidate, current);
                ds->candidate_checked = 0;
                return;
                hashcpy(ds->candidate, current);
                ds->candidate_checked = 0;
                return;