Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

typofix: in-code comments

Signed-off-by: Ondřej Bílka <neleai@seznam.cz>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information...
commit 749f763dbbe4dbcc4082f02bf98bfc1a09427c6f 1 parent 17b83d7
Ondrej Bilka authored gitster committed
2  compat/nedmalloc/Readme.txt
@@ -97,7 +97,7 @@ Chew for reporting this.
97 97
 
98 98
 v1.04alpha_svn915 7th October 2006:
99 99
  * Fixed failure to unlock thread cache list if allocating a new list failed.
100  
-Thanks to Dmitry Chichkov for reporting this. Futher thanks to Aleksey Sanin.
  100
+Thanks to Dmitry Chichkov for reporting this. Further thanks to Aleksey Sanin.
101 101
  * Fixed realloc(0, <size>) segfaulting. Thanks to Dmitry Chichkov for
102 102
 reporting this.
103 103
  * Made config defines #ifndef so they can be overridden by the build system.
4  compat/nedmalloc/malloc.c.h
@@ -3602,8 +3602,8 @@ static void internal_malloc_stats(mstate m) {
3602 3602
      and choose its bk node as its replacement.
3603 3603
   2. If x was the last node of its size, but not a leaf node, it must
3604 3604
      be replaced with a leaf node (not merely one with an open left or
3605  
-     right), to make sure that lefts and rights of descendents
3606  
-     correspond properly to bit masks.  We use the rightmost descendent
  3605
+     right), to make sure that lefts and rights of descendants
  3606
+     correspond properly to bit masks.  We use the rightmost descendant
3607 3607
      of x.  We could use any other leaf, but this is easy to locate and
3608 3608
      tends to counteract removal of leftmosts elsewhere, and so keeps
3609 3609
      paths shorter than minimally guaranteed.  This doesn't loop much
16  compat/regex/regcomp.c
@@ -2617,7 +2617,7 @@ parse_dup_op (bin_tree_t *elem, re_string_t *regexp, re_dfa_t *dfa,
2617 2617
      Build the range expression which starts from START_ELEM, and ends
2618 2618
      at END_ELEM.  The result are written to MBCSET and SBCSET.
2619 2619
      RANGE_ALLOC is the allocated size of mbcset->range_starts, and
2620  
-     mbcset->range_ends, is a pointer argument sinse we may
  2620
+     mbcset->range_ends, is a pointer argument since we may
2621 2621
      update it.  */
2622 2622
 
2623 2623
 static reg_errcode_t
@@ -2788,7 +2788,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
2788 2788
   const int32_t *symb_table;
2789 2789
   const unsigned char *extra;
2790 2790
 
2791  
-  /* Local function for parse_bracket_exp used in _LIBC environement.
  2791
+  /* Local function for parse_bracket_exp used in _LIBC environment.
2792 2792
      Seek the collating symbol entry correspondings to NAME.
2793 2793
      Return the index of the symbol in the SYMB_TABLE.  */
2794 2794
 
@@ -2892,11 +2892,11 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
2892 2892
       return UINT_MAX;
2893 2893
     }
2894 2894
 
2895  
-  /* Local function for parse_bracket_exp used in _LIBC environement.
  2895
+  /* Local function for parse_bracket_exp used in _LIBC environment.
2896 2896
      Build the range expression which starts from START_ELEM, and ends
2897 2897
      at END_ELEM.  The result are written to MBCSET and SBCSET.
2898 2898
      RANGE_ALLOC is the allocated size of mbcset->range_starts, and
2899  
-     mbcset->range_ends, is a pointer argument sinse we may
  2899
+     mbcset->range_ends, is a pointer argument since we may
2900 2900
      update it.  */
2901 2901
 
2902 2902
   auto inline reg_errcode_t
@@ -2976,11 +2976,11 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
2976 2976
       return REG_NOERROR;
2977 2977
     }
2978 2978
 
2979  
-  /* Local function for parse_bracket_exp used in _LIBC environement.
  2979
+  /* Local function for parse_bracket_exp used in _LIBC environment.
2980 2980
      Build the collating element which is represented by NAME.
2981 2981
      The result are written to MBCSET and SBCSET.
2982 2982
      COLL_SYM_ALLOC is the allocated size of mbcset->coll_sym, is a
2983  
-     pointer argument sinse we may update it.  */
  2983
+     pointer argument since we may update it.  */
2984 2984
 
2985 2985
   auto inline reg_errcode_t
2986 2986
   __attribute ((always_inline))
