svn commit: r1181721 - in /subversion/trunk/subversion/libsvn_subr: kitchensink.c mergeinfo.c

[ju...@apache.org]

Author: julianfoad
Date: Tue Oct 11 11:31:12 2011
New Revision: 1181721

URL: http://svn.apache.org/viewvc?rev=1181721&view=rev
Log:
Move two mergeinfo-related functions from 'kitchensink.c' to 'mergeinfo.c',
as they are declared in 'svn_mergeinfo.h', in an attempt not to overload the
kitchen sink.

* subversion/libsvn_subr/kitchensink.c
  (svn_depth_from_word, svn_inheritance_from_word): Move to ...

* subversion/libsvn_subr/mergeinfo.c
  (svn_depth_from_word, svn_inheritance_from_word): ... here.

Modified:
    subversion/trunk/subversion/libsvn_subr/kitchensink.c
    subversion/trunk/subversion/libsvn_subr/mergeinfo.c

Modified: subversion/trunk/subversion/libsvn_subr/kitchensink.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/kitchensink.c?rev=1181721&r1=1181720&r2=1181721&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/kitchensink.c (original)
+++ subversion/trunk/subversion/libsvn_subr/kitchensink.c Tue Oct 11 11:31:12 2011
@@ -26,7 +26,7 @@
 
 #include "svn_types.h"
 #include "svn_error.h"
-#include "svn_mergeinfo.h"
+#include "svn_string.h"
 #include "svn_private_config.h"
 
 svn_error_t *
@@ -121,31 +121,6 @@ svn_depth_from_word(const char *word)
 }
 
 const char *
-svn_inheritance_to_word(svn_mergeinfo_inheritance_t inherit)
-{
-  switch (inherit)
-    {
-    case svn_mergeinfo_inherited:
-      return "inherited";
-    case svn_mergeinfo_nearest_ancestor:
-      return "nearest-ancestor";
-    default:
-      return "explicit";
-    }
-}
-
-
-svn_mergeinfo_inheritance_t
-svn_inheritance_from_word(const char *word)
-{
-  if (strcmp(word, "inherited") == 0)
-    return svn_mergeinfo_inherited;
-  if (strcmp(word, "nearest-ancestor") == 0)
-    return svn_mergeinfo_nearest_ancestor;
-  return svn_mergeinfo_explicit;
-}
-
-const char *
 svn_node_kind_to_word(svn_node_kind_t kind)
 {
   switch (kind)

Modified: subversion/trunk/subversion/libsvn_subr/mergeinfo.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/mergeinfo.c?rev=1181721&r1=1181720&r2=1181721&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/mergeinfo.c (original)
+++ subversion/trunk/subversion/libsvn_subr/mergeinfo.c Tue Oct 11 11:31:12 2011
@@ -2613,3 +2613,27 @@ svn_mergeinfo__mergeinfo_from_segments(s
   *mergeinfo_p = mergeinfo;
   return SVN_NO_ERROR;
 }
+
+const char *
+svn_inheritance_to_word(svn_mergeinfo_inheritance_t inherit)
+{
+  switch (inherit)
+    {
+    case svn_mergeinfo_inherited:
+      return "inherited";
+    case svn_mergeinfo_nearest_ancestor:
+      return "nearest-ancestor";
+    default:
+      return "explicit";
+    }
+}
+
+svn_mergeinfo_inheritance_t
+svn_inheritance_from_word(const char *word)
+{
+  if (strcmp(word, "inherited") == 0)
+    return svn_mergeinfo_inherited;
+  if (strcmp(word, "nearest-ancestor") == 0)
+    return svn_mergeinfo_nearest_ancestor;
+  return svn_mergeinfo_explicit;
+}