subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bre...@apache.org
Subject svn commit: r1482446 - in /subversion/branches/1.8.x: ./ subversion/bindings/javahl/native/ subversion/include/ subversion/libsvn_subr/ subversion/mod_dav_svn/
Date Tue, 14 May 2013 16:46:42 GMT
Author: breser
Date: Tue May 14 16:46:41 2013
New Revision: 1482446

URL: http://svn.apache.org/r1482446
Log:
Merge the r1482350 group from trunk:

 * r1482350, r1482354
   If we are going to reroll I would like to reorganize the arguments of the
   new in 1.8 function svn_utf_initialize2() (svn_utf.h) to properly have the
   pool as last argument, as we have with almost every other function.
   Votes:
     +1: rhuijben (only for 1.8.0), danielsh, ivan (only for 1.8.0)


Modified:
    subversion/branches/1.8.x/   (props changed)
    subversion/branches/1.8.x/STATUS
    subversion/branches/1.8.x/subversion/bindings/javahl/native/JNIUtil.cpp
    subversion/branches/1.8.x/subversion/include/svn_utf.h
    subversion/branches/1.8.x/subversion/libsvn_subr/cmdline.c
    subversion/branches/1.8.x/subversion/libsvn_subr/deprecated.c
    subversion/branches/1.8.x/subversion/libsvn_subr/utf.c
    subversion/branches/1.8.x/subversion/mod_dav_svn/mod_dav_svn.c

Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1482350,1482354

Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1482446&r1=1482445&r2=1482446&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Tue May 14 16:46:41 2013
@@ -85,13 +85,6 @@ Approved changes:
 # blocking issues.  If in doubt see this link for details:
 # http://subversion.apache.org/docs/community-guide/releasing.html#release-stabilization
 
- * r1482350, r1482354
-   If we are going to reroll I would like to reorganize the arguments of the
-   new in 1.8 function svn_utf_initialize2() (svn_utf.h) to properly have the
-   pool as last argument, as we have with almost every other function.
-   Votes:
-     +1: rhuijben (only for 1.8.0), danielsh, ivan (only for 1.8.0)
-
  * r1482282
    Don't use unitialized variable to produce an error code.
    Justification:

Modified: subversion/branches/1.8.x/subversion/bindings/javahl/native/JNIUtil.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/bindings/javahl/native/JNIUtil.cpp?rev=1482446&r1=1482445&r2=1482446&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/bindings/javahl/native/JNIUtil.cpp (original)
+++ subversion/branches/1.8.x/subversion/bindings/javahl/native/JNIUtil.cpp Tue May 14 16:46:41
2013
@@ -179,7 +179,7 @@ bool JNIUtil::JNIGlobalInit(JNIEnv *env)
       apr_allocator_max_free_set(allocator, 1);
     }
 
-  svn_utf_initialize2(g_pool, FALSE); /* Optimize character conversions */
+  svn_utf_initialize2(FALSE, g_pool); /* Optimize character conversions */
   svn_fs_initialize(g_pool); /* Avoid some theoretical issues */
   svn_ra_initialize(g_pool);
 

Modified: subversion/branches/1.8.x/subversion/include/svn_utf.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/include/svn_utf.h?rev=1482446&r1=1482445&r2=1482446&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/include/svn_utf.h (original)
+++ subversion/branches/1.8.x/subversion/include/svn_utf.h Tue May 14 16:46:41 2013
@@ -63,8 +63,8 @@ extern "C" {
  * @since New in 1.8.
  */
 void
-svn_utf_initialize2(apr_pool_t *pool,
-                    svn_boolean_t assume_native_utf8);
+svn_utf_initialize2(svn_boolean_t assume_native_utf8,
+                    apr_pool_t *pool);
 
 /**
  * Like svn_utf_initialize2() but without the ability to force the

Modified: subversion/branches/1.8.x/subversion/libsvn_subr/cmdline.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_subr/cmdline.c?rev=1482446&r1=1482445&r2=1482446&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_subr/cmdline.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_subr/cmdline.c Tue May 14 16:46:41 2013
@@ -236,7 +236,7 @@ svn_cmdline_init(const char *progname, F
   /* Create a pool for use by the UTF-8 routines.  It will be cleaned
      up by APR at exit time. */
   pool = svn_pool_create(NULL);
-  svn_utf_initialize2(pool, FALSE);
+  svn_utf_initialize2(FALSE, pool);
 
   if ((err = svn_nls_init()))
     {

Modified: subversion/branches/1.8.x/subversion/libsvn_subr/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_subr/deprecated.c?rev=1482446&r1=1482445&r2=1482446&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_subr/deprecated.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_subr/deprecated.c Tue May 14 16:46:41 2013
@@ -1255,7 +1255,7 @@ svn_xml_make_header(svn_stringbuf_t **st
 void
 svn_utf_initialize(apr_pool_t *pool)
 {
-  svn_utf_initialize2(pool, FALSE);
+  svn_utf_initialize2(FALSE, pool);
 }
 
 svn_error_t *

Modified: subversion/branches/1.8.x/subversion/libsvn_subr/utf.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_subr/utf.c?rev=1482446&r1=1482445&r2=1482446&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_subr/utf.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_subr/utf.c Tue May 14 16:46:41 2013
@@ -121,8 +121,8 @@ xlate_handle_node_cleanup(void *arg)
 }
 
 void
-svn_utf_initialize2(apr_pool_t *pool,
-                    svn_boolean_t assume_native_utf8)
+svn_utf_initialize2(svn_boolean_t assume_native_utf8,
+                    apr_pool_t *pool)
 {
   if (!xlate_handle_hash)
     {

Modified: subversion/branches/1.8.x/subversion/mod_dav_svn/mod_dav_svn.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/mod_dav_svn/mod_dav_svn.c?rev=1482446&r1=1482445&r2=1482446&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/mod_dav_svn/mod_dav_svn.c (original)
+++ subversion/branches/1.8.x/subversion/mod_dav_svn/mod_dav_svn.c Tue May 14 16:46:41 2013
@@ -137,7 +137,7 @@ init(apr_pool_t *p, apr_pool_t *plog, ap
 
   /* This returns void, so we can't check for error. */
   conf = ap_get_module_config(s->module_config, &dav_svn_module);
-  svn_utf_initialize2(p, conf->use_utf8);
+  svn_utf_initialize2(conf->use_utf8, p);
 
   return OK;
 }



Mime
View raw message