Author: julianfoad
Date: Wed Jul 30 11:16:46 2014
New Revision: 1614614
URL: http://svn.apache.org/r1614614
Log:
Fix breakage of the JavaHL build and a debugging tool, following r1614599.
* subversion/bindings/javahl/native/CreateJ.cpp
(LockMap): Track the renames.
* subversion/bindings/javahl/native/LogMessageCallback.cpp
(LogMessageCallback): Same.
* subversion/bindings/swig/python/svn/core.py
(__all__): Adjust the comment.
* tools/dev/gdb-py/svndbg/printers.py
(svn__apr_hash_index_key,
svn__apr_hash_index_val,
children_of_apr_hash): Track the renames.
Modified:
subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp
subversion/trunk/subversion/bindings/javahl/native/LogMessageCallback.cpp
subversion/trunk/subversion/bindings/swig/python/svn/core.py
subversion/trunk/tools/dev/gdb-py/svndbg/printers.py
Modified: subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp?rev=1614614&r1=1614613&r2=1614614&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp Wed Jul 30
11:16:46 2014
@@ -523,8 +523,8 @@ CreateJ::LockMap(const apr_hash_t *locks
for (hi = apr_hash_first(pool, (apr_hash_t *) locks); hi;
hi = apr_hash_next(hi), ++i)
{
- const char *key = (const char *) svn__apr_hash_index_key(hi);
- const svn_lock_t *lock = (const svn_lock_t *)
svn__apr_hash_index_val(hi);
+ const char *key = (const char *) apr_hash_this_key(hi);
+ const svn_lock_t *lock = (const svn_lock_t *) apr_hash_this_val(hi);
jstring jpath = JNIUtil::makeJString(key);
if (JNIUtil::isJavaExceptionThrown())
Modified:
subversion/trunk/subversion/bindings/javahl/native/LogMessageCallback.cpp
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/LogMessageCallback.cpp?rev=1614614&r1=1614613&r2=1614614&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/LogMessageCallback.cpp
(original)
+++ subversion/trunk/subversion/bindings/javahl/native/LogMessageCallback.cpp
Wed Jul 30 11:16:46 2014
@@ -103,9 +103,9 @@ LogMessageCallback::singleMessage(svn_lo
hi = apr_hash_next(hi))
{
const char *path =
- reinterpret_cast<const char *>(svn__apr_hash_index_key(hi));
+ reinterpret_cast<const char *>(apr_hash_this_key(hi));
svn_log_changed_path2_t *log_item =
- reinterpret_cast<svn_log_changed_path2_t
*>(svn__apr_hash_index_val(hi));
+ reinterpret_cast<svn_log_changed_path2_t *>(apr_hash_this_val(hi));
jobject cp = CreateJ::ChangedPath(path, log_item);
Modified: subversion/trunk/subversion/bindings/swig/python/svn/core.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/python/svn/core.py?rev=1614614&r1=1614613&r2=1614614&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/python/svn/core.py (original)
+++ subversion/trunk/subversion/bindings/swig/python/svn/core.py Wed Jul 30
11:16:46 2014
@@ -316,7 +316,6 @@ def run_app(func, *args, **kw):
# 'apr_pool_clear' 'apr_pool_destroy' 'apr_pool_t'
# 'apr_time_ansi_put'
# 'run_app'
-# 'svn__apr_hash_index_key' 'svn__apr_hash_index_klen'
'svn__apr_hash_index_val'
# 'svn_relpath__internal_style' 'svn_uri__is_ancestor'
# 'svn_tristate__from_word' 'svn_tristate__to_word'
__all__ = filter(lambda s: (s.startswith('svn_')
Modified: subversion/trunk/tools/dev/gdb-py/svndbg/printers.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/tools/dev/gdb-py/svndbg/printers.py?rev=1614614&r1=1614613&r2=1614614&view=diff
==============================================================================
--- subversion/trunk/tools/dev/gdb-py/svndbg/printers.py (original)
+++ subversion/trunk/tools/dev/gdb-py/svndbg/printers.py Wed Jul 30 11:16:46
2014
@@ -145,8 +145,8 @@ cstringType = gdb.lookup_type('char').po
apr_hash_count = InferiorFunction('apr_hash_count')
apr_hash_first = InferiorFunction('apr_hash_first')
apr_hash_next = InferiorFunction('apr_hash_next')
-svn__apr_hash_index_key = InferiorFunction('svn__apr_hash_index_key')
-svn__apr_hash_index_val = InferiorFunction('svn__apr_hash_index_val')
+apr_hash_this_key = InferiorFunction('apr_hash_this_key')
+apr_hash_this_val = InferiorFunction('apr_hash_this_val')
def children_of_apr_hash(hash_p, value_type=None):
"""Iterate over an 'apr_hash_t *' GDB value, in the way required for a
@@ -156,9 +156,9 @@ def children_of_apr_hash(hash_p, value_t
"""
hi = apr_hash_first(0, hash_p)
while (hi):
- k = svn__apr_hash_index_key(hi).reinterpret_cast(cstringType)
+ k = apr_hash_this_key(hi).reinterpret_cast(cstringType)
if value_type:
- val = svn__apr_hash_index_val(hi).reinterpret_cast(value_type)
+ val = apr_hash_this_val(hi).reinterpret_cast(value_type)
else:
val = '...'
try:
