Author: cmpilato
Date: Thu Jun 2 20:08:01 2011
New Revision: 1130773
URL: http://svn.apache.org/viewvc?rev=1130773&view=rev
Log:
Fix some bugs (dropped svn_error_t's) and build warning introduced in
r1130688.
* subversion/libsvn_fs_base/tree.c
(txn_body_get_mergeinfo_data_and_entries): Actually return an error
clearly intended for return.
(txn_body_get_mergeinfo_for_path): Fix a '"/*" within comment' warning.
* trunk/subversion/libsvn_fs_fs/tree.c
(crawl_directory_dag_for_mergeinfo): Actually return an error
clearly intended for return.
Modified:
subversion/trunk/subversion/libsvn_fs_base/tree.c
subversion/trunk/subversion/libsvn_fs_fs/tree.c
Modified: subversion/trunk/subversion/libsvn_fs_base/tree.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_base/tree.c?rev=1130773&r1=1130772&r2=1130773&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_base/tree.c (original)
+++ subversion/trunk/subversion/libsvn_fs_base/tree.c Thu Jun 2 20:08:01 2011
@@ -5168,7 +5168,7 @@ txn_body_get_mergeinfo_data_and_entries(
if (err->apr_err == SVN_ERR_MERGEINFO_PARSE_ERROR)
svn_error_clear(err);
else
- svn_error_return(err);
+ return svn_error_return(err);
}
else
{
@@ -5368,7 +5368,7 @@ txn_body_get_mergeinfo_for_path(void *ba
inheriting the mergeinfo, so we need to a) remove non-inheritable
ranges and b) telescope the merged-from paths.
- /* Issue #3896: If a node has syntactically invalid mergeinfo, then
+ Issue #3896: If a node has syntactically invalid mergeinfo, then
treat it as if no mergeinfo is present rather than raising a parse
error. */
if (nearest_ancestor == parent_path)
Modified: subversion/trunk/subversion/libsvn_fs_fs/tree.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/tree.c?rev=1130773&r1=1130772&r2=1130773&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/tree.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/tree.c Thu Jun 2 20:08:01 2011
@@ -3547,7 +3547,7 @@ crawl_directory_dag_for_mergeinfo(svn_fs
if (err->apr_err == SVN_ERR_MERGEINFO_PARSE_ERROR)
svn_error_clear(err);
else
- svn_error_return(err);
+ return svn_error_return(err);
}
else
{
