You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by vm...@apache.org on 2012/12/24 23:40:26 UTC
svn commit: r1425689 - in /subversion/branches/javahl-ra: ./
subversion/bindings/javahl/native/
Author: vmpn
Date: Mon Dec 24 22:40:26 2012
New Revision: 1425689
URL: http://svn.apache.org/viewvc?rev=1425689&view=rev
Log:
On the javahl-ra branch:
Merge JavaHL changes from trunk@1399494
Modified:
subversion/branches/javahl-ra/ (props changed)
subversion/branches/javahl-ra/subversion/bindings/javahl/native/BlameCallback.cpp
subversion/branches/javahl-ra/subversion/bindings/javahl/native/ChangelistCallback.cpp
subversion/branches/javahl-ra/subversion/bindings/javahl/native/CommitCallback.cpp
subversion/branches/javahl-ra/subversion/bindings/javahl/native/CommitMessage.cpp
subversion/branches/javahl-ra/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp
subversion/branches/javahl-ra/subversion/bindings/javahl/native/ImportFilterCallback.cpp
subversion/branches/javahl-ra/subversion/bindings/javahl/native/InfoCallback.cpp
subversion/branches/javahl-ra/subversion/bindings/javahl/native/InputStream.cpp
subversion/branches/javahl-ra/subversion/bindings/javahl/native/ListCallback.cpp
subversion/branches/javahl-ra/subversion/bindings/javahl/native/LogMessageCallback.cpp
subversion/branches/javahl-ra/subversion/bindings/javahl/native/OutputStream.cpp
subversion/branches/javahl-ra/subversion/bindings/javahl/native/PatchCallback.cpp
subversion/branches/javahl-ra/subversion/bindings/javahl/native/Prompter.cpp
subversion/branches/javahl-ra/subversion/bindings/javahl/native/ProplistCallback.cpp
subversion/branches/javahl-ra/subversion/bindings/javahl/native/RaSharedContext.cpp
subversion/branches/javahl-ra/subversion/bindings/javahl/native/ReposNotifyCallback.cpp
subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNRepos.cpp
subversion/branches/javahl-ra/subversion/bindings/javahl/native/StatusCallback.cpp
Propchange: subversion/branches/javahl-ra/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1399487-1399494
Modified: subversion/branches/javahl-ra/subversion/bindings/javahl/native/BlameCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/BlameCallback.cpp?rev=1425689&r1=1425688&r2=1425689&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/bindings/javahl/native/BlameCallback.cpp (original)
+++ subversion/branches/javahl-ra/subversion/bindings/javahl/native/BlameCallback.cpp Mon Dec 24 22:40:26 2012
@@ -61,11 +61,9 @@ BlameCallback::callback(void *baton,
apr_pool_t *pool)
{
if (baton)
- return ((BlameCallback *)baton)->singleLine(start_revnum, end_revnum,
- line_no, revision, rev_props,
- merged_revision,
- merged_rev_props, merged_path,
- line, local_change, pool);
+ return static_cast<BlameCallback *>(baton)->singleLine(start_revnum,
+ end_revnum, line_no, revision, rev_props, merged_revision,
+ merged_rev_props, merged_path, line, local_change, pool);
return SVN_NO_ERROR;
}
Modified: subversion/branches/javahl-ra/subversion/bindings/javahl/native/ChangelistCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/ChangelistCallback.cpp?rev=1425689&r1=1425688&r2=1425689&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/bindings/javahl/native/ChangelistCallback.cpp (original)
+++ subversion/branches/javahl-ra/subversion/bindings/javahl/native/ChangelistCallback.cpp Mon Dec 24 22:40:26 2012
@@ -53,7 +53,8 @@ ChangelistCallback::callback(void *baton
apr_pool_t *pool)
{
if (baton)
- ((ChangelistCallback *)baton)->doChangelist(path, changelist, pool);
+ static_cast<ChangelistCallback *>(baton)->doChangelist(path, changelist,
+ pool);
return SVN_NO_ERROR;
}
Modified: subversion/branches/javahl-ra/subversion/bindings/javahl/native/CommitCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/CommitCallback.cpp?rev=1425689&r1=1425688&r2=1425689&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/bindings/javahl/native/CommitCallback.cpp (original)
+++ subversion/branches/javahl-ra/subversion/bindings/javahl/native/CommitCallback.cpp Mon Dec 24 22:40:26 2012
@@ -57,7 +57,7 @@ CommitCallback::callback(const svn_commi
apr_pool_t *pool)
{
if (baton)
- return ((CommitCallback *)baton)->commitInfo(commit_info, pool);
+ return static_cast<CommitCallback *>(baton)->commitInfo(commit_info, pool);
return SVN_NO_ERROR;
}
Modified: subversion/branches/javahl-ra/subversion/bindings/javahl/native/CommitMessage.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/CommitMessage.cpp?rev=1425689&r1=1425688&r2=1425689&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/bindings/javahl/native/CommitMessage.cpp (original)
+++ subversion/branches/javahl-ra/subversion/bindings/javahl/native/CommitMessage.cpp Mon Dec 24 22:40:26 2012
@@ -50,9 +50,9 @@ CommitMessage::callback(const char **log
void *baton,
apr_pool_t *pool)
{
- if (baton && ((CommitMessage *)baton)->m_jcommitMessage)
- return ((CommitMessage *)baton)->getCommitMessage(log_msg, tmp_file,
- commit_items, pool);
+ if (baton && static_cast<CommitMessage *>(baton)->m_jcommitMessage)
+ return static_cast<CommitMessage *>(baton)->getCommitMessage(
+ log_msg, tmp_file, commit_items, pool);
*log_msg = NULL;
*tmp_file = NULL;
Modified: subversion/branches/javahl-ra/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp?rev=1425689&r1=1425688&r2=1425689&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp (original)
+++ subversion/branches/javahl-ra/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp Mon Dec 24 22:40:26 2012
@@ -46,7 +46,7 @@ DiffSummaryReceiver::summarize(const svn
apr_pool_t *pool)
{
if (baton)
- return ((DiffSummaryReceiver *) baton)->onSummary(diff, pool);
+ return static_cast<DiffSummaryReceiver *>(baton)->onSummary(diff, pool);
return SVN_NO_ERROR;
}
Modified: subversion/branches/javahl-ra/subversion/bindings/javahl/native/ImportFilterCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/ImportFilterCallback.cpp?rev=1425689&r1=1425688&r2=1425689&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/bindings/javahl/native/ImportFilterCallback.cpp (original)
+++ subversion/branches/javahl-ra/subversion/bindings/javahl/native/ImportFilterCallback.cpp Mon Dec 24 22:40:26 2012
@@ -56,8 +56,8 @@ ImportFilterCallback::callback(void *bat
apr_pool_t *pool)
{
if (baton)
- return ((ImportFilterCallback *)baton)->doImportFilter(filtered,
- local_abspath, dirent, pool);
+ return static_cast<ImportFilterCallback *>(baton)->doImportFilter(
+ filtered, local_abspath, dirent, pool);
return SVN_NO_ERROR;
}
Modified: subversion/branches/javahl-ra/subversion/bindings/javahl/native/InfoCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/InfoCallback.cpp?rev=1425689&r1=1425688&r2=1425689&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/bindings/javahl/native/InfoCallback.cpp (original)
+++ subversion/branches/javahl-ra/subversion/bindings/javahl/native/InfoCallback.cpp Mon Dec 24 22:40:26 2012
@@ -52,7 +52,7 @@ InfoCallback::callback(void *baton,
apr_pool_t *pool)
{
if (baton)
- return ((InfoCallback *)baton)->singleInfo(path, info, pool);
+ return static_cast<InfoCallback *>(baton)->singleInfo(path, info, pool);
return SVN_NO_ERROR;
}
Modified: subversion/branches/javahl-ra/subversion/bindings/javahl/native/InputStream.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/InputStream.cpp?rev=1425689&r1=1425688&r2=1425689&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/bindings/javahl/native/InputStream.cpp (original)
+++ subversion/branches/javahl-ra/subversion/bindings/javahl/native/InputStream.cpp Mon Dec 24 22:40:26 2012
@@ -70,7 +70,7 @@ svn_error_t *InputStream::read(void *bat
{
JNIEnv *env = JNIUtil::getEnv();
// An object of our class is passed in as the baton.
- InputStream *that = (InputStream*)baton;
+ InputStream *that = static_cast<InputStream *>(baton);
// The method id will not change during the time this library is
// loaded, so it can be cached.
Modified: subversion/branches/javahl-ra/subversion/bindings/javahl/native/ListCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/ListCallback.cpp?rev=1425689&r1=1425688&r2=1425689&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/bindings/javahl/native/ListCallback.cpp (original)
+++ subversion/branches/javahl-ra/subversion/bindings/javahl/native/ListCallback.cpp Mon Dec 24 22:40:26 2012
@@ -57,8 +57,8 @@ ListCallback::callback(void *baton,
apr_pool_t *pool)
{
if (baton)
- return ((ListCallback *)baton)->doList(path, dirent, lock, abs_path,
- pool);
+ return static_cast<ListCallback *>(baton)->doList(
+ path, dirent, lock, abs_path, pool);
return SVN_NO_ERROR;
}
Modified: subversion/branches/javahl-ra/subversion/bindings/javahl/native/LogMessageCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/LogMessageCallback.cpp?rev=1425689&r1=1425688&r2=1425689&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/bindings/javahl/native/LogMessageCallback.cpp (original)
+++ subversion/branches/javahl-ra/subversion/bindings/javahl/native/LogMessageCallback.cpp Mon Dec 24 22:40:26 2012
@@ -57,7 +57,8 @@ LogMessageCallback::callback(void *baton
apr_pool_t *pool)
{
if (baton)
- return ((LogMessageCallback *)baton)->singleMessage(log_entry, pool);
+ return static_cast<LogMessageCallback *>(baton)->singleMessage(
+ log_entry, pool);
return SVN_NO_ERROR;
}
Modified: subversion/branches/javahl-ra/subversion/bindings/javahl/native/OutputStream.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/OutputStream.cpp?rev=1425689&r1=1425688&r2=1425689&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/bindings/javahl/native/OutputStream.cpp (original)
+++ subversion/branches/javahl-ra/subversion/bindings/javahl/native/OutputStream.cpp Mon Dec 24 22:40:26 2012
@@ -76,7 +76,7 @@ svn_error_t *OutputStream::write(void *b
JNIEnv *env = JNIUtil::getEnv();
// An object of our class is passed in as the baton.
- OutputStream *that = (OutputStream*)baton;
+ OutputStream *that = static_cast<OutputStream *>(baton);
// The method id will not change during the time this library is
// loaded, so it can be cached.
Modified: subversion/branches/javahl-ra/subversion/bindings/javahl/native/PatchCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/PatchCallback.cpp?rev=1425689&r1=1425688&r2=1425689&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/bindings/javahl/native/PatchCallback.cpp (original)
+++ subversion/branches/javahl-ra/subversion/bindings/javahl/native/PatchCallback.cpp Mon Dec 24 22:40:26 2012
@@ -54,10 +54,9 @@ PatchCallback::callback(void *baton,
apr_pool_t *pool)
{
if (baton)
- return ((PatchCallback *)baton)->singlePatch(filtered,
- canon_path_from_patchfile,
- patch_abspath, reject_abspath,
- pool);
+ return static_cast<PatchCallback *>(baton)->singlePatch(
+ filtered, canon_path_from_patchfile, patch_abspath, reject_abspath,
+ pool);
return SVN_NO_ERROR;
}
Modified: subversion/branches/javahl-ra/subversion/bindings/javahl/native/Prompter.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/Prompter.cpp?rev=1425689&r1=1425688&r2=1425689&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/bindings/javahl/native/Prompter.cpp (original)
+++ subversion/branches/javahl-ra/subversion/bindings/javahl/native/Prompter.cpp Mon Dec 24 22:40:26 2012
@@ -427,7 +427,7 @@ svn_error_t *Prompter::simple_prompt(svn
svn_boolean_t may_save,
apr_pool_t *pool)
{
- Prompter *that = (Prompter*)baton;
+ Prompter *that = static_cast<Prompter *>(baton);
svn_auth_cred_simple_t *ret =
(svn_auth_cred_simple_t*)apr_pcalloc(pool, sizeof(*ret));
if (!that->prompt(realm, username, may_save ? true : false))
@@ -460,7 +460,7 @@ svn_error_t *Prompter::username_prompt(s
svn_boolean_t may_save,
apr_pool_t *pool)
{
- Prompter *that = (Prompter*)baton;
+ Prompter *that = static_cast<Prompter *>(baton);
svn_auth_cred_username_t *ret =
(svn_auth_cred_username_t*)apr_pcalloc(pool, sizeof(*ret));
const char *user = that->askQuestion(realm, _("Username: "), true,
@@ -484,7 +484,7 @@ Prompter::ssl_server_trust_prompt(svn_au
svn_boolean_t may_save,
apr_pool_t *pool)
{
- Prompter *that = (Prompter*)baton;
+ Prompter *that = static_cast<Prompter *>(baton);
svn_auth_cred_ssl_server_trust_t *ret =
(svn_auth_cred_ssl_server_trust_t*)apr_pcalloc(pool, sizeof(*ret));
@@ -550,7 +550,7 @@ Prompter::ssl_client_cert_prompt(svn_aut
svn_boolean_t may_save,
apr_pool_t *pool)
{
- Prompter *that = (Prompter*)baton;
+ Prompter *that = static_cast<Prompter *>(baton);
svn_auth_cred_ssl_client_cert_t *ret =
(svn_auth_cred_ssl_client_cert_t*)apr_pcalloc(pool, sizeof(*ret));
const char *cert_file =
@@ -572,7 +572,7 @@ Prompter::ssl_client_cert_pw_prompt(svn_
svn_boolean_t may_save,
apr_pool_t *pool)
{
- Prompter *that = (Prompter*)baton;
+ Prompter *that = static_cast<Prompter *>(baton);
svn_auth_cred_ssl_client_cert_pw_t *ret =
(svn_auth_cred_ssl_client_cert_pw_t*)apr_pcalloc(pool, sizeof(*ret));
const char *info = that->askQuestion(realm,
@@ -593,7 +593,7 @@ Prompter::plaintext_prompt(svn_boolean_t
void *baton,
apr_pool_t *pool)
{
- Prompter *that = (Prompter *) baton;
+ Prompter *that = static_cast<Prompter *>(baton);
bool result = that->askYesNo(realmstring,
_("Store password unencrypted?"),
@@ -610,7 +610,7 @@ Prompter::plaintext_passphrase_prompt(sv
void *baton,
apr_pool_t *pool)
{
- Prompter *that = (Prompter *) baton;
+ Prompter *that = static_cast<Prompter *>(baton);
bool result = that->askYesNo(realmstring,
_("Store passphrase unencrypted?"),
Modified: subversion/branches/javahl-ra/subversion/bindings/javahl/native/ProplistCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/ProplistCallback.cpp?rev=1425689&r1=1425688&r2=1425689&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/bindings/javahl/native/ProplistCallback.cpp (original)
+++ subversion/branches/javahl-ra/subversion/bindings/javahl/native/ProplistCallback.cpp Mon Dec 24 22:40:26 2012
@@ -54,7 +54,8 @@ ProplistCallback::callback(void *baton,
apr_pool_t *pool)
{
if (baton)
- return ((ProplistCallback *)baton)->singlePath(path, prop_hash, pool);
+ return static_cast<ProplistCallback *>(baton)->singlePath(
+ path, prop_hash, pool);
return SVN_NO_ERROR;
}
Modified: subversion/branches/javahl-ra/subversion/bindings/javahl/native/RaSharedContext.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/RaSharedContext.cpp?rev=1425689&r1=1425688&r2=1425689&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/bindings/javahl/native/RaSharedContext.cpp (original)
+++ subversion/branches/javahl-ra/subversion/bindings/javahl/native/RaSharedContext.cpp Mon Dec 24 22:40:26 2012
@@ -268,7 +268,7 @@ RaSharedContext::isCancelledOperation()
svn_error_t *
RaSharedContext::checkCancel(void *cancelBaton)
{
- RaSharedContext *that = (RaSharedContext *) cancelBaton;
+ RaSharedContext *that = static_cast<RaSharedContext *>(cancelBaton);
if (that->isCancelledOperation())
return svn_error_create(SVN_ERR_CANCELLED, NULL, _("Operation cancelled"));
else
Modified: subversion/branches/javahl-ra/subversion/bindings/javahl/native/ReposNotifyCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/ReposNotifyCallback.cpp?rev=1425689&r1=1425688&r2=1425689&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/bindings/javahl/native/ReposNotifyCallback.cpp (original)
+++ subversion/branches/javahl-ra/subversion/bindings/javahl/native/ReposNotifyCallback.cpp Mon Dec 24 22:40:26 2012
@@ -49,7 +49,7 @@ ReposNotifyCallback::notify(void *baton,
apr_pool_t *pool)
{
if (baton)
- ((ReposNotifyCallback *)baton)->onNotify(notify, pool);
+ static_cast<ReposNotifyCallback *>(baton)->onNotify(notify, pool);
}
/**
Modified: subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNRepos.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNRepos.cpp?rev=1425689&r1=1425688&r2=1425689&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNRepos.cpp (original)
+++ subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNRepos.cpp Mon Dec 24 22:40:26 2012
@@ -68,7 +68,7 @@ void SVNRepos::cancelOperation()
svn_error_t *
SVNRepos::checkCancel(void *cancelBaton)
{
- SVNRepos *that = (SVNRepos *)cancelBaton;
+ SVNRepos *that = static_cast<SVNRepos *>(cancelBaton);
if (that->m_cancelOperation)
return svn_error_create(SVN_ERR_CANCELLED, NULL,
_("Operation cancelled"));
Modified: subversion/branches/javahl-ra/subversion/bindings/javahl/native/StatusCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/StatusCallback.cpp?rev=1425689&r1=1425688&r2=1425689&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/bindings/javahl/native/StatusCallback.cpp (original)
+++ subversion/branches/javahl-ra/subversion/bindings/javahl/native/StatusCallback.cpp Mon Dec 24 22:40:26 2012
@@ -55,7 +55,8 @@ StatusCallback::callback(void *baton,
apr_pool_t *pool)
{
if (baton)
- return ((StatusCallback *)baton)->doStatus(local_abspath, status, pool);
+ return static_cast<StatusCallback *>(baton)->doStatus(
+ local_abspath, status, pool);
return SVN_NO_ERROR;
}