@@ -3419,7 +3419,7 @@ parse_bracket_symbol (bracket_elem_t *elem, re_string_t *regexp,
3419 3419
      Build the equivalence class which is represented by NAME.
3420 3420
      The result are written to MBCSET and SBCSET.
3421 3421
      EQUIV_CLASS_ALLOC is the allocated size of mbcset->equiv_classes,
3422  
-     is a pointer argument sinse we may update it.  */
  3422
+     is a pointer argument since we may update it.  */
3423 3423
 
3424 3424
 static reg_errcode_t
3425 3425
 #ifdef RE_ENABLE_I18N
@@ -3515,7 +3515,7 @@ build_equiv_class (bitset_t sbcset, const unsigned char *name)
3515 3515
      Build the character class which is represented by NAME.
3516 3516
      The result are written to MBCSET and SBCSET.
3517 3517
      CHAR_CLASS_ALLOC is the allocated size of mbcset->char_classes,
3518  
-     is a pointer argument sinse we may update it.  */
  3518
+     is a pointer argument since we may update it.  */
3519 3519
 
3520 3520
 static reg_errcode_t
3521 3521
 #ifdef RE_ENABLE_I18N
6  compat/regex/regexec.c
@@ -455,7 +455,7 @@ re_search_stub (struct re_pattern_buffer *bufp,
455 455
 
456 456
   rval = 0;
457 457
 
458  
-  /* I hope we needn't fill ther regs with -1's when no match was found.  */
  458
+  /* I hope we needn't fill their regs with -1's when no match was found.  */
459 459
   if (result != REG_NOERROR)
460 460
     rval = -1;
461 461
   else if (regs != NULL)
@@ -1071,7 +1071,7 @@ acquire_init_state_context (reg_errcode_t *err, const re_match_context_t *mctx,
1071 1071
    FL_LONGEST_MATCH means we want the POSIX longest matching.
1072 1072
    If P_MATCH_FIRST is not NULL, and the match fails, it is set to the
1073 1073
    next place where we may want to try matching.
1074  
-   Note that the matcher assume that the maching starts from the current
  1074
+   Note that the matcher assume that the matching starts from the current
1075 1075
    index of the buffer.  */
1076 1076
 
1077 1077
 static int
@@ -2239,7 +2239,7 @@ sift_states_iter_mb (const re_match_context_t *mctx, re_sift_context_t *sctx,
2239 2239
 			    dfa->nexts[node_idx]))
2240 2240
     /* The node can't accept the `multi byte', or the
2241 2241
        destination was already thrown away, then the node
2242  
-       could't accept the current input `multi byte'.   */
  2242
+       couldn't accept the current input `multi byte'.   */
2243 2243
     naccepted = 0;
2244 2244
   /* Otherwise, it is sure that the node could accept
2245 2245
      `naccepted' bytes input.  */
2  convert.c
@@ -835,7 +835,7 @@ int renormalize_buffer(const char *path, const char *src, size_t len, struct str
835 835
 
836 836
 /*****************************************************************
837 837
  *
838  
- * Streaming converison support
  838
+ * Streaming conversion support
839 839
  *
840 840
  *****************************************************************/
841 841
 
2  convert.h
@@ -48,7 +48,7 @@ static inline int would_convert_to_git(const char *path, const char *src,
48 48
 
49 49
 /*****************************************************************
50 50
  *
51  
- * Streaming converison support
  51
+ * Streaming conversion support
52 52
  *
53 53
  *****************************************************************/
54 54
 
2  diff.c
@@ -4466,7 +4466,7 @@ void diff_flush(struct diff_options *options)
4466 4466
 	    DIFF_OPT_TST(options, DIFF_FROM_CONTENTS)) {
4467 4467
 		/*
4468 4468
 		 * run diff_flush_patch for the exit status. setting
4469  
-		 * options->file to /dev/null should be safe, becaue we
  4469
+		 * options->file to /dev/null should be safe, because we
4470 4470
 		 * aren't supposed to produce any output anyway.
4471 4471
 		 */
4472 4472
 		if (options->close_file)
10  kwset.c
@@ -65,7 +65,7 @@ struct trie
65 65
   struct trie *fail;		/* Aho-Corasick failure function. */
66 66
   int depth;			/* Depth of this node from the root. */
67 67
   int shift;			/* Shift function for search failures. */
68  
-  int maxshift;			/* Max shift of self and descendents. */
  68
+  int maxshift;			/* Max shift of self and descendants. */
69 69
 };
70 70
 
71 71
 /* Structure returned opaquely to the caller, containing everything. */
@@ -308,7 +308,7 @@ treefails (register struct tree const *tree, struct trie const *fail,
308 308
   treefails(tree->rlink, fail, recourse);
309 309
 
310 310
   /* Find, in the chain of fails going back to the root, the first
311  
-     node that has a descendent on the current label. */
  311
+     node that has a descendant on the current label. */
312 312
   while (fail)
313 313
     {
314 314
       link = fail->links;
@@ -426,13 +426,13 @@ kwsprep (kwset_t kws)
426 426
 	 computing the delta table, failure function, and shift function. */
427 427
       for (curr = last = kwset->trie; curr; curr = curr->next)
428 428
 	{
429  
-	  /* Enqueue the immediate descendents in the level order queue. */
  429
+	  /* Enqueue the immediate descendants in the level order queue. */
430 430
 	  enqueue(curr->links, &last);
431 431
 
432 432
 	  curr->shift = kwset->mind;
433 433
 	  curr->maxshift = kwset->mind;
434 434
 
435  
-	  /* Update the delta table for the descendents of this node. */
  435
+	  /* Update the delta table for the descendants of this node. */
436 436
 	  treedelta(curr->links, curr->depth, delta);
437 437
 
438 438
 	  /* Compute the failure function for the descendants of this node. */
@@ -450,7 +450,7 @@ kwsprep (kwset_t kws)
450 450
 		  fail->shift = curr->depth - fail->depth;
451 451
 
452 452
 	      /* If the current node is accepting then the shift at the
453  
-		 fail and its descendents should be no larger than the
  453
+		 fail and its descendants should be no larger than the
454 454
 		 difference of their depths. */
455 455
 	      if (curr->accepting && fail->maxshift > curr->depth - fail->depth)
456 456
 		fail->maxshift = curr->depth - fail->depth;
2  sha1_name.c
@@ -52,7 +52,7 @@ static void update_candidates(struct disambiguate_state *ds, const unsigned char
52 52
 	}
53 53
 
54 54
 	if (!ds->candidate_ok) {
55  
-		/* discard the candidate; we know it does not satisify fn */
  55
+		/* discard the candidate; we know it does not satisfy fn */
56 56
 		hashcpy(ds->candidate, current);
57 57
 		ds->candidate_checked = 0;
58 58
 		return;

0 notes on commit 749f763

Please sign in to comment.
Something went wrong with that request. Please try again.