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 2015/10/22 16:32:55 UTC
svn commit: r1710026 - in /subversion/trunk/subversion/libsvn_ra_svn:
client.c editorp.c marshal.c ra_svn.h
Author: stefan2
Date: Thu Oct 22 14:32:54 2015
New Revision: 1710026
URL: http://svn.apache.org/viewvc?rev=1710026&view=rev
Log:
Remove the unused POOL parameter from svn_ra_svn__handle_failure_status
and update all callers.
* subversion/libsvn_ra_svn/ra_svn.h
(svn_ra_svn__handle_failure_status): Remove POOL parameter from
decalaration.
* subversion/libsvn_ra_svn/marshal.c
(svn_ra_svn__handle_failure_status): Remove POOL parameter from
implementation and get rid of the
now unused SUBPOOL.
(svn_ra_svn__read_cmd_response): Update caller.
* subversion/libsvn_ra_svn/client.c
* subversion/libsvn_ra_svn/editorp.c
(*): Update callers.
Modified:
subversion/trunk/subversion/libsvn_ra_svn/client.c
subversion/trunk/subversion/libsvn_ra_svn/editorp.c
subversion/trunk/subversion/libsvn_ra_svn/marshal.c
subversion/trunk/subversion/libsvn_ra_svn/ra_svn.h
Modified: subversion/trunk/subversion/libsvn_ra_svn/client.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_svn/client.c?rev=1710026&r1=1710025&r2=1710026&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_svn/client.c (original)
+++ subversion/trunk/subversion/libsvn_ra_svn/client.c Thu Oct 22 14:32:54 2015
@@ -2410,7 +2410,7 @@ static svn_error_t *ra_svn_lock(svn_ra_s
SVN_ERR(svn_ra_svn__parse_tuple(&elt->u.list, "wl", &status, &list));
if (strcmp(status, "failure") == 0)
- err = svn_ra_svn__handle_failure_status(list, iterpool);
+ err = svn_ra_svn__handle_failure_status(list);
else if (strcmp(status, "success") == 0)
{
SVN_ERR(parse_lock(list, iterpool, &lock));
@@ -2537,7 +2537,7 @@ static svn_error_t *ra_svn_unlock(svn_ra
SVN_ERR(svn_ra_svn__parse_tuple(&elt->u.list, "wl", &status, &list));
if (strcmp(status, "failure") == 0)
- err = svn_ra_svn__handle_failure_status(list, iterpool);
+ err = svn_ra_svn__handle_failure_status(list);
else if (strcmp(status, "success") == 0)
{
SVN_ERR(svn_ra_svn__parse_tuple(list, "c", &path));
@@ -2752,7 +2752,7 @@ ra_svn_replay_range(svn_ra_session_t *se
if (strcmp(word, "revprops") != 0)
{
if (strcmp(word, "failure") == 0)
- SVN_ERR(svn_ra_svn__handle_failure_status(list, iterpool));
+ SVN_ERR(svn_ra_svn__handle_failure_status(list));
return svn_error_createf(SVN_ERR_RA_SVN_MALFORMED_DATA, NULL,
_("Expected 'revprops', found '%s'"),
Modified: subversion/trunk/subversion/libsvn_ra_svn/editorp.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_svn/editorp.c?rev=1710026&r1=1710025&r2=1710026&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_svn/editorp.c (original)
+++ subversion/trunk/subversion/libsvn_ra_svn/editorp.c Thu Oct 22 14:32:54 2015
@@ -1121,7 +1121,7 @@ svn_error_t *svn_ra_svn_drive_editor2(sv
command */
if (aborted)
*aborted = TRUE;
- err = svn_ra_svn__handle_failure_status(params, pool);
+ err = svn_ra_svn__handle_failure_status(params);
return svn_error_compose_create(
err,
editor->abort_edit(edit_baton, subpool));
Modified: subversion/trunk/subversion/libsvn_ra_svn/marshal.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_svn/marshal.c?rev=1710026&r1=1710025&r2=1710026&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_svn/marshal.c (original)
+++ subversion/trunk/subversion/libsvn_ra_svn/marshal.c Thu Oct 22 14:32:54 2015
@@ -1703,15 +1703,13 @@ svn_error_t *svn_ra_svn__locate_real_err
}
svn_error_t *
-svn_ra_svn__handle_failure_status(const svn_ra_svn__list_t *params,
- apr_pool_t *pool)
+svn_ra_svn__handle_failure_status(const svn_ra_svn__list_t *params)
{
const char *message, *file;
svn_error_t *err = NULL;
svn_ra_svn__item_t *elt;
int i;
apr_uint64_t apr_err, line;
- apr_pool_t *subpool = svn_pool_create(pool);
if (params->nelts == 0)
return svn_error_create(SVN_ERR_RA_SVN_MALFORMED_DATA, NULL,
@@ -1720,7 +1718,6 @@ svn_ra_svn__handle_failure_status(const
/* Rebuild the error list from the end, to avoid reversing the order. */
for (i = params->nelts - 1; i >= 0; i--)
{
- svn_pool_clear(subpool);
elt = &SVN_RA_SVN__LIST_ITEM(params, i);
if (elt->kind != SVN_RA_SVN_LIST)
return svn_error_create(SVN_ERR_RA_SVN_MALFORMED_DATA, NULL,
@@ -1744,8 +1741,6 @@ svn_ra_svn__handle_failure_status(const
}
}
- svn_pool_destroy(subpool);
-
/* If we get here, then we failed to find a real error in the error
chain that the server proported to be sending us. That's bad. */
if (! err)
@@ -1775,7 +1770,7 @@ svn_ra_svn__read_cmd_response(svn_ra_svn
}
else if (strcmp(status, "failure") == 0)
{
- return svn_error_trace(svn_ra_svn__handle_failure_status(params, pool));
+ return svn_error_trace(svn_ra_svn__handle_failure_status(params));
}
return svn_error_createf(SVN_ERR_RA_SVN_MALFORMED_DATA, NULL,
Modified: subversion/trunk/subversion/libsvn_ra_svn/ra_svn.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_svn/ra_svn.h?rev=1710026&r1=1710025&r2=1710026&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_svn/ra_svn.h (original)
+++ subversion/trunk/subversion/libsvn_ra_svn/ra_svn.h Thu Oct 22 14:32:54 2015
@@ -163,11 +163,9 @@ svn_error_t *svn_ra_svn__locate_real_err
/* Return an error chain based on @a params (which contains a
* command response indicating failure). The error chain will be
- * in the same order as the errors indicated in @a params. Use
- * @a pool for temporary allocations. */
+ * in the same order as the errors indicated in @a params. */
svn_error_t *
-svn_ra_svn__handle_failure_status(const svn_ra_svn__list_t *params,
- apr_pool_t *pool);
+svn_ra_svn__handle_failure_status(const svn_ra_svn__list_t *params);
/* Returns a stream that reads/writes from/to SOCK. */
svn_ra_svn__stream_t *svn_ra_svn__stream_from_sock(apr_socket_t *sock,