Author: gstein
Date: Wed Jun 15 01:16:43 2011
New Revision: 1135885
URL: http://svn.apache.org/viewvc?rev=1135885&view=rev
Log:
Remove the session's bucket allocator, since it is unused.
* subversion/libsvn_ra_serf/ra_serf.h:
(svn_ra_serf__session_t): remove BKT_ALLOC
* subversion/libsvn_ra_serf/serf.c:
(svn_ra_serf__open): remove initialization of BKT_ALLOC
* subversion/libsvn_ra_serf/util.c:
(svn_ra_serf__context_run_wait): remove some debug code for BKT_ALLOC
* subversion/libsvn_ra_serf/update.c:
(finish_report): remove some debug code for BKT_ALLOC
(end_report): unrelated change, switching FOUND localvar to boolean
Modified:
subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h
subversion/trunk/subversion/libsvn_ra_serf/serf.c
subversion/trunk/subversion/libsvn_ra_serf/update.c
subversion/trunk/subversion/libsvn_ra_serf/util.c
Modified: subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h?rev=1135885&r1=1135884&r2=1135885&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h Wed Jun 15 01:16:43
2011
@@ -109,9 +109,6 @@ struct svn_ra_serf__session_t {
/* The current context */
serf_context_t *context;
- /* Bucket allocator for this context. */
- serf_bucket_alloc_t *bkt_alloc;
-
/* Are we using ssl */
svn_boolean_t using_ssl;
Modified: subversion/trunk/subversion/libsvn_ra_serf/serf.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/serf.c?rev=1135885&r1=1135884&r2=1135885&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/serf.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/serf.c Wed Jun 15 01:16:43 2011
@@ -353,8 +353,6 @@ svn_ra_serf__open(svn_ra_session_t *sess
serf_sess = apr_pcalloc(pool, sizeof(*serf_sess));
serf_sess->pool = svn_pool_create(pool);
- serf_sess->bkt_alloc = serf_bucket_allocator_create(serf_sess->pool, NULL,
- NULL);
serf_sess->wc_callbacks = callbacks;
serf_sess->wc_callback_baton = callback_baton;
serf_sess->wc_progress_baton = callbacks->progress_baton;
Modified: subversion/trunk/subversion/libsvn_ra_serf/update.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/update.c?rev=1135885&r1=1135884&r2=1135885&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/update.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/update.c Wed Jun 15 01:16:43 2011
@@ -1941,7 +1941,7 @@ end_report(svn_ra_serf__xml_parser_t *pa
* same lifetime as the dir->pool.
*/
svn_ra_serf__ns_t *ns, *ns_name_match;
- int found = 0;
+ svn_boolean_t found = FALSE;
report_info_t *info;
report_dir_t *dir;
apr_hash_t *props;
@@ -1964,7 +1964,7 @@ end_report(svn_ra_serf__xml_parser_t *pa
ns_name_match = ns;
if (strcmp(ns->url, info->prop_name) == 0)
{
- found = 1;
+ found = TRUE;
break;
}
}
@@ -2480,7 +2480,6 @@ finish_report(void *report_baton,
report->done_fetches = NULL;
/* Debugging purposes only! */
- serf_debug__closed_conn(sess->bkt_alloc);
for (i = 0; i < sess->num_conns; i++)
{
serf_debug__closed_conn(sess->conns[i]->bkt_alloc);
Modified: subversion/trunk/subversion/libsvn_ra_serf/util.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/util.c?rev=1135885&r1=1135884&r2=1135885&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/util.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/util.c Wed Jun 15 01:16:43 2011
@@ -647,8 +647,8 @@ svn_ra_serf__context_run_wait(svn_boolea
return svn_error_wrap_apr(status, _("Error running context"));
}
+
/* Debugging purposes only! */
- serf_debug__closed_conn(sess->bkt_alloc);
for (i = 0; i < sess->num_conns; i++)
{
serf_debug__closed_conn(sess->conns[i]->bkt_alloc);
