svn commit: r952427 - in /subversion/trunk/subversion/bindings/javahl/native: CreateJ.cpp SVNClient.cpp

[rhuijben]

Author: rhuijben
Date: Mon Jun  7 20:47:52 2010
New Revision: 952427

URL: http://svn.apache.org/viewvc?rev=952427&view=rev
Log:
Following up on r952416 and r952421, apply a few more javahl fixes in an
attempt to fix the javahl build.

* subversion/bindings/javahl/native/CreateJ.cpp
  (CreateJ::Status): Remove unused variable and add missing argument.

* subversion/bindings/javahl/native/SVNClient.cpp
  (analyze_status): Use the versioned boolean instead of the now removed
    entry pointer.

Modified:
    subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp
    subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp

Modified: subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp?rev=952427&r1=952426&r2=952427&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp Mon Jun  7 
20:47:52 2010
@@ -523,7 +523,6 @@ CreateJ::Status(svn_wc_context_t *wc_ctx
       /* Unparse the meaning of the conflicted flag. */
       if (status->conflicted)
         {
-          svn_error_t *err;
           svn_boolean_t text_conflicted = FALSE;
           svn_boolean_t prop_conflicted = FALSE;
           svn_boolean_t tree_conflicted = FALSE;
@@ -574,7 +573,7 @@ CreateJ::Status(svn_wc_context_t *wc_ctx
            ### SVN_ERR_NODE_UNEXPECTED_KIND! */
         SVN_JNI_ERR(svn_wc__get_entry_versioned(&entry, wc_ctx, local_abspath,
                                                 svn_node_unknown, FALSE, FALSE,
-                                                pool, pool));
+                                                pool, pool), NULL);
 
       if (entry != NULL)
         {

Modified: subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp?rev=952427&r1=952426&r2=952427&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp Mon Jun  7 
20:47:52 2010
@@ -1696,15 +1696,15 @@ analyze_status(void *baton,
     if (sb->done)
         return SVN_NO_ERROR;
 
-    if (! status->entry)
+    if (! status->versioned)
         return SVN_NO_ERROR;
 
     /* Added files have a revision of no interest */
     if (status->text_status != svn_wc_status_added)
     {
         svn_revnum_t item_rev = (sb->committed
-                                 ? status->entry->cmt_rev
-                                 : status->entry->revision);
+                                 ? status->changed_rev
+                                 : status->revision);
 
         if (sb->min_rev == SVN_INVALID_REVNUM || item_rev < sb->min_rev)
             sb->min_rev = item_rev;
@@ -1721,8 +1721,8 @@ analyze_status(void *baton,
     if (sb->wc_abspath
         && (! sb->wc_url)
         && (strcmp(local_abspath, sb->wc_abspath) == 0)
-        && (status->entry))
-        sb->wc_url = apr_pstrdup(sb->pool, status->entry->url);
+        && (status->versioned))
+        sb->wc_url = apr_pstrdup(sb->pool, status->url);
 
     return SVN_NO_ERROR;
 }