commit 53375b0cdac4c5f43b8337a906c058c5660e93d0
author Daniel Rall <dlr@apache.org> Wed Dec 06 01:01:55 2006 +0000
committer Daniel Rall <dlr@apache.org> Wed Dec 06 01:01:55 2006 +0000
tree cb74a5d56e4de203f12cbd938a3f235a66718806
parent 923a4f97f4081cf7acfec2137b067a3d0b58091c

JavaHL: Code cleanup.

* subversion/bindings/java/javahl/native/SVNClient.cpp
  (diff): Cleanup usage of svn_error_t *'s, and improve formatting.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@862661 13f79535-47bb-0310-9956-ffa450edef68

subversion/bindings/java/javahl/native/SVNClient.cpp

diff --git a/subversion/bindings/java/javahl/native/SVNClient.cpp b/subversion/bindings/java/javahl/native/SVNClient.cpp
index 9c2c2b0..7314f58 100644
--- a/subversion/bindings/java/javahl/native/SVNClient.cpp
+++ b/subversion/bindings/java/javahl/native/SVNClient.cpp
@@ -1468,9 +1468,9 @@
                     const char *outfileName,bool recurse, bool ignoreAncestry,
                     bool noDiffDelete, bool force)
 {
+    svn_error_t *err;
     Pool requestPool;
-    svn_error_t *err = NULL;
-    apr_array_header_t *options;
+
     if(target1 == NULL)
     {
         JNIUtil::throwNullPointerException("target1");
@@ -1491,17 +1491,17 @@
         return;
 
     Path intTarget1(target1);
-    svn_error_t *Err = intTarget1.error_occured();
-    if(Err != NULL)
+    err = intTarget1.error_occured();
+    if (err != NULL)
     {
-        JNIUtil::handleSVNError(Err);
+        JNIUtil::handleSVNError(err);
         return;
     }
     Path intTarget2(target2);
-    Err = intTarget2.error_occured();
-    if(Err != NULL)
+    err = intTarget2.error_occured();
+    if (err != NULL)
     {
-        JNIUtil::handleSVNError(Err);
+        JNIUtil::handleSVNError(err);
         return;
     }
 
@@ -1520,10 +1520,10 @@
     }
 
     // we don't use any options
-    options = svn_cstring_split ("", " \t\n\r", TRUE, requestPool.pool());
+    apr_array_header_t *options = svn_cstring_split("", " \t\n\r", TRUE,
+						    requestPool.pool());
 
-    Err = svn_client_diff2 (
-                            options,    // options
+    err = svn_client_diff2 (options,
                             intTarget1.c_str(),
                             revision1.revision(),
                             intTarget2.c_str(),
@@ -1542,24 +1542,25 @@
     if (rv != APR_SUCCESS)
     {
         err = svn_error_create(rv, NULL,_("Cannot close file."));
-         JNIUtil::handleSVNError(err);
+	JNIUtil::handleSVNError(err);
         return;
     }
 
-    if(Err != NULL)
+    if (err != NULL)
     {
-         JNIUtil::handleSVNError(Err);
+        JNIUtil::handleSVNError(err);
         return;
     }
 }
+
 void SVNClient::diff(const char *target, Revision &pegRevision,
                     Revision &startRevision, Revision &endRevision,
                     const char *outfileName,bool recurse, bool ignoreAncestry,
                     bool noDiffDelete, bool force)
 {
+    svn_error_t *err;
     Pool requestPool;
-    svn_error_t *err = NULL;
-    apr_array_header_t *options;
+
     if(target == NULL)
     {
         JNIUtil::throwNullPointerException("target");
@@ -1575,10 +1576,10 @@
         return;
 
     Path intTarget(target);
-    svn_error_t *Err = intTarget.error_occured();
-    if(Err != NULL)
+    err = intTarget.error_occured();
+    if (err != NULL)
     {
-        JNIUtil::handleSVNError(Err);
+        JNIUtil::handleSVNError(err);
         return;
     }
 
@@ -1597,10 +1598,11 @@
     }
 
     // we don't use any options
-    options = svn_cstring_split ("", " \t\n\r", TRUE, requestPool.pool());
+    apr_array_header_t *options = svn_cstring_split("", " \t\n\r", TRUE,
+						    requestPool.pool());
 
-    Err = svn_client_diff_peg2 (
-                            options,    // options
+    err = svn_client_diff_peg2(
+                            options,
                             intTarget.c_str(),
                             pegRevision.revision(),
                             startRevision.revision(),
@@ -1619,13 +1621,13 @@
     if (rv != APR_SUCCESS)
     {
         err = svn_error_create(rv, NULL,_("Cannot close file."));
-         JNIUtil::handleSVNError(err);
+	JNIUtil::handleSVNError(err);
         return;
     }
 
-    if(Err != NULL)
+    if (err != NULL)
     {
-         JNIUtil::handleSVNError(Err);
+        JNIUtil::handleSVNError(err);
         return;
     }
 }