You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2012/11/04 13:48:00 UTC
svn commit: r1405539 - /subversion/trunk/subversion/bindings/javahl/native/
Author: stefan2
Date: Sun Nov 4 12:47:59 2012
New Revision: 1405539
URL: http://svn.apache.org/viewvc?rev=1405539&view=rev
Log:
Make all explicit casts, i.e. those not inside some APR macro, use the
C++ cast operators static_cast, const_cast and reinterpret_cast.
No functional change.
Due to the large number of places changed and the simplicity of the change,
I won't list the function touched but only the affected files.
* subversion/bindings/javahl/native/ClientContext.cpp
* subversion/bindings/javahl/native/CopySources.cpp
* subversion/bindings/javahl/native/CreateJ.cpp
* subversion/bindings/javahl/native/EnumMapper.cpp
* subversion/bindings/javahl/native/InputStream.cpp
* subversion/bindings/javahl/native/JNIUtil.cpp
* subversion/bindings/javahl/native/LogMessageCallback.cpp
*subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
* subversion/bindings/javahl/native/OutputStream.cpp
* subversion/bindings/javahl/native/Prompter.cpp
* subversion/bindings/javahl/native/RevisionRange.cpp
* subversion/bindings/javahl/native/RevpropTable.cpp
* subversion/bindings/javahl/native/StringArray.cpp
* subversion/bindings/javahl/native/SVNClient.cpp
* subversion/bindings/javahl/native/SVNRepos.cpp
* subversion/bindings/javahl/native/Targets.cpp
Modified:
subversion/trunk/subversion/bindings/javahl/native/ClientContext.cpp
subversion/trunk/subversion/bindings/javahl/native/CopySources.cpp
subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp
subversion/trunk/subversion/bindings/javahl/native/EnumMapper.cpp
subversion/trunk/subversion/bindings/javahl/native/InputStream.cpp
subversion/trunk/subversion/bindings/javahl/native/JNIUtil.cpp
subversion/trunk/subversion/bindings/javahl/native/LogMessageCallback.cpp
subversion/trunk/subversion/bindings/javahl/native/OutputStream.cpp
subversion/trunk/subversion/bindings/javahl/native/Prompter.cpp
subversion/trunk/subversion/bindings/javahl/native/RevisionRange.cpp
subversion/trunk/subversion/bindings/javahl/native/RevpropTable.cpp
subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
subversion/trunk/subversion/bindings/javahl/native/SVNRepos.cpp
subversion/trunk/subversion/bindings/javahl/native/StringArray.cpp
subversion/trunk/subversion/bindings/javahl/native/Targets.cpp
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
Modified: subversion/trunk/subversion/bindings/javahl/native/ClientContext.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/ClientContext.cpp?rev=1405539&r1=1405538&r2=1405539&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/ClientContext.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/ClientContext.cpp Sun Nov 4 12:47:59 2012
@@ -126,7 +126,7 @@ struct clearctx_baton_t
static apr_status_t clear_ctx_ptrs(void *ptr)
{
- clearctx_baton_t *bt = (clearctx_baton_t*)ptr;
+ clearctx_baton_t *bt = reinterpret_cast<clearctx_baton_t*>(ptr);
/* Reset all values to those before overwriting by getContext. */
*bt->ctx = *bt->backup;
@@ -149,9 +149,11 @@ ClientContext::getContext(CommitMessage
Note that this allows creating a stack of context changes if
the function is invoked multiple times with different pools.
*/
- clearctx_baton_t *bt = (clearctx_baton_t *)apr_pcalloc(pool, sizeof(*bt));
+ clearctx_baton_t *bt =
+ reinterpret_cast<clearctx_baton_t *>(apr_pcalloc(pool, sizeof(*bt)));
bt->ctx = ctx;
- bt->backup = (svn_client_ctx_t*)apr_pmemdup(pool, ctx, sizeof(*ctx));
+ bt->backup =
+ reinterpret_cast<svn_client_ctx_t*>(apr_pmemdup(pool, ctx, sizeof(*ctx)));
apr_pool_cleanup_register(in_pool.getPool(), bt, clear_ctx_ptrs,
clear_ctx_ptrs);
@@ -167,9 +169,10 @@ ClientContext::getContext(CommitMessage
bt->backup->config = ctx->config;
}
- svn_config_t *config = (svn_config_t *) apr_hash_get(ctx->config,
- SVN_CONFIG_CATEGORY_CONFIG,
- APR_HASH_KEY_STRING);
+ svn_config_t *config =
+ reinterpret_cast<svn_config_t *>(apr_hash_get(ctx->config,
+ SVN_CONFIG_CATEGORY_CONFIG,
+ APR_HASH_KEY_STRING));
/* The whole list of registered providers */
Modified: subversion/trunk/subversion/bindings/javahl/native/CopySources.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/CopySources.cpp?rev=1405539&r1=1405538&r2=1405539&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/CopySources.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/CopySources.cpp Sun Nov 4 12:47:59 2012
@@ -95,12 +95,13 @@ CopySources::array(SVN::Pool &pool)
std::vector<jobject> sources = m_copySources.vector();
apr_array_header_t *copySources =
- apr_array_make(p, (int)sources.size(), sizeof(svn_client_copy_source_t *));
+ apr_array_make(p, static_cast<int>(sources.size()),
+ sizeof(svn_client_copy_source_t *));
for (std::vector<jobject>::const_iterator it = sources.begin();
it < sources.end(); ++it)
{
svn_client_copy_source_t *src =
- (svn_client_copy_source_t *) apr_palloc(p, sizeof(*src));
+ reinterpret_cast<svn_client_copy_source_t *>(apr_palloc(p, sizeof(*src)));
// Extract the path or URL from the copy source.
static jmethodID getPath = 0;
@@ -141,9 +142,10 @@ CopySources::array(SVN::Pool &pool)
// TODO: Default this to svn_opt_revision_undefined (or HEAD)
Revision rev(jrev);
- src->revision = (const svn_opt_revision_t *)
- apr_palloc(p, sizeof(*src->revision));
- memcpy((void *) src->revision, rev.revision(),
+ src->revision = reinterpret_cast<const svn_opt_revision_t *>
+ (apr_palloc(p, sizeof(*src->revision)));
+ memcpy(const_cast<svn_opt_revision_t *>(src->revision),
+ rev.revision(),
sizeof(*src->revision));
env->DeleteLocalRef(jrev);
@@ -161,9 +163,10 @@ CopySources::array(SVN::Pool &pool)
return NULL;
Revision pegRev(jPegRev, true);
- src->peg_revision = (const svn_opt_revision_t *)
- apr_palloc(p, sizeof(*src->peg_revision));
- memcpy((void *) src->peg_revision, pegRev.revision(),
+ src->peg_revision = reinterpret_cast<const svn_opt_revision_t *>
+ (apr_palloc(p, sizeof(*src->peg_revision)));
+ memcpy(const_cast<svn_opt_revision_t *>(src->peg_revision),
+ pegRev.revision(),
sizeof(*src->peg_revision));
env->DeleteLocalRef(jPegRev);
Modified: subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp?rev=1405539&r1=1405538&r2=1405539&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp Sun Nov 4 12:47:59 2012
@@ -206,9 +206,10 @@ CreateJ::Checksum(const svn_checksum_t *
POP_AND_RETURN_NULL;
}
- jbyteArray jdigest = JNIUtil::makeJByteArray(
- (const signed char *)checksum->digest,
- (int)svn_checksum_size(checksum));
+ jbyteArray jdigest
+ = JNIUtil::makeJByteArray(
+ reinterpret_cast<const signed char *>(checksum->digest),
+ static_cast<int>(svn_checksum_size(checksum)));
if (JNIUtil::isExceptionThrown())
POP_AND_RETURN_NULL;
@@ -1026,15 +1027,18 @@ jobject CreateJ::PropertyMap(apr_hash_t
const char *key;
svn_string_t *val;
- apr_hash_this(hi, (const void **)&key, NULL, (void **)&val);
+ apr_hash_this(hi,
+ reinterpret_cast<const void **>(&key),
+ NULL,
+ reinterpret_cast<void **>(&val));
jstring jpropName = JNIUtil::makeJString(key);
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NULL;
jbyteArray jpropVal = JNIUtil::makeJByteArray(
- (const signed char *)val->data,
- (int)val->len);
+ reinterpret_cast<const signed char *>(val->data),
+ static_cast<int>(val->len));
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NULL;
Modified: subversion/trunk/subversion/bindings/javahl/native/EnumMapper.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/EnumMapper.cpp?rev=1405539&r1=1405538&r2=1405539&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/EnumMapper.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/EnumMapper.cpp Sun Nov 4 12:47:59 2012
@@ -81,7 +81,8 @@ jobject EnumMapper::mapChangePathAction(
jobject EnumMapper::mapNotifyState(svn_wc_notify_state_t state)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/ClientNotifyInformation$Status", (int) state);
+ return mapEnum(JAVA_PACKAGE"/ClientNotifyInformation$Status",
+ static_cast<int>(state));
}
/**
@@ -90,13 +91,15 @@ jobject EnumMapper::mapNotifyState(svn_w
jobject EnumMapper::mapNotifyAction(svn_wc_notify_action_t action)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/ClientNotifyInformation$Action", (int) action);
+ return mapEnum(JAVA_PACKAGE"/ClientNotifyInformation$Action",
+ static_cast<int>(action));
}
jobject EnumMapper::mapReposNotifyNodeAction(svn_node_action action)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/ReposNotifyInformation$NodeAction", (int) action);
+ return mapEnum(JAVA_PACKAGE"/ReposNotifyInformation$NodeAction",
+ static_cast<int>(action));
}
/**
@@ -105,7 +108,8 @@ jobject EnumMapper::mapReposNotifyNodeAc
jobject EnumMapper::mapReposNotifyAction(svn_repos_notify_action_t action)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/ReposNotifyInformation$Action", (int) action);
+ return mapEnum(JAVA_PACKAGE"/ReposNotifyInformation$Action",
+ static_cast<int>(action));
}
/**
@@ -114,7 +118,8 @@ jobject EnumMapper::mapReposNotifyAction
jobject EnumMapper::mapNodeKind(svn_node_kind_t nodeKind)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/types/NodeKind", (int) nodeKind);
+ return mapEnum(JAVA_PACKAGE"/types/NodeKind",
+ static_cast<int>(nodeKind));
}
/**
@@ -123,7 +128,8 @@ jobject EnumMapper::mapNodeKind(svn_node
jobject EnumMapper::mapNotifyLockState(svn_wc_notify_lock_state_t state)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/ClientNotifyInformation$LockStatus", (int) state);
+ return mapEnum(JAVA_PACKAGE"/ClientNotifyInformation$LockStatus",
+ static_cast<int>(state));
}
/**
@@ -132,7 +138,8 @@ jobject EnumMapper::mapNotifyLockState(s
jobject EnumMapper::mapScheduleKind(svn_wc_schedule_t schedule)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/types/Info$ScheduleKind", (int) schedule);
+ return mapEnum(JAVA_PACKAGE"/types/Info$ScheduleKind",
+ static_cast<int>(schedule));
}
/**
@@ -142,31 +149,36 @@ jobject EnumMapper::mapStatusKind(svn_wc
{
// We're assuming a valid value for the C enum above
// The offset here is +1
- return mapEnum(JAVA_PACKAGE"/types/Status$Kind", ((int) svnKind) - 1);
+ return mapEnum(JAVA_PACKAGE"/types/Status$Kind",
+ static_cast<int>(svnKind) - 1);
}
jobject EnumMapper::mapChecksumKind(svn_checksum_kind_t kind)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/types/Checksum$Kind", (int) kind);
+ return mapEnum(JAVA_PACKAGE"/types/Checksum$Kind",
+ static_cast<int>(kind));
}
jobject EnumMapper::mapConflictKind(svn_wc_conflict_kind_t kind)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/ConflictDescriptor$Kind", (int) kind);
+ return mapEnum(JAVA_PACKAGE"/ConflictDescriptor$Kind",
+ static_cast<int>(kind));
}
jobject EnumMapper::mapConflictAction(svn_wc_conflict_action_t action)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/ConflictDescriptor$Action", (int) action);
+ return mapEnum(JAVA_PACKAGE"/ConflictDescriptor$Action",
+ static_cast<int>(action));
}
jobject EnumMapper::mapConflictReason(svn_wc_conflict_reason_t reason)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/ConflictDescriptor$Reason", (int) reason);
+ return mapEnum(JAVA_PACKAGE"/ConflictDescriptor$Reason",
+ static_cast<int>(reason));
}
int EnumMapper::toMergeinfoLogKind(jobject jLogKind)
@@ -182,45 +194,47 @@ int EnumMapper::toLogLevel(jobject jLogL
svn_depth_t EnumMapper::toDepth(jobject jdepth)
{
// The offset for depths is -2
- return (svn_depth_t) (getOrdinal(JAVA_PACKAGE"/types/Depth", jdepth) - 2);
+ return static_cast<svn_depth_t>(getOrdinal(JAVA_PACKAGE"/types/Depth", jdepth) - 2);
}
jobject EnumMapper::mapDepth(svn_depth_t depth)
{
// We're assuming a valid value for the C enum above
// The offset for depths is -2
- return mapEnum(JAVA_PACKAGE"/types/Depth", ((int) depth) + 2);
+ return mapEnum(JAVA_PACKAGE"/types/Depth", static_cast<int>(depth) + 2);
}
jobject EnumMapper::mapOperation(svn_wc_operation_t operation)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/ConflictDescriptor$Operation", (int) operation);
+ return mapEnum(JAVA_PACKAGE"/ConflictDescriptor$Operation",
+ static_cast<int>(operation));
}
jobject EnumMapper::mapTristate(svn_tristate_t tristate)
{
// We're assuming a valid value for the C enum above
return mapEnum(JAVA_PACKAGE"/types/Tristate",
- (int) (tristate - svn_tristate_false));
+ static_cast<int>(tristate - svn_tristate_false));
}
svn_wc_conflict_choice_t EnumMapper::toConflictChoice(jobject jchoice)
{
- return (svn_wc_conflict_choice_t) getOrdinal(
- JAVA_PACKAGE"/ConflictResult$Choice", jchoice);
+ return static_cast<svn_wc_conflict_choice_t>
+ (getOrdinal(JAVA_PACKAGE"/ConflictResult$Choice", jchoice));
}
svn_opt_revision_kind EnumMapper::toRevisionKind(jobject jkind)
{
- return (svn_opt_revision_kind) getOrdinal(JAVA_PACKAGE"/types/Revision$Kind",
- jkind);
+ return static_cast<svn_opt_revision_kind>
+ (getOrdinal(JAVA_PACKAGE"/types/Revision$Kind", jkind));
}
jobject EnumMapper::mapSummarizeKind(svn_client_diff_summarize_kind_t sKind)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/DiffSummary$DiffKind", (int) sKind);
+ return mapEnum(JAVA_PACKAGE"/DiffSummary$DiffKind",
+ static_cast<int>(sKind));
}
jobject EnumMapper::mapEnum(const char *clazzName, int index)
@@ -282,5 +296,5 @@ int EnumMapper::getOrdinal(const char *c
POP_AND_RETURN(-1);
env->PopLocalFrame(NULL);
- return (int) jorder;
+ return static_cast<int>(jorder);
}
Modified: subversion/trunk/subversion/bindings/javahl/native/InputStream.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/InputStream.cpp?rev=1405539&r1=1405538&r2=1405539&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/InputStream.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/InputStream.cpp Sun Nov 4 12:47:59 2012
@@ -89,8 +89,9 @@ svn_error_t *InputStream::read(void *bat
}
// Allocate a Java byte array to read the data.
- jbyteArray data = JNIUtil::makeJByteArray((const signed char*)buffer,
- *len);
+ jbyteArray data = JNIUtil::makeJByteArray
+ (reinterpret_cast<const signed char*>(buffer),
+ static_cast<int>(*len));
if (JNIUtil::isJavaExceptionThrown())
return SVN_NO_ERROR;
@@ -138,7 +139,7 @@ svn_error_t *InputStream::close(void *ba
JNIEnv *env = JNIUtil::getEnv();
// An object of our class is passed in as the baton
- InputStream *that = (InputStream*)baton;
+ InputStream *that = reinterpret_cast<InputStream*>(baton);
// The method id will not change during the time this library is
// loaded, so it can be cached.
Modified: subversion/trunk/subversion/bindings/javahl/native/JNIUtil.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/JNIUtil.cpp?rev=1405539&r1=1405538&r2=1405539&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/JNIUtil.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/JNIUtil.cpp Sun Nov 4 12:47:59 2012
@@ -211,7 +211,7 @@ bool JNIUtil::JNIGlobalInit(JNIEnv *env)
GetModuleFileNameW(moduleHandle, ucs2_path, inwords);
inwords = lstrlenW(ucs2_path);
outbytes = outlength = 3 * (inwords + 1);
- utf8_path = (char *)apr_palloc(pool, outlength);
+ utf8_path = reinterpret_cast<char *>(apr_palloc(pool, outlength));
apr_err = apr_conv_ucs2_to_utf8((const apr_wchar_t *) ucs2_path,
&inwords, utf8_path, &outbytes);
if (!apr_err && (inwords > 0 || outbytes == 0))
Modified: subversion/trunk/subversion/bindings/javahl/native/LogMessageCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/LogMessageCallback.cpp?rev=1405539&r1=1405538&r2=1405539&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/LogMessageCallback.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/LogMessageCallback.cpp Sun Nov 4 12:47:59 2012
@@ -102,9 +102,10 @@ LogMessageCallback::singleMessage(svn_lo
hi;
hi = apr_hash_next(hi))
{
- const char *path = (const char *) svn__apr_hash_index_key(hi);
+ const char *path =
+ reinterpret_cast<const char *>(svn__apr_hash_index_key(hi));
svn_log_changed_path2_t *log_item =
- (svn_log_changed_path2_t *) svn__apr_hash_index_val(hi);
+ reinterpret_cast<svn_log_changed_path2_t *>(svn__apr_hash_index_val(hi));
jobject cp = CreateJ::ChangedPath(path, log_item);
Modified: subversion/trunk/subversion/bindings/javahl/native/OutputStream.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/OutputStream.cpp?rev=1405539&r1=1405538&r2=1405539&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/OutputStream.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/OutputStream.cpp Sun Nov 4 12:47:59 2012
@@ -95,8 +95,9 @@ svn_error_t *OutputStream::write(void *b
}
// convert the data to a Java byte array
- jbyteArray data = JNIUtil::makeJByteArray((const signed char*)buffer,
- *len);
+ jbyteArray data = JNIUtil::makeJByteArray
+ (reinterpret_cast<const signed char*>(buffer),
+ static_cast<int>(*len));
if (JNIUtil::isJavaExceptionThrown())
return SVN_NO_ERROR;
@@ -120,7 +121,7 @@ svn_error_t *OutputStream::close(void *b
JNIEnv *env = JNIUtil::getEnv();
// An object of our class is passed in as the baton
- OutputStream *that = (OutputStream*)baton;
+ OutputStream *that = reinterpret_cast<OutputStream*>(baton);
// The method id will not change during the time this library is
// loaded, so it can be cached.
Modified: subversion/trunk/subversion/bindings/javahl/native/Prompter.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/Prompter.cpp?rev=1405539&r1=1405538&r2=1405539&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/Prompter.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/Prompter.cpp Sun Nov 4 12:47:59 2012
@@ -429,7 +429,7 @@ svn_error_t *Prompter::simple_prompt(svn
{
Prompter *that = static_cast<Prompter *>(baton);
svn_auth_cred_simple_t *ret =
- (svn_auth_cred_simple_t*)apr_pcalloc(pool, sizeof(*ret));
+ reinterpret_cast<svn_auth_cred_simple_t*>(apr_pcalloc(pool, sizeof(*ret)));
if (!that->prompt(realm, username, may_save ? true : false))
return svn_error_create(SVN_ERR_RA_NOT_AUTHORIZED, NULL,
_("User canceled dialog"));
@@ -462,7 +462,7 @@ svn_error_t *Prompter::username_prompt(s
{
Prompter *that = static_cast<Prompter *>(baton);
svn_auth_cred_username_t *ret =
- (svn_auth_cred_username_t*)apr_pcalloc(pool, sizeof(*ret));
+ reinterpret_cast<svn_auth_cred_username_t*>(apr_pcalloc(pool, sizeof(*ret)));
const char *user = that->askQuestion(realm, _("Username: "), true,
may_save ? true : false);
if (user == NULL)
@@ -486,7 +486,7 @@ Prompter::ssl_server_trust_prompt(svn_au
{
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));
+ reinterpret_cast<svn_auth_cred_ssl_server_trust_t*>(apr_pcalloc(pool, sizeof(*ret)));
std::string question = _("Error validating server certificate for ");
question += realm;
@@ -552,7 +552,7 @@ Prompter::ssl_client_cert_prompt(svn_aut
{
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));
+ reinterpret_cast<svn_auth_cred_ssl_client_cert_t*>(apr_pcalloc(pool, sizeof(*ret)));
const char *cert_file =
that->askQuestion(realm, _("client certificate filename: "), true,
may_save ? true : false);
@@ -574,7 +574,7 @@ Prompter::ssl_client_cert_pw_prompt(svn_
{
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));
+ reinterpret_cast<svn_auth_cred_ssl_client_cert_pw_t*>(apr_pcalloc(pool, sizeof(*ret)));
const char *info = that->askQuestion(realm,
_("client certificate passphrase: "),
false, may_save ? true : false);
Modified: subversion/trunk/subversion/bindings/javahl/native/RevisionRange.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/RevisionRange.cpp?rev=1405539&r1=1405538&r2=1405539&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/RevisionRange.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/RevisionRange.cpp Sun Nov 4 12:47:59 2012
@@ -87,7 +87,8 @@ const svn_opt_revision_range_t *Revision
return NULL;
svn_opt_revision_range_t *range =
- (svn_opt_revision_range_t *) apr_palloc(pool.getPool(), sizeof(*range));
+ reinterpret_cast<svn_opt_revision_range_t *>
+ (apr_palloc(pool.getPool(), sizeof(*range)));
range->start = *startRevision.revision();
if (JNIUtil::isExceptionThrown())
Modified: subversion/trunk/subversion/bindings/javahl/native/RevpropTable.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/RevpropTable.cpp?rev=1405539&r1=1405538&r2=1405539&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/RevpropTable.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/RevpropTable.cpp Sun Nov 4 12:47:59 2012
@@ -120,8 +120,8 @@ RevpropTable::RevpropTable(jobject jrevp
if (JNIUtil::isExceptionThrown())
return;
- m_revprops[std::string((const char *)propname)]
- = std::string((const char *)propval);
+ m_revprops[std::string(static_cast<const char *>(propname))]
+ = std::string(static_cast<const char *>(propval));
JNIUtil::getEnv()->DeleteLocalRef(jpropval);
}
Modified: subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp?rev=1405539&r1=1405538&r2=1405539&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp Sun Nov 4 12:47:59 2012
@@ -195,7 +195,7 @@ void SVNClient::logMessages(const char *
SVN_JNI_ERR(target.error_occured(), );
apr_array_header_t *ranges =
- apr_array_make(subPool.getPool(), (int)logRanges.size(),
+ apr_array_make(subPool.getPool(), static_cast<int>(logRanges.size()),
sizeof(svn_opt_revision_range_t *));
std::vector<RevisionRange>::const_iterator it;
@@ -207,8 +207,8 @@ void SVNClient::logMessages(const char *
== svn_opt_revision_unspecified)
{
svn_opt_revision_range_t *range =
- (svn_opt_revision_range_t *)apr_pcalloc(subPool.getPool(),
- sizeof(*range));
+ reinterpret_cast<svn_opt_revision_range_t *>
+ (apr_pcalloc(subPool.getPool(), sizeof(*range)));
range->start.kind = svn_opt_revision_number;
range->start.value.number = 1;
range->end.kind = svn_opt_revision_head;
@@ -644,7 +644,8 @@ void SVNClient::merge(const char *path,
return;
apr_array_header_t *ranges =
- apr_array_make(subPool.getPool(), (int)rangesToMerge.size(),
+ apr_array_make(subPool.getPool(),
+ static_cast<int>(rangesToMerge.size()),
sizeof(const svn_opt_revision_range_t *));
std::vector<RevisionRange>::const_iterator it;
@@ -656,8 +657,8 @@ void SVNClient::merge(const char *path,
== svn_opt_revision_unspecified)
{
svn_opt_revision_range_t *range =
- (svn_opt_revision_range_t *)apr_pcalloc(subPool.getPool(),
- sizeof(*range));
+ reinterpret_cast<svn_opt_revision_range_t *>
+ (apr_pcalloc(subPool.getPool(), sizeof(*range)));
range->start.kind = svn_opt_revision_number;
range->start.value.number = 1;
range->end.kind = svn_opt_revision_head;
@@ -762,9 +763,10 @@ SVNClient::getMergeinfo(const char *targ
void *val;
apr_hash_this(hi, &path, NULL, &val);
- jstring jpath = JNIUtil::makeJString((const char *) path);
+ jstring jpath =
+ JNIUtil::makeJString(reinterpret_cast<const char *>(path));
jobject jranges =
- CreateJ::RevisionRangeList((svn_rangelist_t *) val);
+ CreateJ::RevisionRangeList(reinterpret_cast<svn_rangelist_t *>(val));
env->CallVoidMethod(jmergeinfo, addRevisions, jpath, jranges);
@@ -848,13 +850,14 @@ jbyteArray SVNClient::propertyGet(const
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, reinterpret_cast<void**>(&propval));
if (propval == NULL)
return NULL;
- return JNIUtil::makeJByteArray((const signed char *)propval->data,
- (int)propval->len);
+ return JNIUtil::makeJByteArray
+ (reinterpret_cast<const signed char *>(propval->data),
+ static_cast<int>(propval->len));
}
void SVNClient::properties(const char *path, Revision &revision,
@@ -890,8 +893,10 @@ void SVNClient::propertySetLocal(Targets
if (value.isNull())
val = NULL;
else
- val = svn_string_ncreate((const char *)value.getBytes(), value.getLength(),
- subPool.getPool());
+ val = svn_string_ncreate
+ (reinterpret_cast<const char *>(value.getBytes()),
+ value.getLength(),
+ subPool.getPool());
svn_client_ctx_t *ctx = context.getContext(NULL, subPool);
if (ctx == NULL)
@@ -918,8 +923,10 @@ void SVNClient::propertySetRemote(const
if (value.isNull())
val = NULL;
else
- val = svn_string_ncreate((const char *)value.getBytes(), value.getLength(),
- subPool.getPool());
+ val = svn_string_ncreate
+ (reinterpret_cast<const char *>(value.getBytes()),
+ value.getLength(),
+ subPool.getPool());
Path intPath(path, subPool);
SVN_JNI_ERR(intPath.error_occured(), );
@@ -1157,8 +1164,9 @@ jbyteArray SVNClient::revProperty(const
if (propval == NULL)
return NULL;
- return JNIUtil::makeJByteArray((const signed char *)propval->data,
- (int)propval->len);
+ return JNIUtil::makeJByteArray
+ (reinterpret_cast<const signed char *>(propval->data),
+ static_cast<int>(propval->len));
}
void SVNClient::relocate(const char *from, const char *to, const char *path,
bool ignoreExternals)
@@ -1269,8 +1277,9 @@ void SVNClient::unlock(Targets &targets,
const apr_array_header_t *targetsApr = targets.array(subPool);
SVN_JNI_ERR(targets.error_occured(), );
svn_client_ctx_t *ctx = context.getContext(NULL, subPool);
- SVN_JNI_ERR(svn_client_unlock((apr_array_header_t*)targetsApr, force,
- ctx, subPool.getPool()), );
+ SVN_JNI_ERR(svn_client_unlock(
+ const_cast<apr_array_header_t*>(targetsApr), force,
+ ctx, subPool.getPool()), );
}
void SVNClient::setRevProperty(const char *path,
const char *name, Revision &rev,
Modified: subversion/trunk/subversion/bindings/javahl/native/SVNRepos.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/SVNRepos.cpp?rev=1405539&r1=1405538&r2=1405539&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/SVNRepos.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/SVNRepos.cpp Sun Nov 4 12:47:59 2012
@@ -667,7 +667,7 @@ jobject SVNRepos::lslocks(File &path, sv
{
void *val;
apr_hash_this(hi, NULL, NULL, &val);
- svn_lock_t *lock = (svn_lock_t *)val;
+ svn_lock_t *lock = reinterpret_cast<svn_lock_t *>(val);
jobject jLock = CreateJ::Lock(lock);
jlocks.push_back(jLock);
Modified: subversion/trunk/subversion/bindings/javahl/native/StringArray.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/StringArray.cpp?rev=1405539&r1=1405538&r2=1405539&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/StringArray.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/StringArray.cpp Sun Nov 4 12:47:59 2012
@@ -39,7 +39,8 @@ StringArray::~StringArray()
const apr_array_header_t *StringArray::array(const SVN::Pool &pool)
{
apr_array_header_t *strings
- = apr_array_make(pool.getPool(), (int)m_strings.size(), sizeof(char *));
+ = apr_array_make(pool.getPool(), static_cast<int>(m_strings.size()),
+ sizeof(char *));
std::vector<std::string>::const_iterator it;
for (it = m_strings.begin(); it < m_strings.end(); ++it)
@@ -69,7 +70,7 @@ StringArray::init(void)
if (JNIUtil::isExceptionThrown())
return;
- m_strings.push_back(std::string((const char *)str));
+ m_strings.push_back(std::string(static_cast<const char *>(str)));
}
}
Modified: subversion/trunk/subversion/bindings/javahl/native/Targets.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/Targets.cpp?rev=1405539&r1=1405538&r2=1405539&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/Targets.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/Targets.cpp Sun Nov 4 12:47:59 2012
@@ -72,9 +72,9 @@ const apr_array_header_t *Targets::array
std::vector<const char*>::const_iterator it;
apr_pool_t *apr_pool = pool.getPool();
- apr_array_header_t *apr_targets = apr_array_make(apr_pool,
- (int)m_targets.size(),
- sizeof(const char *));
+ apr_array_header_t *apr_targets
+ = apr_array_make(apr_pool, static_cast<int>(m_targets.size()),
+ sizeof(const char *));
for (it = m_targets.begin(); it != m_targets.end(); ++it)
{
Modified: subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp?rev=1405539&r1=1405538&r2=1405539&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp Sun Nov 4 12:47:59 2012
@@ -161,7 +161,8 @@ Java_org_apache_subversion_javahl_SVNCli
ListCallback callback(jcallback);
cl->list(url, revision, pegRevision, EnumMapper::toDepth(jdepth),
- (int)jdirentFields, jfetchLocks ? true : false, &callback);
+ static_cast<int>(jdirentFields), jfetchLocks ? true : false,
+ &callback);
}
JNIEXPORT void JNICALL
@@ -306,7 +307,7 @@ Java_org_apache_subversion_javahl_SVNCli
cl->logMessages(path, pegRevision, revisionRanges,
jstopOnCopy ? true: false, jdisoverPaths ? true : false,
jincludeMergedRevisions ? true : false,
- revProps, jlimit, &callback);
+ revProps, static_cast<long>(jlimit), &callback);
}
JNIEXPORT jlong JNICALL
@@ -958,8 +959,8 @@ Java_org_apache_subversion_javahl_SVNCli
return;
CommitCallback callback(jcallback);
- cl->propertySetRemote(path, jbaseRev, name, &message, value,
- jforce ? true:false,
+ cl->propertySetRemote(path, static_cast<svn_revnum_t>(jbaseRev),
+ name, &message, value, jforce ? true : false,
revprops, jcallback ? &callback : NULL);
}
@@ -1770,7 +1771,8 @@ Java_org_apache_subversion_javahl_SVNCli
return;
PatchCallback callback(jcallback);
- cl->patch(patchPath, targetPath, jdryRun ? true : false, (int) jstripCount,
+ cl->patch(patchPath, targetPath,
+ jdryRun ? true : false, static_cast<int>(jstripCount),
jreverse ? true : false, jignoreWhitespace ? true : false,
jremoveTempfiles ? true : false, &callback);
}
Re: svn commit: r1405539 - /subversion/trunk/subversion/bindings/javahl/native/
Posted by Blair Zajac <bl...@orcaware.com>.
On 11/04/2012 04:48 AM, stefan2@apache.org wrote:
> Author: stefan2
> Date: Sun Nov 4 12:47:59 2012
> New Revision: 1405539
>
> URL: http://svn.apache.org/viewvc?rev=1405539&view=rev
> Log:
> Make all explicit casts, i.e. those not inside some APR macro, use the
> C++ cast operators static_cast, const_cast and reinterpret_cast.
Cool, thanks!
Blair