You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2013/10/10 16:44:48 UTC
svn commit: r1531006 - in /subversion/trunk/subversion/libsvn_subr:
deprecated.c utf.c
Author: rhuijben
Date: Thu Oct 10 14:44:48 2013
New Revision: 1531006
URL: http://svn.apache.org/r1531006
Log:
Move deprecated utf function to deprecated.c
* subversion/libsvn_subr/deprecated.c
(svn_utf_cstring_from_utf8_ex): Move function here..
* subversion/libsvn_subr/utf.c
(svn_utf_cstring_from_utf8_ex): ... that used to be here.
Modified:
subversion/trunk/subversion/libsvn_subr/deprecated.c
subversion/trunk/subversion/libsvn_subr/utf.c
Modified: subversion/trunk/subversion/libsvn_subr/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/deprecated.c?rev=1531006&r1=1531005&r2=1531006&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/deprecated.c (original)
+++ subversion/trunk/subversion/libsvn_subr/deprecated.c Thu Oct 10 14:44:48 2013
@@ -1250,6 +1250,8 @@ svn_xml_make_header(svn_stringbuf_t **st
svn_xml_make_header2(str, NULL, pool);
}
+
+/*** From utf.c ***/
void
svn_utf_initialize(apr_pool_t *pool)
{
@@ -1257,6 +1259,18 @@ svn_utf_initialize(apr_pool_t *pool)
}
svn_error_t *
+svn_utf_cstring_from_utf8_ex(const char **dest,
+ const char *src,
+ const char *topage,
+ const char *convset_key,
+ apr_pool_t *pool)
+{
+ return svn_utf_cstring_from_utf8_ex2(dest, src, topage, pool);
+}
+
+
+/*** From subst.c ***/
+svn_error_t *
svn_subst_build_keywords(svn_subst_keywords_t *kw,
const char *keywords_val,
const char *rev,
@@ -1306,3 +1320,4 @@ svn_ver_check_list(const svn_version_t *
{
return svn_ver_check_list2(my_version, checklist, svn_ver_compatible);
}
+
Modified: subversion/trunk/subversion/libsvn_subr/utf.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/utf.c?rev=1531006&r1=1531005&r2=1531006&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/utf.c (original)
+++ subversion/trunk/subversion/libsvn_subr/utf.c Thu Oct 10 14:44:48 2013
@@ -934,18 +934,6 @@ svn_utf_cstring_from_utf8_ex2(const char
return err;
}
-
-svn_error_t *
-svn_utf_cstring_from_utf8_ex(const char **dest,
- const char *src,
- const char *topage,
- const char *convset_key,
- apr_pool_t *pool)
-{
- return svn_utf_cstring_from_utf8_ex2(dest, src, topage, pool);
-}
-
-
const char *
svn_utf__cstring_from_utf8_fuzzy(const char *src,
apr_pool_t *pool,