Author: rhuijben
Date: Thu Mar 27 09:25:12 2014
New Revision: 1582229
URL: http://svn.apache.org/r1582229
Log:
Add several svn_error_trace() wrappings in libsvn_ra_svn to improver error
traces while debugging in maintainer mode.
* subversion/libsvn_ra_svn/client.c
(svn_ra_svn__auth_response,
ra_svn_get_locations,
ra_svn_replay,
ra_svn_replay_range,
ra_svn_get_deleted_rev):
* subversion/libsvn_ra_svn/cram.c
(fail):
* subversion/libsvn_ra_svn/cyrus_auth.c
(sasl_data_available_cb,
svn_ra_svn__do_cyrus_auth):
* subversion/libsvn_ra_svn/marshal.c
(svn_ra_svn__read_cmd_response):
* subversion/libsvn_ra_svn/streams.c
(svn_ra_svn__stream_write): Add svn_error_trace().
Modified:
subversion/trunk/subversion/libsvn_ra_svn/client.c
subversion/trunk/subversion/libsvn_ra_svn/cram.c
subversion/trunk/subversion/libsvn_ra_svn/cyrus_auth.c
subversion/trunk/subversion/libsvn_ra_svn/marshal.c
subversion/trunk/subversion/libsvn_ra_svn/streams.c
Modified: subversion/trunk/subversion/libsvn_ra_svn/client.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_svn/client.c?rev=1582229&r1=1582228&r2=1582229&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_svn/client.c (original)
+++ subversion/trunk/subversion/libsvn_ra_svn/client.c Thu Mar 27 09:25:12 2014
@@ -233,7 +233,7 @@ svn_error_t *svn_ra_svn__auth_response(s
apr_pool_t *pool,
const char *mech, const char *mech_arg)
{
- return svn_ra_svn__write_tuple(conn, pool, "w(?c)", mech, mech_arg);
+ return svn_error_trace(svn_ra_svn__write_tuple(conn, pool, "w(?c)", mech,
mech_arg));
}
static svn_error_t *handle_auth_request(svn_ra_svn__session_baton_t *sess,
@@ -2005,7 +2005,7 @@ static svn_error_t *ra_svn_get_locations
/* Read the response. This is so the server would have a chance to
* report an error. */
- return svn_ra_svn__read_cmd_response(conn, pool, "");
+ return svn_error_trace(svn_ra_svn__read_cmd_response(conn, pool, ""));
}
static svn_error_t *
@@ -2694,7 +2694,7 @@ static svn_error_t *ra_svn_replay(svn_ra
SVN_ERR(svn_ra_svn_drive_editor2(sess->conn, pool, editor, edit_baton,
NULL, TRUE));
- return svn_ra_svn__read_cmd_response(sess->conn, pool, "");
+ return svn_error_trace(svn_ra_svn__read_cmd_response(sess->conn, pool, ""));
}
@@ -2763,7 +2763,7 @@ ra_svn_replay_range(svn_ra_session_t *se
}
svn_pool_destroy(iterpool);
- return svn_ra_svn__read_cmd_response(sess->conn, pool, "");
+ return svn_error_trace(svn_ra_svn__read_cmd_response(sess->conn, pool, ""));
}
@@ -2829,7 +2829,8 @@ ra_svn_get_deleted_rev(svn_ra_session_t
SVN_ERR(handle_unsupported_cmd(handle_auth_request(sess_baton, pool),
N_("'get-deleted-rev' not implemented")));
- return svn_ra_svn__read_cmd_response(conn, pool, "r", revision_deleted);
+ return svn_error_trace(svn_ra_svn__read_cmd_response(conn, pool, "r",
+ revision_deleted));
}
static svn_error_t *
Modified: subversion/trunk/subversion/libsvn_ra_svn/cram.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_svn/cram.c?rev=1582229&r1=1582228&r2=1582229&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_svn/cram.c (original)
+++ subversion/trunk/subversion/libsvn_ra_svn/cram.c Thu Mar 27 09:25:12 2014
@@ -114,7 +114,7 @@ static svn_error_t *fail(svn_ra_svn_conn
const char *msg)
{
SVN_ERR(svn_ra_svn__write_tuple(conn, pool, "w(c)", "failure", msg));
- return svn_ra_svn__flush(conn, pool);
+ return svn_error_trace(svn_ra_svn__flush(conn, pool));
}
/* If we can, make the nonce with random bytes. If we can't... well,
Modified: subversion/trunk/subversion/libsvn_ra_svn/cyrus_auth.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_svn/cyrus_auth.c?rev=1582229&r1=1582228&r2=1582229&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_svn/cyrus_auth.c (original)
+++ subversion/trunk/subversion/libsvn_ra_svn/cyrus_auth.c Thu Mar 27 09:25:12
2014
@@ -709,7 +709,8 @@ static svn_error_t *
sasl_data_available_cb(void *baton, svn_boolean_t *data_available)
{
sasl_baton_t *sasl_baton = baton;
- return svn_ra_svn__stream_data_available(sasl_baton->stream, data_available);
+ return svn_error_trace(svn_ra_svn__stream_data_available(sasl_baton->stream,
+ data_available));
}
svn_error_t *svn_ra_svn__enable_sasl_encryption(svn_ra_svn_conn_t *conn,
@@ -945,8 +946,8 @@ svn_ra_svn__do_cyrus_auth(svn_ra_svn__se
the CRAM-MD5 or ANONYMOUS plugins, in which case we can
simply use
the built-in implementation. In all other cases this call
will be
useless, but hey, at least we'll get consistent error
messages. */
- return svn_ra_svn__do_internal_auth(sess, mechlist,
- realm, pool);
+ return svn_error_trace(svn_ra_svn__do_internal_auth(sess,
mechlist,
+ realm, pool));
}
return err;
}
Modified: subversion/trunk/subversion/libsvn_ra_svn/marshal.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_svn/marshal.c?rev=1582229&r1=1582228&r2=1582229&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_svn/marshal.c (original)
+++ subversion/trunk/subversion/libsvn_ra_svn/marshal.c Thu Mar 27 09:25:12 2014
@@ -1546,7 +1546,7 @@ svn_ra_svn__read_cmd_response(svn_ra_svn
}
else if (strcmp(status, "failure") == 0)
{
- return svn_ra_svn__handle_failure_status(params, pool);
+ return svn_error_trace(svn_ra_svn__handle_failure_status(params, pool));
}
return svn_error_createf(SVN_ERR_RA_SVN_MALFORMED_DATA, NULL,
Modified: subversion/trunk/subversion/libsvn_ra_svn/streams.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_svn/streams.c?rev=1582229&r1=1582228&r2=1582229&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_svn/streams.c (original)
+++ subversion/trunk/subversion/libsvn_ra_svn/streams.c Thu Mar 27 09:25:12 2014
@@ -200,7 +200,7 @@ svn_error_t *
svn_ra_svn__stream_write(svn_ra_svn__stream_t *stream,
const char *data, apr_size_t *len)
{
- return svn_stream_write(stream->out_stream, data, len);
+ return svn_error_trace(svn_stream_write(stream->out_stream, data, len));
}
svn_error_t *
