Author: rhuijben
Date: Tue Jan 28 14:48:17 2014
New Revision: 1562088
URL: http://svn.apache.org/r1562088
Log:
Following up on r1562072, rename some internal functions and argument names
to match the stream api and to avoid some warnings on shadowing names. No
functional changes.
* subversion/libsvn_ra_svn/cyrus_auth.c
(sasl_pending_cb): Rename to...
(sasl_data_available_cb): ... and rename argument.
(svn_ra_svn__enable_sasl_encryption): Update reference.
* subversion/libsvn_ra_svn/editorp.c
(check_for_error_internal): Rename variable. Update caller.
* subversion/libsvn_ra_svn/marshal.c
(svn_ra_svn__input_waiting): Rename to...
(svn_ra_svn__data_available): ... this. Update caller.
(svn_ra_svn__has_item): Update caller.
* subversion/libsvn_ra_svn/ra_svn.h
(svn_ra_svn__input_waiting): Rename to...
(svn_ra_svn__data_available): ... this.
(svn_ra_svn__stream_pending): Rename to...
(svn_ra_svn__stream_data_available): ... this.
* subversion/libsvn_ra_svn/streams.c
(svn_ra_svn__stream_pending): Rename to...
(svn_ra_svn__stream_data_available): ... this.
Modified:
subversion/trunk/subversion/libsvn_ra_svn/cyrus_auth.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
subversion/trunk/subversion/libsvn_ra_svn/streams.c
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=1562088&r1=1562087&r2=1562088&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_svn/cyrus_auth.c (original)
+++ subversion/trunk/subversion/libsvn_ra_svn/cyrus_auth.c Tue Jan 28 14:48:17 2014
@@ -706,10 +706,10 @@ static void sasl_timeout_cb(void *baton,
/* Implements svn_stream_data_available_fn_t. */
static svn_error_t *
-sasl_pending_cb(void *baton, svn_boolean_t *data_waiting)
+sasl_data_available_cb(void *baton, svn_boolean_t *data_available)
{
sasl_baton_t *sasl_baton = baton;
- return svn_ra_svn__stream_pending(sasl_baton->stream, data_waiting);
+ return 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,
@@ -772,7 +772,7 @@ svn_error_t *svn_ra_svn__enable_sasl_enc
svn_stream_t *sasl_out = svn_stream_create(sasl_baton, conn->pool);
svn_stream_set_read2(sasl_in, sasl_read_cb, NULL /* use default */);
- svn_stream_set_data_available(sasl_in, sasl_pending_cb);
+ svn_stream_set_data_available(sasl_in, sasl_data_available_cb);
svn_stream_set_write(sasl_out, sasl_write_cb);
conn->stream = svn_ra_svn__stream_create(sasl_in, sasl_out,
Modified: subversion/trunk/subversion/libsvn_ra_svn/editorp.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_svn/editorp.c?rev=1562088&r1=1562087&r2=1562088&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_svn/editorp.c (original)
+++ subversion/trunk/subversion/libsvn_ra_svn/editorp.c Tue Jan 28 14:48:17 2014
@@ -126,7 +126,7 @@ static ra_svn_baton_t *ra_svn_make_baton
static svn_error_t *
check_for_error_internal(ra_svn_edit_baton_t *eb, apr_pool_t *pool)
{
- svn_boolean_t waiting;
+ svn_boolean_t available;
SVN_ERR_ASSERT(!eb->got_status);
/* reset TX counter */
@@ -136,8 +136,8 @@ check_for_error_internal(ra_svn_edit_bat
eb->conn->may_check_for_error = eb->conn->error_check_interval == 0;
/* any incoming data? */
- SVN_ERR(svn_ra_svn__input_waiting(eb->conn, &waiting));
- if (waiting)
+ SVN_ERR(svn_ra_svn__data_available(eb->conn, &available));
+ if (available)
{
eb->got_status = TRUE;
SVN_ERR(svn_ra_svn__write_cmd_abort_edit(eb->conn, pool));
Modified: subversion/trunk/subversion/libsvn_ra_svn/marshal.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_svn/marshal.c?rev=1562088&r1=1562087&r2=1562088&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_svn/marshal.c (original)
+++ subversion/trunk/subversion/libsvn_ra_svn/marshal.c Tue Jan 28 14:48:17 2014
@@ -198,10 +198,10 @@ svn_ra_svn__set_block_handler(svn_ra_svn
svn_ra_svn__stream_timeout(conn->stream, get_timeout(conn));
}
-svn_error_t *svn_ra_svn__input_waiting(svn_ra_svn_conn_t *conn,
- svn_boolean_t *data_waiting)
+svn_error_t *svn_ra_svn__data_available(svn_ra_svn_conn_t *conn,
+ svn_boolean_t *data_available)
{
- return svn_ra_svn__stream_pending(conn->stream, data_waiting);
+ return svn_ra_svn__stream_data_available(conn->stream, data_available);
}
/* --- WRITE BUFFER MANAGEMENT --- */
@@ -1249,12 +1249,12 @@ svn_ra_svn__has_item(svn_boolean_t *has_
{
if (conn->read_ptr == conn->read_end)
{
- svn_boolean_t waiting;
+ svn_boolean_t available;
if (conn->write_pos)
SVN_ERR(writebuf_flush(conn, pool));
- SVN_ERR(svn_ra_svn__input_waiting(conn, &waiting));
- if (!waiting)
+ SVN_ERR(svn_ra_svn__data_available(conn, &available));
+ if (!available)
break;
SVN_ERR(readbuf_fill(conn, pool));
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=1562088&r1=1562087&r2=1562088&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_svn/ra_svn.h (original)
+++ subversion/trunk/subversion/libsvn_ra_svn/ra_svn.h Tue Jan 28 14:48:17 2014
@@ -147,8 +147,8 @@ void svn_ra_svn__set_block_handler(svn_r
void *baton);
/* Return true if there is input waiting on conn. */
-svn_error_t *svn_ra_svn__input_waiting(svn_ra_svn_conn_t *conn,
- svn_boolean_t *data_waiting);
+svn_error_t *svn_ra_svn__data_available(svn_ra_svn_conn_t *conn,
+ svn_boolean_t *data_available);
/* CRAM-MD5 client implementation. */
svn_error_t *svn_ra_svn__cram_client(svn_ra_svn_conn_t *conn, apr_pool_t *pool,
@@ -211,8 +211,8 @@ void svn_ra_svn__stream_timeout(svn_ra_s
/* Return whether or not there is data pending on STREAM. */
svn_error_t *
-svn_ra_svn__stream_pending(svn_ra_svn__stream_t *stream,
- svn_boolean_t *pending);
+svn_ra_svn__stream_data_available(svn_ra_svn__stream_t *stream,
+ svn_boolean_t *data_available);
/* Respond to an auth request and perform authentication. Use the Cyrus
* SASL library for mechanism negotiation and for creating authentication
Modified: subversion/trunk/subversion/libsvn_ra_svn/streams.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_svn/streams.c?rev=1562088&r1=1562087&r2=1562088&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_svn/streams.c (original)
+++ subversion/trunk/subversion/libsvn_ra_svn/streams.c Tue Jan 28 14:48:17 2014
@@ -223,10 +223,10 @@ svn_ra_svn__stream_timeout(svn_ra_svn__s
}
svn_error_t *
-svn_ra_svn__stream_pending(svn_ra_svn__stream_t *stream,
- svn_boolean_t *pending)
+svn_ra_svn__stream_data_available(svn_ra_svn__stream_t *stream,
+ svn_boolean_t *data_available)
{
return svn_error_trace(
svn_stream_data_available(stream->in_stream,
- pending));
+ data_available));
}
|