Hi All,
Find the attached patch and log.
With regards
Kamesh Jayachandran
[[[
Stylistic fix.
* subversion/bindings/java/javahl/native/SVNClient.cpp
* subversion/bindings/java/javahl/native/Prompter.cpp
* subversion/bindings/java/javahl/native/JNIStackElement.cpp
* subversion/bindings/java/javahl/native/JNIUtil.h
* subversion/bindings/java/javahl/native/Outputer.h
* subversion/bindings/java/javahl/native/BlameCallback.h
* subversion/bindings/java/javahl/native/JNIByteArray.cpp
* subversion/bindings/java/javahl/native/MessageReceiver.cpp
* subversion/bindings/java/javahl/native/Prompter.h
* subversion/bindings/java/javahl/native/SVNAdmin.h
* subversion/bindings/java/javahl/native/JNIStackElement.h
* subversion/bindings/java/javahl/native/Notify2.cpp
* subversion/bindings/java/javahl/native/CommitMessage.cpp
* subversion/bindings/java/javahl/native/BlameCallback.cpp
- No space before paren.
- Fix Argument alignment while calling and defintion.
- Space between argument and a ','.
Patch by: kameshj
]]]
Index: subversion/bindings/java/javahl/native/SVNClient.cpp
===================================================================
--- subversion/bindings/java/javahl/native/SVNClient.cpp (revision 23162)
+++ subversion/bindings/java/javahl/native/SVNClient.cpp (working copy)
@@ -91,8 +91,7 @@
jstring SVNClient::getAdminDirectoryName()
{
Pool requestPool;
- jstring name =
- JNIUtil::makeJString(svn_wc_get_adm_dir(requestPool.pool()));
+ jstring name = JNIUtil::makeJString(svn_wc_get_adm_dir(requestPool.pool()));
if (JNIUtil::isJavaExceptionThrown())
{
return NULL;
@@ -139,15 +138,15 @@
}
apr_hash_t *dirents;
- Err = svn_client_ls2 (&dirents, urlPath.c_str(),
+ Err = svn_client_ls2(&dirents, urlPath.c_str(),
pegRevision.revision(),
revision.revision (),
recurse, ctx, requestPool.pool());
if (Err == NULL)
{
apr_array_header_t *array =
- svn_sort__hash (dirents, svn_sort_compare_items_as_paths,
- requestPool.pool());
+ svn_sort__hash(dirents, svn_sort_compare_items_as_paths,
+ requestPool.pool());
// create the array of DirEntry
JNIEnv *env = JNIUtil::getEnv();
@@ -223,8 +222,8 @@
// many, and we don't want too many local JNI references.
status_baton *statusBaton = (status_baton*)baton;
status_entry statusEntry;
- statusEntry.path = apr_pstrdup(statusBaton->pool,path);
- statusEntry.status = svn_wc_dup_status2(status,statusBaton->pool);
+ statusEntry.path = apr_pstrdup(statusBaton->pool, path);
+ statusEntry.status = svn_wc_dup_status2(status, statusBaton->pool);
statusBaton->statusVect.push_back(statusEntry);
}
@@ -259,15 +258,13 @@
rev.kind = svn_opt_revision_unspecified;
statusBaton.pool = requestPool.pool();
- Err = svn_client_status2 (
- &youngest, checkedPath.c_str(), &rev, statusReceiver,
+ Err = svn_client_status2(&youngest, checkedPath.c_str(),
+ &rev, statusReceiver,
&statusBaton, descend ? TRUE : FALSE,
- getAll ? TRUE : FALSE,
- onServer ? TRUE : FALSE,
- noIgnore ? TRUE : FALSE,
- ignoreExternals ? TRUE : FALSE,
- ctx,
- requestPool.pool());
+ getAll ? TRUE : FALSE, onServer ? TRUE : FALSE,
+ noIgnore ? TRUE : FALSE,
+ ignoreExternals ? TRUE : FALSE,
+ ctx, requestPool.pool());
if (Err == NULL)
{
JNIEnv *env = JNIUtil::getEnv();
@@ -344,7 +341,7 @@
return NULL;
}
- Err = svn_client_status2 (&youngest, intPath.c_str(), &rev,
+ Err = svn_client_status2(&youngest, intPath.c_str(), &rev,
statusReceiver, &statusBaton,
FALSE, // DESCEND
TRUE, // get_All
@@ -426,13 +423,13 @@
JNIUtil::handleSVNError(Err);
return NULL;
}
- Err = svn_client_log2 (targets,
- revisionStart.revision (),
- revisionEnd.revision (),
- limit,
- discoverPaths,
- stopOnCopy,
- messageReceiver, &logs, ctx, requestPool.pool());
+ Err = svn_client_log2(targets,
+ revisionStart.revision (),
+ revisionEnd.revision (),
+ limit,
+ discoverPaths,
+ stopOnCopy,
+ messageReceiver, &logs, ctx, requestPool.pool());
if(JNIUtil::isJavaExceptionThrown())
{
return NULL;
@@ -486,7 +483,7 @@
bool allowUnverObstructions)
{
Pool requestPool;
- apr_pool_t * apr_pool = requestPool.pool ();
+ apr_pool_t * apr_pool = requestPool.pool();
if(moduleName == NULL)
{
@@ -562,7 +559,7 @@
{
svn_client_commit_info_t *commit_info = NULL;
Pool requestPool;
- apr_pool_t * apr_pool = requestPool.pool ();
+ apr_pool_t * apr_pool = requestPool.pool();
svn_client_ctx_t *ctx = getContext(message);
if(ctx == NULL)
{
@@ -576,9 +573,7 @@
return;
}
- Err = svn_client_delete (&commit_info,
- targets2, force,
- ctx, apr_pool);
+ Err = svn_client_delete(&commit_info, targets2, force, ctx, apr_pool);
if(Err != NULL)
JNIUtil::handleSVNError(Err);
@@ -587,7 +582,7 @@
void SVNClient::revert(const char *path, bool recurse)
{
Pool requestPool;
- apr_pool_t * apr_pool = requestPool.pool ();
+ apr_pool_t * apr_pool = requestPool.pool();
if(path == NULL)
{
@@ -608,8 +603,7 @@
{
return;
}
- Err = svn_client_revert (targets, recurse,
- ctx, apr_pool);
+ Err = svn_client_revert(targets, recurse, ctx, apr_pool);
if(Err != NULL)
JNIUtil::handleSVNError(Err);
@@ -619,7 +613,7 @@
void SVNClient::add(const char *path, bool recurse, bool force)
{
Pool requestPool;
- apr_pool_t * apr_pool = requestPool.pool ();
+ apr_pool_t * apr_pool = requestPool.pool();
if(path == NULL)
{
@@ -639,8 +633,8 @@
{
return;
}
- Err = svn_client_add3 (intPath.c_str (), recurse, force, FALSE,
- ctx, apr_pool);
+ Err = svn_client_add3(intPath.c_str (), recurse, force, FALSE,
+ ctx, apr_pool);
if(Err != NULL)
JNIUtil::handleSVNError(Err);
@@ -650,7 +644,7 @@
bool ignoreExternals, bool allowUnverObstructions)
{
Pool requestPool;
- apr_pool_t * apr_pool = requestPool.pool ();
+ apr_pool_t * apr_pool = requestPool.pool();
svn_client_ctx_t *ctx = getContext(NULL);
apr_array_header_t *retval;
@@ -666,7 +660,7 @@
return NULL;
}
Err = svn_client_update3(&retval, array,
- revision.revision (),
+ revision.revision(),
recurse,
ignoreExternals,
allowUnverObstructions,
@@ -713,9 +707,8 @@
{
return -1;
}
- Err = svn_client_commit2 (&commit_info,
- targets2,
- recurse, noUnlock, ctx, apr_pool);
+ Err = svn_client_commit2(&commit_info, targets2, recurse,
+ noUnlock, ctx, apr_pool);
if(Err != NULL)
JNIUtil::handleSVNError(Err);
@@ -799,7 +792,7 @@
void SVNClient::mkdir(Targets &targets, const char *message)
{
Pool requestPool;
- apr_pool_t * apr_pool = requestPool.pool ();
+ apr_pool_t * apr_pool = requestPool.pool();
svn_client_commit_info_t *commit_info = NULL;
svn_client_ctx_t *ctx = getContext(message);
if(ctx == NULL)
@@ -814,10 +807,7 @@
return;
}
- Err = svn_client_mkdir (&commit_info,
- targets2,
- ctx,
- apr_pool);
+ Err = svn_client_mkdir(&commit_info, targets2, ctx, apr_pool);
if(Err != NULL)
JNIUtil::handleSVNError(Err);
@@ -827,7 +817,7 @@
void SVNClient::cleanup(const char *path)
{
Pool requestPool;
- apr_pool_t * apr_pool = requestPool.pool ();
+ apr_pool_t * apr_pool = requestPool.pool();
if(path == NULL)
{
JNIUtil::throwNullPointerException("path");
@@ -856,7 +846,7 @@
void SVNClient::resolved(const char *path, bool recurse)
{
Pool requestPool;
- apr_pool_t * apr_pool = requestPool.pool ();
+ apr_pool_t * apr_pool = requestPool.pool();
if(path == NULL)
{
JNIUtil::throwNullPointerException("path");
@@ -874,10 +864,7 @@
{
return;
}
- Err = svn_client_resolved (intPath.c_str (),
- recurse,
- ctx,
- apr_pool);
+ Err = svn_client_resolved(intPath.c_str(), recurse, ctx, apr_pool);
if(Err != NULL)
JNIUtil::handleSVNError(Err);
@@ -890,7 +877,7 @@
const char *nativeEOL)
{
Pool requestPool;
- apr_pool_t * apr_pool = requestPool.pool ();
+ apr_pool_t * apr_pool = requestPool.pool();
if(srcPath == NULL)
{
JNIUtil::throwNullPointerException("srcPath");
@@ -921,16 +908,12 @@
{
return -1;
}
- Err = svn_client_export3 (&retval, sourcePath.c_str (),
- destinationPath.c_str (),
- pegRevision.revision(),
- revision.revision (),
- force,
- ignoreExternals,
- recurse,
- nativeEOL,
- ctx,
- apr_pool);
+ Err = svn_client_export3(&retval, sourcePath.c_str(),
+ destinationPath.c_str(), pegRevision.revision(),
+ revision.revision(), force,
+ ignoreExternals, recurse,
+ nativeEOL, ctx,
+ apr_pool);
if(Err != NULL)
{
JNIUtil::handleSVNError(Err);
@@ -946,7 +929,7 @@
bool allowUnverObstructions)
{
Pool requestPool;
- apr_pool_t * apr_pool = requestPool.pool ();
+ apr_pool_t * apr_pool = requestPool.pool();
if(path == NULL)
{
JNIUtil::throwNullPointerException("path");
@@ -997,7 +980,7 @@
const char *message, bool recurse)
{
Pool requestPool;
- apr_pool_t * apr_pool = requestPool.pool ();
+ apr_pool_t * apr_pool = requestPool.pool();
if(path == NULL)
{
JNIUtil::throwNullPointerException("path");
@@ -1030,12 +1013,8 @@
return;
}
- Err = svn_client_import (&commit_info,
- intPath.c_str (),
- intUrl.c_str(),
- !recurse,
- ctx,
- apr_pool);
+ Err = svn_client_import(&commit_info, intPath.c_str(), intUrl.c_str(),
+ !recurse, ctx, apr_pool);
if(Err != NULL)
JNIUtil::handleSVNError(Err);
@@ -1063,7 +1042,7 @@
JNIUtil::throwNullPointerException("localPath");
return;
}
- apr_pool_t * apr_pool = requestPool.pool ();
+ apr_pool_t * apr_pool = requestPool.pool();
Path intLocalPath(localPath);
svn_error_t *Err = intLocalPath.error_occured();
if(Err != NULL)
@@ -1094,17 +1073,12 @@
return;
}
- Err = svn_client_merge (srcPath1.c_str (),
- revision1.revision (),
- srcPath2.c_str (),
- revision2.revision (),
- intLocalPath.c_str(),
- recurse,
- ignoreAncestry,
- force,
- dryRun,
- ctx,
- apr_pool);
+ Err = svn_client_merge(srcPath1.c_str(), revision1.revision(),
+ srcPath2.c_str(), revision2.revision (),
+ intLocalPath.c_str(), recurse,
+ ignoreAncestry, force,
+ dryRun, ctx,
+ apr_pool);
if(Err != NULL)
JNIUtil::handleSVNError(Err);
@@ -1126,7 +1100,7 @@
JNIUtil::throwNullPointerException("localPath");
return;
}
- apr_pool_t * apr_pool = requestPool.pool ();
+ apr_pool_t * apr_pool = requestPool.pool();
Path intLocalPath(localPath);
svn_error_t *Err = intLocalPath.error_occured();
if(Err != NULL)
@@ -1149,17 +1123,12 @@
return;
}
- Err = svn_client_merge_peg (srcPath.c_str (),
- revision1.revision (),
- revision2.revision (),
- pegRevision.revision(),
- intLocalPath.c_str(),
- recurse,
- ignoreAncestry,
- force,
- dryRun,
- ctx,
- apr_pool);
+ Err = svn_client_merge_peg(srcPath.c_str(), revision1.revision(),
+ revision2.revision(), pegRevision.revision(),
+ intLocalPath.c_str(), recurse,
+ ignoreAncestry, force,
+ dryRun, ctx,
+ apr_pool);
if(Err != NULL)
JNIUtil::handleSVNError(Err);
@@ -1185,7 +1154,7 @@
JNIUtil::throwNullPointerException("name");
return NULL;
}
- apr_pool_t * apr_pool = requestPool.pool ();
+ apr_pool_t * apr_pool = requestPool.pool();
Path intPath(path);
svn_error_t *Err = intPath.error_occured();
if(Err != NULL)
@@ -1201,14 +1170,10 @@
}
apr_hash_t *props;
- Err = svn_client_propget2(&props,
- name,
- intPath.c_str(),
- pegRevision.revision(),
- revision.revision(),
- FALSE,
- ctx,
- apr_pool);
+ Err = svn_client_propget2(&props, name,
+ intPath.c_str(), pegRevision.revision(),
+ revision.revision(), FALSE,
+ ctx, apr_pool);
if(Err != NULL)
{
@@ -1223,7 +1188,7 @@
return NULL; // no property with this name
svn_string_t *propval;
- apr_hash_this (hi, NULL, NULL, (void**)&propval);
+ apr_hash_this(hi, NULL, NULL, (void**)&propval);
if(propval == NULL)
return NULL;
@@ -1256,13 +1221,10 @@
return NULL;
}
- Err = svn_client_proplist2 (&props,
- intPath.c_str (),
- pegRevision.revision(),
- revision.revision(),
- FALSE,
- ctx,
- apr_pool);
+ Err = svn_client_proplist2(&props, intPath.c_str(),
+ pegRevision.revision(), revision.revision(),
+ FALSE, ctx,
+ apr_pool);
if(Err != NULL)
{
JNIUtil::handleSVNError(Err);
@@ -1439,9 +1401,9 @@
}
void SVNClient::diff(const char *target1, Revision &revision1,
- const char *target2, Revision &revision2,
- const char *outfileName,bool recurse, bool ignoreAncestry,
- bool noDiffDelete, bool force)
+ const char *target2, Revision &revision2,
+ const char *outfileName,bool recurse, bool ignoreAncestry,
+ bool noDiffDelete, bool force)
{
svn_error_t *err;
Pool requestPool;
@@ -1498,20 +1460,20 @@
apr_array_header_t *options = svn_cstring_split("", " \t\n\r", TRUE,
requestPool.pool());
- err = svn_client_diff2 (options,
- intTarget1.c_str(),
- revision1.revision(),
- intTarget2.c_str(),
- revision2.revision(),
- recurse ? TRUE : FALSE,
- ignoreAncestry ? TRUE : FALSE,
- noDiffDelete ? TRUE : FALSE,
- force ? TRUE : FALSE,
- outfile,
- NULL,
- // errFile (not needed when using default diff)
- ctx,
- requestPool.pool());
+ err = svn_client_diff2(options,
+ intTarget1.c_str(),
+ revision1.revision(),
+ intTarget2.c_str(),
+ revision2.revision(),
+ recurse ? TRUE : FALSE,
+ ignoreAncestry ? TRUE : FALSE,
+ noDiffDelete ? TRUE : FALSE,
+ force ? TRUE : FALSE,
+ outfile,
+ NULL,
+ // errFile (not needed when using default diff)
+ ctx,
+ requestPool.pool());
rv = apr_file_close(outfile);
if (rv != APR_SUCCESS)
@@ -1529,9 +1491,9 @@
}
void SVNClient::diff(const char *target, Revision &pegRevision,
- Revision &startRevision, Revision &endRevision,
- const char *outfileName,bool recurse, bool ignoreAncestry,
- bool noDiffDelete, bool force)
+ Revision &startRevision, Revision &endRevision,
+ const char *outfileName,bool recurse, bool ignoreAncestry,
+ bool noDiffDelete, bool force)
{
svn_error_t *err;
Pool requestPool;
@@ -1576,21 +1538,20 @@
apr_array_header_t *options = svn_cstring_split("", " \t\n\r", TRUE,
requestPool.pool());
- err = svn_client_diff_peg2(
- options,
- intTarget.c_str(),
- pegRevision.revision(),
- startRevision.revision(),
- endRevision.revision(),
- recurse ? TRUE : FALSE,
- ignoreAncestry ? TRUE : FALSE,
- noDiffDelete ? TRUE : FALSE,
- force ? TRUE : FALSE,
- outfile,
- NULL,
- // errFile (not needed when using default diff)
- ctx,
- requestPool.pool());
+ err = svn_client_diff_peg2(options,
+ intTarget.c_str(),
+ pegRevision.revision(),
+ startRevision.revision(),
+ endRevision.revision(),
+ recurse ? TRUE : FALSE,
+ ignoreAncestry ? TRUE : FALSE,
+ noDiffDelete ? TRUE : FALSE,
+ force ? TRUE : FALSE,
+ outfile,
+ NULL,
+ // errFile (not needed when using default diff)
+ ctx,
+ requestPool.pool());
rv = apr_file_close(outfile);
if (rv != APR_SUCCESS)
@@ -1760,7 +1721,7 @@
/* Build an authentication baton to give to libsvn_client. */
- svn_auth_open (&ab, providers, pool);
+ svn_auth_open(&ab, providers, pool);
/* Place any default --username or --password credentials into the
auth_baton's run-time parameter hash. ### Same with --no-auth-cache? */
@@ -1815,13 +1776,13 @@
if(jmsg != NULL)
{
JNIStringHolder msg(jmsg);
- *log_msg = apr_pstrdup (pool, msg);
+ *log_msg = apr_pstrdup(pool, msg);
}
return SVN_NO_ERROR;
}
else if (lmb && lmb->message)
{
- *log_msg = apr_pstrdup (pool, lmb->message);
+ *log_msg = apr_pstrdup(pool, lmb->message);
return SVN_NO_ERROR;
}
@@ -2060,9 +2021,10 @@
return ret;
}
-svn_error_t *SVNClient::messageReceiver (void *baton, apr_hash_t *changed_paths,
- svn_revnum_t rev, const char *author, const char *date,
- const char *msg, apr_pool_t * pool)
+svn_error_t *SVNClient::messageReceiver(void *baton, apr_hash_t *changed_paths,
+ svn_revnum_t rev, const char *author,
+ const char *date,
+ const char *msg, apr_pool_t * pool)
{
if(JNIUtil::isJavaExceptionThrown())
{
@@ -2141,8 +2103,9 @@
int i;
/* Get an array of sorted hash keys. */
- sorted_paths = svn_sort__hash (changed_paths,
- svn_sort_compare_items_as_paths, pool);
+ sorted_paths = svn_sort__hash(changed_paths,
+ svn_sort_compare_items_as_paths,
+ pool);
jChangedPaths = env->NewObjectArray(sorted_paths->nelts, clazzCP, NULL);
@@ -2321,12 +2284,8 @@
svn_client_ctx_t *ctx = getContext(NULL);
if(ctx == NULL)
return;
- Err = svn_client_propset2 (name, value,
- intPath.c_str(),
- recurse,
- force,
- ctx,
- JNIUtil::getRequestPool()->pool());
+ Err = svn_client_propset2(name, value, intPath.c_str(), recurse,
+ force, ctx, JNIUtil::getRequestPool()->pool());
if(Err!= NULL)
JNIUtil::handleSVNError(Err);
}
@@ -2476,15 +2435,13 @@
// base instead (which is not what we want).
apr_file_t *file = NULL;
apr_finfo_t finfo;
- apr_status_t apr_err = apr_stat(&finfo, path,
- APR_FINFO_MIN, pool);
+ apr_status_t apr_err = apr_stat(&finfo, path, APR_FINFO_MIN, pool);
if(apr_err)
{
JNIUtil::handleAPRError(apr_err, _("open file"));
return NULL;
}
- apr_err = apr_file_open(&file, path, APR_READ, 0,
- pool);
+ apr_err = apr_file_open(&file, path, APR_READ, 0, pool);
if(apr_err)
{
JNIUtil::handleAPRError(apr_err, _("open file"));
@@ -2610,7 +2567,7 @@
const char *URL;
svn_string_t *propval;
svn_revnum_t set_rev;
- Err = svn_client_url_from_path (&URL, intPath.c_str(), apr_pool);
+ Err = svn_client_url_from_path(&URL, intPath.c_str(), apr_pool);
if(Err != SVN_NO_ERROR)
{
@@ -2626,9 +2583,8 @@
return NULL;
}
- Err = svn_client_revprop_get (name, &propval,
- URL, rev.revision(),
- &set_rev, ctx, apr_pool);
+ Err = svn_client_revprop_get(name, &propval, URL,
+ rev.revision(), &set_rev, ctx, apr_pool);
if(Err != SVN_NO_ERROR)
{
JNIUtil::handleSVNError(Err);
@@ -2691,8 +2647,8 @@
}
- Err = svn_client_relocate (intPath.c_str(), intFrom.c_str(), intTo.c_str(),
- recurse, ctx, apr_pool);
+ Err = svn_client_relocate(intPath.c_str(), intFrom.c_str(), intTo.c_str(),
+ recurse, ctx, apr_pool);
if(Err != SVN_NO_ERROR)
{
@@ -2742,13 +2698,10 @@
}
svn_stringbuf_t *buf = svn_stringbuf_create("", apr_pool);
svn_stream_t *read_stream = svn_stream_from_stringbuf(buf, apr_pool);
- Err = svn_client_blame (intPath.c_str(),
- revisionStart.revision(),
- revisionEnd.revision(),
- blame_receiver,
- read_stream,
- ctx,
- apr_pool);
+ Err = svn_client_blame(intPath.c_str(), revisionStart.revision(),
+ revisionEnd.revision(), blame_receiver,
+ read_stream, ctx,
+ apr_pool);
if(Err != SVN_NO_ERROR)
{
JNIUtil::handleSVNError(Err);
@@ -2767,8 +2720,7 @@
{
return NULL;
}
- Err = svn_stream_read (read_stream, (char *)retdata,
- &size);
+ Err = svn_stream_read(read_stream, (char *)retdata, &size);
if(Err != NULL)
{
@@ -2785,7 +2737,7 @@
return ret;
}
static svn_error_t *
-blame_receiver2 (void *baton,
+blame_receiver2(void *baton,
apr_int64_t line_no,
svn_revnum_t revision,
const char *author,
@@ -2884,7 +2836,7 @@
JNIUtil::throwNullPointerException("path");
return NULL;
}
- apr_pool_t * apr_pool = requestPool.pool ();
+ apr_pool_t * apr_pool = requestPool.pool();
Path intPath(path);
svn_error_t *Err = intPath.error_occured();
if(Err != NULL)
@@ -2894,7 +2846,7 @@
}
Err = svn_wc_adm_probe_open2(&adm_access, NULL, intPath.c_str(),
- FALSE, 0, apr_pool);
+ FALSE, 0, apr_pool);
if(Err != NULL)
{
JNIUtil::handleSVNError(Err);
@@ -3147,8 +3099,7 @@
return ret;
}
-void SVNClient::lock(Targets &targets, const char *comment,
- bool force)
+void SVNClient::lock(Targets &targets, const char *comment, bool force)
{
Pool requestPool;
const apr_array_header_t *targetsApr = targets.array(requestPool);
@@ -3181,7 +3132,7 @@
}
svn_client_ctx_t *ctx = getContext(NULL);
Err = svn_client_unlock((apr_array_header_t*)targetsApr, force,
- ctx, requestPool.pool());
+ ctx, requestPool.pool());
if(Err != NULL)
{
JNIUtil::handleSVNError(Err);
@@ -3203,7 +3154,7 @@
JNIUtil::throwNullPointerException("name");
return ;
}
- apr_pool_t * apr_pool = requestPool.pool ();
+ apr_pool_t * apr_pool = requestPool.pool();
Path intPath(path);
svn_error_t *Err = intPath.error_occured();
if(Err != NULL)
@@ -3218,7 +3169,7 @@
return ;
}
const char *URL;
- Err = svn_client_url_from_path (&URL, intPath.c_str(), apr_pool);
+ Err = svn_client_url_from_path(&URL, intPath.c_str(), apr_pool);
if(Err != SVN_NO_ERROR)
{
@@ -3237,8 +3188,8 @@
svn_string_t *val = svn_string_create(value, apr_pool);
svn_revnum_t set_revision;
- Err = svn_client_revprop_set (name, val, URL, rev.revision(),
- &set_revision, force, ctx, apr_pool);
+ Err = svn_client_revprop_set(name, val, URL, rev.revision(),
+ &set_revision, force, ctx, apr_pool);
if(Err != SVN_NO_ERROR)
{
JNIUtil::handleSVNError(Err);
@@ -3273,9 +3224,9 @@
/* An svn_wc_status_func_t callback function for anaylyzing status
structures. */
static void
-analyze_status (void *baton,
- const char *path,
- svn_wc_status_t *status)
+analyze_status(void *baton,
+ const char *path,
+ svn_wc_status_t *status)
{
struct version_status_baton *sb = (version_status_baton *)baton;
@@ -3314,14 +3265,14 @@
/* This implements `svn_wc_notify_func_t'. */
static void
-notify (void *baton,
- const char *path,
- svn_wc_notify_action_t action,
- svn_node_kind_t kind,
- const char *mime_type,
- svn_wc_notify_state_t content_state,
- svn_wc_notify_state_t prop_state,
- svn_revnum_t revision)
+notify(void *baton,
+ const char *path,
+ svn_wc_notify_action_t action,
+ svn_node_kind_t kind,
+ const char *mime_type,
+ svn_wc_notify_state_t content_state,
+ svn_wc_notify_state_t prop_state,
+ svn_revnum_t revision)
{
struct version_status_baton *sb = (version_status_baton *)baton;
if ((action == svn_wc_notify_status_external)
@@ -3400,9 +3351,9 @@
ctx.cancel_func = cancel;
ctx.cancel_baton = &sb;
- Err = svn_client_status (NULL, intPath.c_str(), &rev, analyze_status,
- &sb, TRUE, TRUE, FALSE, FALSE, &ctx,
- requestPool.pool());
+ Err = svn_client_status(NULL, intPath.c_str(), &rev, analyze_status,
+ &sb, TRUE, TRUE, FALSE, FALSE, &ctx,
+ requestPool.pool());
if (Err&& (Err->apr_err == SVN_ERR_CANCELLED))
svn_error_clear (Err);
else if(Err != NULL)
@@ -3454,7 +3405,7 @@
JNIUtil::throwNullPointerException("path");
return NULL;
}
- apr_pool_t * apr_pool = requestPool.pool ();
+ apr_pool_t * apr_pool = requestPool.pool();
Path intPath(path);
svn_error_t *Err = intPath.error_occured();
if(Err != NULL)
@@ -3465,7 +3416,7 @@
const char *URL;
svn_revnum_t set_rev;
- Err = svn_client_url_from_path (&URL, intPath.c_str(), apr_pool);
+ Err = svn_client_url_from_path(&URL, intPath.c_str(), apr_pool);
svn_client_ctx_t *ctx = getContext(NULL);
if(ctx == NULL)
@@ -3473,12 +3424,8 @@
return NULL;
}
- Err = svn_client_revprop_list (&props,
- URL,
- revision.revision(),
- &set_rev,
- ctx,
- apr_pool);
+ Err = svn_client_revprop_list(&props, URL, revision.revision(),
+ &set_rev, ctx, apr_pool);
if(Err != NULL)
{
JNIUtil::handleSVNError(Err);
@@ -3513,7 +3460,7 @@
const char *key;
svn_string_t *val;
- apr_hash_this (hi, (const void **)&key, NULL, (void**)&val);
+ apr_hash_this(hi, (const void **)&key, NULL, (void**)&val);
jobject object = createJavaProperty(jthis, path,
key, val);
@@ -3542,8 +3489,8 @@
std::vector<info_entry> infoVect;
apr_pool_t *pool;
};
-jobjectArray SVNClient::info2(const char *path, Revision &revision,
- Revision &pegRevision, bool recurse)
+jobjectArray SVNClient::info2(const char *path, Revision &revision,
+ Revision &pegRevision, bool recurse)
{
info_baton infoBaton;
Pool requestPool;
@@ -3569,15 +3516,14 @@
infoBaton.pool = requestPool.pool();
- Err = svn_client_info (
- checkedPath.c_str(),
- pegRevision.revision(),
- revision.revision(),
- infoReceiver,
- &infoBaton,
- recurse ? TRUE :FALSE,
- ctx,
- requestPool.pool());
+ Err = svn_client_info(checkedPath.c_str(),
+ pegRevision.revision(),
+ revision.revision(),
+ infoReceiver,
+ &infoBaton,
+ recurse ? TRUE :FALSE,
+ ctx,
+ requestPool.pool());
if (Err == NULL)
{
JNIEnv *env = JNIUtil::getEnv();
@@ -3602,8 +3548,7 @@
{
info_entry infoEntry = infoBaton.infoVect[i];
- jobject jInfo = createJavaInfo2(infoEntry.path,
- infoEntry.info);
+ jobject jInfo = createJavaInfo2(infoEntry.path, infoEntry.info);
env->SetObjectArrayElement(ret, i, jInfo);
if(JNIUtil::isJavaExceptionThrown())
{
Index: subversion/bindings/java/javahl/native/Prompter.cpp
===================================================================
--- subversion/bindings/java/javahl/native/Prompter.cpp (revision 23162)
+++ subversion/bindings/java/javahl/native/Prompter.cpp (working copy)
@@ -256,7 +256,7 @@
// execute the callback
jboolean ret = env->CallBooleanMethod(m_prompter, mid, jrealm, jquestion,
- yesIsDefault ? JNI_TRUE : JNI_FALSE);
+ yesIsDefault ? JNI_TRUE : JNI_FALSE);
if(JNIUtil::isJavaExceptionThrown())
{
return false;
@@ -620,11 +620,11 @@
{
apr_pool_t *pool = JNIUtil::getRequestPool()->pool();
svn_auth_provider_object_t *provider;
- svn_client_get_simple_prompt_provider (&provider,
- simple_prompt,
- this,
- 2, /* retry limit */
- pool);
+ svn_client_get_simple_prompt_provider(&provider,
+ simple_prompt,
+ this,
+ 2, /* retry limit */
+ pool);
return provider;
}
@@ -632,11 +632,11 @@
{
apr_pool_t *pool = JNIUtil::getRequestPool()->pool();
svn_auth_provider_object_t *provider;
- svn_client_get_username_prompt_provider (&provider,
- username_prompt,
- this,
- 2, /* retry limit */
- pool);
+ svn_client_get_username_prompt_provider(&provider,
+ username_prompt,
+ this,
+ 2, /* retry limit */
+ pool);
return provider;
}
@@ -725,7 +725,7 @@
apr_uint32_t failures,
const svn_auth_ssl_server_cert_info_t *cert_info,
svn_boolean_t may_save,
- apr_pool_t *pool)
+ apr_pool_t *pool)
{
Prompter *that = (Prompter*)baton;
svn_auth_cred_ssl_server_trust_t *ret =
Index: subversion/bindings/java/javahl/native/JNIStackElement.cpp
===================================================================
--- subversion/bindings/java/javahl/native/JNIStackElement.cpp (revision 23162)
+++ subversion/bindings/java/javahl/native/JNIStackElement.cpp (working copy)
@@ -110,7 +110,9 @@
{
// generate a log message
char *buffer = JNIUtil::getFormatBuffer();
- apr_snprintf(buffer, JNIUtil::formatBufferSize, "exit class %s method %s object %s", m_clazz, m_method, m_objectID);
+ apr_snprintf(buffer, JNIUtil::formatBufferSize,
+ "exit class %s method %s object %s", m_clazz,
+ m_method, m_objectID);
JNIUtil::logMessage(buffer);
}
JNIThreadData::popThreadData();
Index: subversion/bindings/java/javahl/native/JNIUtil.h
===================================================================
--- subversion/bindings/java/javahl/native/JNIUtil.h (revision 23162)
+++ subversion/bindings/java/javahl/native/JNIUtil.h (working copy)
@@ -127,8 +127,8 @@
private:
static void assembleErrorMessage(svn_error_t *err, int depth,
- apr_status_t parent_apr_err,
- std::string &buffer);
+ apr_status_t parent_apr_err,
+ std::string &buffer);
static void setExceptionThrown();
/**
* the log level of this module
Index: subversion/bindings/java/javahl/native/Outputer.h
===================================================================
--- subversion/bindings/java/javahl/native/Outputer.h (revision 23162)
+++ subversion/bindings/java/javahl/native/Outputer.h (working copy)
@@ -40,7 +40,7 @@
*/
jobject m_jthis;
static svn_error_t *write(void *baton,
- const char *buffer, apr_size_t *len);
+ const char *buffer, apr_size_t *len);
static svn_error_t *close(void *baton);
public:
Outputer(jobject jthis);
Index: subversion/bindings/java/javahl/native/BlameCallback.h
===================================================================
--- subversion/bindings/java/javahl/native/BlameCallback.h (revision 23162)
+++ subversion/bindings/java/javahl/native/BlameCallback.h (working copy)
@@ -38,7 +38,8 @@
BlameCallback(jobject jcallback);
~BlameCallback();
svn_error_t *callback(svn_revnum_t revision, const char *author,
- const char *date, const char *line, apr_pool_t *pool);
+ const char *date, const char *line,
+ apr_pool_t *pool);
private:
/**
* this a local reference to the java object.
Index: subversion/bindings/java/javahl/native/JNIByteArray.cpp
===================================================================
--- subversion/bindings/java/javahl/native/JNIByteArray.cpp (revision 23162)
+++ subversion/bindings/java/javahl/native/JNIByteArray.cpp (working copy)
@@ -49,8 +49,7 @@
if(m_array != NULL)
{
// release the bytes
- JNIUtil::getEnv()->ReleaseByteArrayElements(m_array, m_data,
- JNI_ABORT);
+ JNIUtil::getEnv()->ReleaseByteArrayElements(m_array, m_data, JNI_ABORT);
if(m_deleteByteArray)
// and if needed the byte array
JNIUtil::getEnv()->DeleteLocalRef(m_array);
Index: subversion/bindings/java/javahl/native/MessageReceiver.cpp
===================================================================
--- subversion/bindings/java/javahl/native/MessageReceiver.cpp (revision 23162)
+++ subversion/bindings/java/javahl/native/MessageReceiver.cpp (working copy)
@@ -53,8 +53,8 @@
{
return;
}
- mid = env->GetMethodID(clazz, "receiveMessageLine",
- "(Ljava/lang/String;)V");
+ mid = env->GetMethodID(clazz, "receiveMessageLine",
+ "(Ljava/lang/String;)V");
if(JNIUtil::isJavaExceptionThrown() || mid == 0)
{
return;
Index: subversion/bindings/java/javahl/native/Prompter.h
===================================================================
--- subversion/bindings/java/javahl/native/Prompter.h (revision 23162)
+++ subversion/bindings/java/javahl/native/Prompter.h (working copy)
@@ -64,7 +64,7 @@
bool prompt(const char *realm, const char *pi_username, bool maySave);
bool askYesNo(const char *realm, const char *question, bool yesIsDefault);
const char *askQuestion(const char *realm, const char *question,
- bool showAnswer, bool maySave);
+ bool showAnswer, bool maySave);
int askTrust(const char *question, bool maySave);
jstring password();
jstring username();
Index: subversion/bindings/java/javahl/native/SVNAdmin.h
===================================================================
--- subversion/bindings/java/javahl/native/SVNAdmin.h (revision 23162)
+++ subversion/bindings/java/javahl/native/SVNAdmin.h (working copy)
@@ -48,17 +48,17 @@
jlong recover(const char *path);
void lstxns(const char *path, MessageReceiver &messageReceiver);
void load(const char *path, Inputer &dataIn, Outputer &messageOut,
- bool ignoreUUID, bool forceUUID, const char *relativePath);
+ bool ignoreUUID, bool forceUUID, const char *relativePath);
void listUnusedDBLogs(const char *path,
- MessageReceiver &messageReceiver);
+ MessageReceiver &messageReceiver);
void listDBLogs(const char *path, MessageReceiver &messageReceiver);
void hotcopy(const char *path, const char *targetPath, bool cleanLogs);
void dump(const char *path, Outputer &dataOut, Outputer &messageOut,
- Revision &revsionStart, Revision &RevisionEnd,
- bool incremental);
+ Revision &revsionStart, Revision &RevisionEnd,
+ bool incremental);
void deltify(const char *path, Revision &start, Revision &end);
void create(const char *path, bool ignoreUUID, bool forceUUID,
- const char *configPath, const char *fstype);
+ const char *configPath, const char *fstype);
SVNAdmin();
virtual ~SVNAdmin();
void dispose(jobject jthis);
Index: subversion/bindings/java/javahl/native/JNIStackElement.h
===================================================================
--- subversion/bindings/java/javahl/native/JNIStackElement.h (revision 23162)
+++ subversion/bindings/java/javahl/native/JNIStackElement.h (working copy)
@@ -52,7 +52,7 @@
{
public:
JNIStackElement(JNIEnv *env, const char *clazz,
- const char *method, jobject jthis);
+ const char *method, jobject jthis);
virtual ~JNIStackElement();
private:
Index: subversion/bindings/java/javahl/native/Notify2.cpp
===================================================================
--- subversion/bindings/java/javahl/native/Notify2.cpp (revision 23162)
+++ subversion/bindings/java/javahl/native/Notify2.cpp (working copy)
@@ -94,10 +94,7 @@
*/
void
-Notify2::notify (
- void *baton,
- const svn_wc_notify_t *notify,
- apr_pool_t *pool)
+Notify2::notify(void *baton, const svn_wc_notify_t *notify, apr_pool_t *pool)
{
// an Notify object is used as the baton
Notify2 * that = (Notify2 *) baton;
@@ -114,9 +111,7 @@
* @param pool an apr pool to allocated memory
*/
void
-Notify2::onNotify (
- const svn_wc_notify_t *wcNotify,
- apr_pool_t *pool)
+Notify2::onNotify(const svn_wc_notify_t *wcNotify, apr_pool_t *pool)
{
JNIEnv *env = JNIUtil::getEnv();
// java method id will not change during the time this library is loaded,
@@ -186,9 +181,10 @@
jint jPropState = EnumMapper::mapNotifyState(wcNotify->prop_state);
jint jLockState = EnumMapper::mapNotifyLockState(wcNotify->lock_state);
// call the java method
- jobject jInfo = env->NewObject(clazz, midCT, jPath, jAction, jKind,
- jMimeType, jLock, jErr, jContentState, jPropState, jLockState,
- (jlong) wcNotify->revision);
+ jobject jInfo = env->NewObject(clazz, midCT, jPath, jAction,
+ jKind, jMimeType, jLock, jErr,
+ jContentState, jPropState, jLockState,
+ (jlong) wcNotify->revision);
if(JNIUtil::isJavaExceptionThrown())
{
return;
Index: subversion/bindings/java/javahl/native/CommitMessage.cpp
===================================================================
--- subversion/bindings/java/javahl/native/CommitMessage.cpp (revision 23162)
+++ subversion/bindings/java/javahl/native/CommitMessage.cpp (working copy)
@@ -176,7 +176,8 @@
// create the java object
jobject jitem = env->NewObject(clazz, midConstructor, jpath,
- jnodeKind, jstateFlags, jurl, jcopyUrl, jcopyRevision);
+ jnodeKind, jstateFlags, jurl,
+ jcopyUrl, jcopyRevision);
if(JNIUtil::isJavaExceptionThrown())
{
return NULL;
@@ -216,8 +217,9 @@
}
// call the java callback method
- jstring jmessage = (jstring)env->CallObjectMethod(m_jcommitMessage,
- midCallback, jitems);
+ jstring jmessage = (jstring)env->CallObjectMethod(m_jcommitMessage,
+ midCallback,
+ jitems);
if(JNIUtil::isJavaExceptionThrown())
{
return NULL;
Index: subversion/bindings/java/javahl/native/BlameCallback.cpp
===================================================================
--- subversion/bindings/java/javahl/native/BlameCallback.cpp (revision 23162)
+++ subversion/bindings/java/javahl/native/BlameCallback.cpp (working copy)
@@ -51,8 +51,8 @@
* @param pool memory pool for the use of this function
*/
svn_error_t* BlameCallback::callback(svn_revnum_t revision, const char *author,
- const char *date, const char *line,
- apr_pool_t *pool)
+ const char *date, const char *line,
+ apr_pool_t *pool)
{
JNIEnv *env = JNIUtil::getEnv();
@@ -89,7 +89,7 @@
if(date != NULL && *date != '\0')
{
apr_time_t timeTemp;
- svn_error_t *err = svn_time_from_cstring (&timeTemp, date, pool);
+ svn_error_t *err = svn_time_from_cstring(&timeTemp, date, pool);
if(err != SVN_NO_ERROR)
return err;
@@ -106,8 +106,8 @@
}
// call the java method
- env->CallVoidMethod(m_callback, mid, jdate, (jlong)revision, jauthor,
- jline);
+ env->CallVoidMethod(m_callback, mid, jdate,
+ (jlong)revision, jauthor, jline);
if(JNIUtil::isJavaExceptionThrown())
{
return SVN_NO_ERROR;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Jan 22 11:44:39 2007