svn commit: r1423904 - in /subversion/trunk/subversion: include/private/svn_mergeinfo_private.h include/svn_mergeinfo.h libsvn_subr/deprecated.c libsvn_subr/mergeinfo.c

[rh...@apache.org]

Author: rhuijben
Date: Wed Dec 19 15:49:18 2012
New Revision: 1423904

URL: http://svn.apache.org/viewvc?rev=1423904&view=rev
Log:
Catch some typos. No functional changes.

* subversion/include/private/svn_mergeinfo_private.h
  (svn_rangelist__parse,
   svn_rangelist__combine_adjecent_ranges,
   svn_rangelist__combine_adjacent_ranges): Catch typos.

* subversion/include/svn_mergeinfo.h
  (svn_rangelist_merge2,
   svn_rangelist_merge): Catch typos.

* subversion/libsvn_subr/deprecated.c
  (svn_rangelist_merge): Update caller.

* subversion/libsvn_subr/mergeinfo.c
  (svn_rangelist__combine_adjecent_ranges): Rename function.
  (svn_rangelist__combine_adjacent_ranges): New name.
  (parse_revision_line): Update caller.

Found by: julianfoad

Modified:
    subversion/trunk/subversion/include/private/svn_mergeinfo_private.h
    subversion/trunk/subversion/include/svn_mergeinfo.h
    subversion/trunk/subversion/libsvn_subr/deprecated.c
    subversion/trunk/subversion/libsvn_subr/mergeinfo.c

Modified: subversion/trunk/subversion/include/private/svn_mergeinfo_private.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_mergeinfo_private.h?rev=1423904&r1=1423903&r2=1423904&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_mergeinfo_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_mergeinfo_private.h Wed Dec 19 15:49:18 2012
@@ -52,17 +52,17 @@ svn_rangelist__set_inheritance(svn_range
  * Unlike svn_mergeinfo_parse(), this does not sort the ranges into order
  * or combine adjacent and overlapping ranges.
  *
- * The compaction can be done with svn_rangelist__combine_adjecent_ranges().
+ * The compaction can be done with svn_rangelist__combine_adjacent_ranges().
  */
 svn_error_t *
 svn_rangelist__parse(svn_rangelist_t **rangelist,
                      const char *str,
                      apr_pool_t *result_pool);
 
-/* In-place combines adjecent ranges in a rangelist.
+/* In-place combines adjacent ranges in a rangelist.
    SCRATCH_POOL is just used for providing error messages. */
 svn_error_t *
-svn_rangelist__combine_adjecent_ranges(svn_rangelist_t *rangelist,
+svn_rangelist__combine_adjacent_ranges(svn_rangelist_t *rangelist,
                                        apr_pool_t *scratch_pool);
 
 /* Set inheritability of all rangelists in MERGEINFO to INHERITABLE.

Modified: subversion/trunk/subversion/include/svn_mergeinfo.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_mergeinfo.h?rev=1423904&r1=1423903&r2=1423904&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_mergeinfo.h (original)
+++ subversion/trunk/subversion/include/svn_mergeinfo.h Wed Dec 19 15:49:18 2012
@@ -315,7 +315,7 @@ svn_rangelist_diff(svn_rangelist_t **del
  * in sorted order and be compacted to the minimal number of ranges
  * needed to represent the merged result.
  *
- * If the original rangelisted contain non collapsed adjecent ranges, the
+ * If the original rangelisted contain non collapsed adjacent ranges, the
  * final result is not guaranteed to be compacted either.
  *
  * Use @a scratch_pool for temporary allocations.
@@ -334,7 +334,7 @@ svn_rangelist_merge2(svn_rangelist_t *ra
  * in place. If not used carefully, this function can use up a lot of memory
  * if called in a loop.
  *
- * It performs an extra adjecent range compaction round to make sure non
+ * It performs an extra adjacent range compaction round to make sure non
  * collapsed input ranges are compacted in the result.
  *
  * @since New in 1.5.

Modified: subversion/trunk/subversion/libsvn_subr/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/deprecated.c?rev=1423904&r1=1423903&r2=1423904&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/deprecated.c (original)
+++ subversion/trunk/subversion/libsvn_subr/deprecated.c Wed Dec 19 15:49:18 2012
@@ -1127,7 +1127,7 @@ svn_rangelist_merge(svn_rangelist_t **ra
                                pool, pool));
 
   return svn_error_trace(
-            svn_rangelist__combine_adjecent_ranges(*rangelist, pool));
+            svn_rangelist__combine_adjacent_ranges(*rangelist, pool));
 }
 
 svn_error_t *

Modified: subversion/trunk/subversion/libsvn_subr/mergeinfo.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/mergeinfo.c?rev=1423904&r1=1423903&r2=1423904&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/mergeinfo.c (original)
+++ subversion/trunk/subversion/libsvn_subr/mergeinfo.c Wed Dec 19 15:49:18 2012
@@ -612,7 +612,7 @@ svn_rangelist__parse(svn_rangelist_t **r
 }
 
 svn_error_t *
-svn_rangelist__combine_adjecent_ranges(svn_rangelist_t *rangelist,
+svn_rangelist__combine_adjacent_ranges(svn_rangelist_t *rangelist,
                                        apr_pool_t *scratch_pool)
 {
   int i;
@@ -703,7 +703,7 @@ parse_revision_line(const char **input, 
       qsort(rangelist->elts, rangelist->nelts, rangelist->elt_size,
             svn_sort_compare_ranges);
 
-      SVN_ERR(svn_rangelist__combine_adjecent_ranges(rangelist, scratch_pool));
+      SVN_ERR(svn_rangelist__combine_adjacent_ranges(rangelist, scratch_pool));
     }
 
   /* Handle any funky mergeinfo with relative merge source paths that