svn commit: r1098563 - in /subversion/trunk/subversion: bindings/javahl/native/ClientContext.cpp libsvn_ra_serf/commit.c

[hw...@apache.org]

Author: hwright
Date: Mon May  2 13:44:11 2011
New Revision: 1098563

URL: http://svn.apache.org/viewvc?rev=1098563&view=rev
Log:
* subversion/libsvn_ra_serf/commit.c
  (proppatch_walker): Don't set an unused value.

Modified:
    subversion/trunk/subversion/bindings/javahl/native/ClientContext.cpp
    subversion/trunk/subversion/libsvn_ra_serf/commit.c

Modified: subversion/trunk/subversion/bindings/javahl/native/ClientContext.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/ClientContext.cpp?rev=1098563&r1=1098562&r2=1098563&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/ClientContext.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/ClientContext.cpp Mon May  2 13:44:11 2011
@@ -87,8 +87,8 @@ ClientContext::ClientContext(jobject jsv
     persistentCtx->notify_baton2 = m_jctx;
     persistentCtx->progress_func = progress;
     persistentCtx->progress_baton = m_jctx;
-    persistentCtx->conflict_func = resolve;
-    persistentCtx->conflict_baton = m_jctx;
+    persistentCtx->conflict_func2 = resolve;
+    persistentCtx->conflict_baton2 = m_jctx;
 }
 
 ClientContext::~ClientContext()
@@ -348,7 +348,7 @@ ClientContext::progress(apr_off_t progre
 
 svn_error_t *
 ClientContext::resolve(svn_wc_conflict_result_t **result,
-                       const svn_wc_conflict_description_t *desc,
+                       const svn_wc_conflict_description2_t *desc,
                        void *baton,
                        apr_pool_t *pool)
 {

Modified: subversion/trunk/subversion/libsvn_ra_serf/commit.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/commit.c?rev=1098563&r1=1098562&r2=1098563&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/commit.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/commit.c Mon May  2 13:44:11 2011
@@ -733,7 +733,6 @@ proppatch_walker(void *baton,
     prop_name = apr_pstrcat(pool, "S:", name, (char *)NULL);
   else if (strcmp(ns, SVN_DAV_PROP_NS_CUSTOM) == 0)
     prop_name = apr_pstrcat(pool, "C:", name, (char *)NULL);
-  name_len = strlen(prop_name);
 
   SVN_ERR(derive_old_val(&old_val_p, wb, ns, name, pool));