You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by gs...@apache.org on 2012/03/21 18:29:24 UTC
svn commit: r1303472 - in /subversion/trunk/subversion/libsvn_ra_serf:
blame.c get_deleted_rev.c getdate.c getlocations.c getlocationsegments.c
getlocks.c locks.c log.c merge.c mergeinfo.c options.c property.c ra_serf.h
replay.c update.c util.c
Author: gstein
Date: Wed Mar 21 17:29:23 2012
New Revision: 1303472
URL: http://svn.apache.org/viewvc?rev=1303472&view=rev
Log:
Adjust parameters to the serf-xml callback functions: remove the
userData param (in favor of parser->user_data), and add scratch_pool.
* subversion/libsvn_ra_serf/ra_serf.h:
(svn_ra_serf__xml_start_element_t, svn_ra_serf__xml_end_element_t,
svn_ra_serf__xml_cdata_chunk_handler_t): adjust params
* subversion/libsvn_ra_serf/util.c:
(start_error, end_error, cdata_error, start_207, end_207,
cdata_207): adjust parameters
(start_xml, end_xml, cdata_xml): use state->pool (for now) as a
scratch_pool. adjust params to the callback
* subversion/libsvn_ra_serf/merge.c:
* subversion/libsvn_ra_serf/getlocks.c:
* subversion/libsvn_ra_serf/mergeinfo.c:
* subversion/libsvn_ra_serf/locks.c:
* subversion/libsvn_ra_serf/getdate.c:
* subversion/libsvn_ra_serf/getlocationsegments.c:
* subversion/libsvn_ra_serf/blame.c:
* subversion/libsvn_ra_serf/log.c:
* subversion/libsvn_ra_serf/get_deleted_rev.c:
* subversion/libsvn_ra_serf/update.c:
* subversion/libsvn_ra_serf/property.c:
* subversion/libsvn_ra_serf/options.c:
* subversion/libsvn_ra_serf/getlocations.c:
* subversion/libsvn_ra_serf/replay.c:
(start_*, end_*, cdata_*): adjust parameters for new signature
Modified:
subversion/trunk/subversion/libsvn_ra_serf/blame.c
subversion/trunk/subversion/libsvn_ra_serf/get_deleted_rev.c
subversion/trunk/subversion/libsvn_ra_serf/getdate.c
subversion/trunk/subversion/libsvn_ra_serf/getlocations.c
subversion/trunk/subversion/libsvn_ra_serf/getlocationsegments.c
subversion/trunk/subversion/libsvn_ra_serf/getlocks.c
subversion/trunk/subversion/libsvn_ra_serf/locks.c
subversion/trunk/subversion/libsvn_ra_serf/log.c
subversion/trunk/subversion/libsvn_ra_serf/merge.c
subversion/trunk/subversion/libsvn_ra_serf/mergeinfo.c
subversion/trunk/subversion/libsvn_ra_serf/options.c
subversion/trunk/subversion/libsvn_ra_serf/property.c
subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h
subversion/trunk/subversion/libsvn_ra_serf/replay.c
subversion/trunk/subversion/libsvn_ra_serf/update.c
subversion/trunk/subversion/libsvn_ra_serf/util.c
Modified: subversion/trunk/subversion/libsvn_ra_serf/blame.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/blame.c?rev=1303472&r1=1303471&r2=1303472&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/blame.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/blame.c Wed Mar 21 17:29:23 2012
@@ -161,11 +161,11 @@ create_propval(blame_info_t *info)
static svn_error_t *
start_blame(svn_ra_serf__xml_parser_t *parser,
- void *userData,
svn_ra_serf__dav_props_t name,
- const char **attrs)
+ const char **attrs,
+ apr_pool_t *scratch_pool)
{
- blame_context_t *blame_ctx = userData;
+ blame_context_t *blame_ctx = parser->user_data;
blame_state_e state;
state = parser->state->current_state;
@@ -257,10 +257,10 @@ start_blame(svn_ra_serf__xml_parser_t *p
static svn_error_t *
end_blame(svn_ra_serf__xml_parser_t *parser,
- void *userData,
- svn_ra_serf__dav_props_t name)
+ svn_ra_serf__dav_props_t name,
+ apr_pool_t *scratch_pool)
{
- blame_context_t *blame_ctx = userData;
+ blame_context_t *blame_ctx = parser->user_data;
blame_state_e state;
blame_info_t *info;
@@ -329,11 +329,11 @@ end_blame(svn_ra_serf__xml_parser_t *par
static svn_error_t *
cdata_blame(svn_ra_serf__xml_parser_t *parser,
- void *userData,
const char *data,
- apr_size_t len)
+ apr_size_t len,
+ apr_pool_t *scratch_pool)
{
- blame_context_t *blame_ctx = userData;
+ blame_context_t *blame_ctx = parser->user_data;
blame_state_e state;
blame_info_t *info;
Modified: subversion/trunk/subversion/libsvn_ra_serf/get_deleted_rev.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/get_deleted_rev.c?rev=1303472&r1=1303471&r2=1303472&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/get_deleted_rev.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/get_deleted_rev.c Wed Mar 21 17:29:23 2012
@@ -70,11 +70,11 @@ push_state(svn_ra_serf__xml_parser_t *pa
static svn_error_t *
start_getdrev(svn_ra_serf__xml_parser_t *parser,
- void *userData,
svn_ra_serf__dav_props_t name,
- const char **attrs)
+ const char **attrs,
+ apr_pool_t *scratch_pool)
{
- drev_context_t *drev_ctx = userData;
+ drev_context_t *drev_ctx = parser->user_data;
drev_state_e state;
state = parser->state->current_state;
@@ -90,10 +90,10 @@ start_getdrev(svn_ra_serf__xml_parser_t
static svn_error_t *
end_getdrev(svn_ra_serf__xml_parser_t *parser,
- void *userData,
- svn_ra_serf__dav_props_t name)
+ svn_ra_serf__dav_props_t name,
+ apr_pool_t *scratch_pool)
{
- drev_context_t *drev_ctx = userData;
+ drev_context_t *drev_ctx = parser->user_data;
drev_state_e state;
svn_string_t *info;
@@ -113,11 +113,11 @@ end_getdrev(svn_ra_serf__xml_parser_t *p
static svn_error_t *
cdata_getdrev(svn_ra_serf__xml_parser_t *parser,
- void *userData,
const char *data,
- apr_size_t len)
+ apr_size_t len,
+ apr_pool_t *scratch_pool)
{
- drev_context_t *drev_ctx = userData;
+ drev_context_t *drev_ctx = parser->user_data;
drev_state_e state;
UNUSED_CTX(drev_ctx);
Modified: subversion/trunk/subversion/libsvn_ra_serf/getdate.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/getdate.c?rev=1303472&r1=1303471&r2=1303472&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/getdate.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/getdate.c Wed Mar 21 17:29:23 2012
@@ -67,11 +67,11 @@ typedef struct date_context_t {
static svn_error_t *
start_getdate(svn_ra_serf__xml_parser_t *parser,
- void *userData,
svn_ra_serf__dav_props_t name,
- const char **attrs)
+ const char **attrs,
+ apr_pool_t *scratch_pool)
{
- date_context_t *date_ctx = userData;
+ date_context_t *date_ctx = parser->user_data;
date_state_e state = parser->state->current_state;
UNUSED_CTX(date_ctx);
@@ -89,10 +89,10 @@ start_getdate(svn_ra_serf__xml_parser_t
static svn_error_t *
end_getdate(svn_ra_serf__xml_parser_t *parser,
- void *userData,
- svn_ra_serf__dav_props_t name)
+ svn_ra_serf__dav_props_t name,
+ apr_pool_t *scratch_pool)
{
- date_context_t *date_ctx = userData;
+ date_context_t *date_ctx = parser->user_data;
date_state_e state = parser->state->current_state;
if (state == VERSION_NAME &&
@@ -109,11 +109,11 @@ end_getdate(svn_ra_serf__xml_parser_t *p
static svn_error_t *
cdata_getdate(svn_ra_serf__xml_parser_t *parser,
- void *userData,
const char *data,
- apr_size_t len)
+ apr_size_t len,
+ apr_pool_t *scratch_pool)
{
- date_context_t *date_ctx = userData;
+ date_context_t *date_ctx = parser->user_data;
date_state_e state = parser->state->current_state;
svn_stringbuf_t *datebuf;
Modified: subversion/trunk/subversion/libsvn_ra_serf/getlocations.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/getlocations.c?rev=1303472&r1=1303471&r2=1303472&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/getlocations.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/getlocations.c Wed Mar 21 17:29:23 2012
@@ -109,11 +109,11 @@ static void pop_state(loc_context_t *loc
static svn_error_t *
start_getloc(svn_ra_serf__xml_parser_t *parser,
- void *userData,
svn_ra_serf__dav_props_t name,
- const char **attrs)
+ const char **attrs,
+ apr_pool_t *scratch_pool)
{
- loc_context_t *loc_ctx = userData;
+ loc_context_t *loc_ctx = parser->user_data;
if (!loc_ctx->state && strcmp(name.name, "get-locations-report") == 0)
{
@@ -148,10 +148,10 @@ start_getloc(svn_ra_serf__xml_parser_t *
static svn_error_t *
end_getloc(svn_ra_serf__xml_parser_t *parser,
- void *userData,
- svn_ra_serf__dav_props_t name)
+ svn_ra_serf__dav_props_t name,
+ apr_pool_t *scratch_pool)
{
- loc_context_t *loc_ctx = userData;
+ loc_context_t *loc_ctx = parser->user_data;
loc_state_list_t *cur_state;
if (!loc_ctx->state)
Modified: subversion/trunk/subversion/libsvn_ra_serf/getlocationsegments.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/getlocationsegments.c?rev=1303472&r1=1303471&r2=1303472&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/getlocationsegments.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/getlocationsegments.c Wed Mar 21 17:29:23 2012
@@ -64,11 +64,11 @@ typedef struct gls_context_t {
static svn_error_t *
start_gls(svn_ra_serf__xml_parser_t *parser,
- void *userData,
svn_ra_serf__dav_props_t name,
- const char **attrs)
+ const char **attrs,
+ apr_pool_t *scratch_pool)
{
- gls_context_t *gls_ctx = userData;
+ gls_context_t *gls_ctx = parser->user_data;
if ((! gls_ctx->inside_report)
&& strcmp(name.name, "get-location-segments-report") == 0)
@@ -115,10 +115,10 @@ start_gls(svn_ra_serf__xml_parser_t *par
static svn_error_t *
end_gls(svn_ra_serf__xml_parser_t *parser,
- void *userData,
- svn_ra_serf__dav_props_t name)
+ svn_ra_serf__dav_props_t name,
+ apr_pool_t *scratch_pool)
{
- gls_context_t *gls_ctx = userData;
+ gls_context_t *gls_ctx = parser->user_data;
if (strcmp(name.name, "get-location-segments-report") == 0)
gls_ctx->inside_report = FALSE;
Modified: subversion/trunk/subversion/libsvn_ra_serf/getlocks.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/getlocks.c?rev=1303472&r1=1303471&r2=1303472&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/getlocks.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/getlocks.c Wed Mar 21 17:29:23 2012
@@ -110,11 +110,11 @@ push_state(svn_ra_serf__xml_parser_t *pa
static svn_error_t *
start_getlocks(svn_ra_serf__xml_parser_t *parser,
- void *userData,
svn_ra_serf__dav_props_t name,
- const char **attrs)
+ const char **attrs,
+ apr_pool_t *scratch_pool)
{
- lock_context_t *lock_ctx = userData;
+ lock_context_t *lock_ctx = parser->user_data;
lock_state_e state;
state = parser->state->current_state;
@@ -162,10 +162,10 @@ start_getlocks(svn_ra_serf__xml_parser_t
static svn_error_t *
end_getlocks(svn_ra_serf__xml_parser_t *parser,
- void *userData,
- svn_ra_serf__dav_props_t name)
+ svn_ra_serf__dav_props_t name,
+ apr_pool_t *scratch_pool)
{
- lock_context_t *lock_ctx = userData;
+ lock_context_t *lock_ctx = parser->user_data;
lock_state_e state;
lock_info_t *info;
@@ -263,11 +263,11 @@ end_getlocks(svn_ra_serf__xml_parser_t *
static svn_error_t *
cdata_getlocks(svn_ra_serf__xml_parser_t *parser,
- void *userData,
const char *data,
- apr_size_t len)
+ apr_size_t len,
+ apr_pool_t *scratch_pool)
{
- lock_context_t *lock_ctx = userData;
+ lock_context_t *lock_ctx = parser->user_data;
lock_state_e state;
lock_info_t *info;
Modified: subversion/trunk/subversion/libsvn_ra_serf/locks.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/locks.c?rev=1303472&r1=1303471&r2=1303472&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/locks.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/locks.c Wed Mar 21 17:29:23 2012
@@ -108,11 +108,11 @@ push_state(svn_ra_serf__xml_parser_t *pa
*/
static svn_error_t *
start_lock(svn_ra_serf__xml_parser_t *parser,
- void *userData,
svn_ra_serf__dav_props_t name,
- const char **attrs)
+ const char **attrs,
+ apr_pool_t *scratch_pool)
{
- lock_info_t *ctx = userData;
+ lock_info_t *ctx = parser->user_data;
lock_state_e state;
state = parser->state->current_state;
@@ -189,10 +189,10 @@ start_lock(svn_ra_serf__xml_parser_t *pa
*/
static svn_error_t *
end_lock(svn_ra_serf__xml_parser_t *parser,
- void *userData,
- svn_ra_serf__dav_props_t name)
+ svn_ra_serf__dav_props_t name,
+ apr_pool_t *scratch_pool)
{
- lock_info_t *ctx = userData;
+ lock_info_t *ctx = parser->user_data;
lock_state_e state;
state = parser->state->current_state;
@@ -274,11 +274,11 @@ end_lock(svn_ra_serf__xml_parser_t *pars
static svn_error_t *
cdata_lock(svn_ra_serf__xml_parser_t *parser,
- void *userData,
const char *data,
- apr_size_t len)
+ apr_size_t len,
+ apr_pool_t *scratch_pool)
{
- lock_info_t *lock_ctx = userData;
+ lock_info_t *lock_ctx = parser->user_data;
lock_state_e state;
svn_stringbuf_t *info;
Modified: subversion/trunk/subversion/libsvn_ra_serf/log.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/log.c?rev=1303472&r1=1303471&r2=1303472&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/log.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/log.c Wed Mar 21 17:29:23 2012
@@ -190,11 +190,11 @@ read_changed_path_attributes(svn_log_cha
static svn_error_t *
start_log(svn_ra_serf__xml_parser_t *parser,
- void *userData,
svn_ra_serf__dav_props_t name,
- const char **attrs)
+ const char **attrs,
+ apr_pool_t *scratch_pool)
{
- log_context_t *log_ctx = userData;
+ log_context_t *log_ctx = parser->user_data;
log_state_e state;
state = parser->state->current_state;
@@ -352,10 +352,10 @@ maybe_decode_log_cdata(const svn_string_
static svn_error_t *
end_log(svn_ra_serf__xml_parser_t *parser,
- void *userData,
- svn_ra_serf__dav_props_t name)
+ svn_ra_serf__dav_props_t name,
+ apr_pool_t *scratch_pool)
{
- log_context_t *log_ctx = userData;
+ log_context_t *log_ctx = parser->user_data;
log_state_e state;
log_info_t *info;
@@ -485,11 +485,11 @@ end_log(svn_ra_serf__xml_parser_t *parse
static svn_error_t *
cdata_log(svn_ra_serf__xml_parser_t *parser,
- void *userData,
const char *data,
- apr_size_t len)
+ apr_size_t len,
+ apr_pool_t *scratch_pool)
{
- log_context_t *log_ctx = userData;
+ log_context_t *log_ctx = parser->user_data;
log_state_e state;
log_info_t *info;
Modified: subversion/trunk/subversion/libsvn_ra_serf/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/merge.c?rev=1303472&r1=1303471&r2=1303472&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/merge.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/merge.c Wed Mar 21 17:29:23 2012
@@ -129,11 +129,11 @@ push_state(svn_ra_serf__xml_parser_t *pa
static svn_error_t *
start_merge(svn_ra_serf__xml_parser_t *parser,
- void *userData,
svn_ra_serf__dav_props_t name,
- const char **attrs)
+ const char **attrs,
+ apr_pool_t *scratch_pool)
{
- svn_ra_serf__merge_context_t *ctx = userData;
+ svn_ra_serf__merge_context_t *ctx = parser->user_data;
merge_state_e state;
merge_info_t *info;
@@ -235,10 +235,10 @@ start_merge(svn_ra_serf__xml_parser_t *p
static svn_error_t *
end_merge(svn_ra_serf__xml_parser_t *parser,
- void *userData,
- svn_ra_serf__dav_props_t name)
+ svn_ra_serf__dav_props_t name,
+ apr_pool_t *scratch_pool)
{
- svn_ra_serf__merge_context_t *ctx = userData;
+ svn_ra_serf__merge_context_t *ctx = parser->user_data;
merge_state_e state;
merge_info_t *info;
@@ -376,11 +376,11 @@ end_merge(svn_ra_serf__xml_parser_t *par
static svn_error_t *
cdata_merge(svn_ra_serf__xml_parser_t *parser,
- void *userData,
const char *data,
- apr_size_t len)
+ apr_size_t len,
+ apr_pool_t *scratch_pool)
{
- svn_ra_serf__merge_context_t *ctx = userData;
+ svn_ra_serf__merge_context_t *ctx = parser->user_data;
merge_state_e state;
merge_info_t *info;
Modified: subversion/trunk/subversion/libsvn_ra_serf/mergeinfo.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/mergeinfo.c?rev=1303472&r1=1303471&r2=1303472&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/mergeinfo.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/mergeinfo.c Wed Mar 21 17:29:23 2012
@@ -66,11 +66,11 @@ typedef struct mergeinfo_context_t {
static svn_error_t *
start_element(svn_ra_serf__xml_parser_t *parser,
- void *userData,
svn_ra_serf__dav_props_t name,
- const char **attrs)
+ const char **attrs,
+ apr_pool_t *scratch_pool)
{
- mergeinfo_context_t *mergeinfo_ctx = userData;
+ mergeinfo_context_t *mergeinfo_ctx = parser->user_data;
mergeinfo_state_e state;
state = parser->state->current_state;
@@ -99,10 +99,11 @@ start_element(svn_ra_serf__xml_parser_t
}
static svn_error_t *
-end_element(svn_ra_serf__xml_parser_t *parser, void *userData,
- svn_ra_serf__dav_props_t name)
+end_element(svn_ra_serf__xml_parser_t *parser,
+ svn_ra_serf__dav_props_t name,
+ apr_pool_t *scratch_pool)
{
- mergeinfo_context_t *mergeinfo_ctx = userData;
+ mergeinfo_context_t *mergeinfo_ctx = parser->user_data;
mergeinfo_state_e state;
state = parser->state->current_state;
@@ -149,10 +150,12 @@ end_element(svn_ra_serf__xml_parser_t *p
static svn_error_t *
-cdata_handler(svn_ra_serf__xml_parser_t *parser, void *userData,
- const char *data, apr_size_t len)
+cdata_handler(svn_ra_serf__xml_parser_t *parser,
+ const char *data,
+ apr_size_t len,
+ apr_pool_t *scratch_pool)
{
- mergeinfo_context_t *mergeinfo_ctx = userData;
+ mergeinfo_context_t *mergeinfo_ctx = parser->user_data;
mergeinfo_state_e state;
state = parser->state->current_state;
Modified: subversion/trunk/subversion/libsvn_ra_serf/options.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/options.c?rev=1303472&r1=1303471&r2=1303472&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/options.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/options.c Wed Mar 21 17:29:23 2012
@@ -127,11 +127,11 @@ static void pop_state(svn_ra_serf__optio
static svn_error_t *
start_options(svn_ra_serf__xml_parser_t *parser,
- void *userData,
svn_ra_serf__dav_props_t name,
- const char **attrs)
+ const char **attrs,
+ apr_pool_t *scratch_pool)
{
- svn_ra_serf__options_context_t *options_ctx = userData;
+ svn_ra_serf__options_context_t *options_ctx = parser->user_data;
if (!options_ctx->state && strcmp(name.name, "options-response") == 0)
{
@@ -159,10 +159,10 @@ start_options(svn_ra_serf__xml_parser_t
static svn_error_t *
end_options(svn_ra_serf__xml_parser_t *parser,
- void *userData,
- svn_ra_serf__dav_props_t name)
+ svn_ra_serf__dav_props_t name,
+ apr_pool_t *scratch_pool)
{
- svn_ra_serf__options_context_t *options_ctx = userData;
+ svn_ra_serf__options_context_t *options_ctx = parser->user_data;
options_state_list_t *cur_state;
if (!options_ctx->state)
@@ -196,11 +196,11 @@ end_options(svn_ra_serf__xml_parser_t *p
static svn_error_t *
cdata_options(svn_ra_serf__xml_parser_t *parser,
- void *userData,
const char *data,
- apr_size_t len)
+ apr_size_t len,
+ apr_pool_t *scratch_pool)
{
- svn_ra_serf__options_context_t *ctx = userData;
+ svn_ra_serf__options_context_t *ctx = parser->user_data;
if (ctx->collect_cdata)
svn_stringbuf_appendbytes(ctx->acbuf, data, len);
Modified: subversion/trunk/subversion/libsvn_ra_serf/property.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/property.c?rev=1303472&r1=1303471&r2=1303472&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/property.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/property.c Wed Mar 21 17:29:23 2012
@@ -254,11 +254,11 @@ push_state(svn_ra_serf__xml_parser_t *pa
*/
static svn_error_t *
start_propfind(svn_ra_serf__xml_parser_t *parser,
- void *userData,
svn_ra_serf__dav_props_t name,
- const char **attrs)
+ const char **attrs,
+ apr_pool_t *scratch_pool)
{
- svn_ra_serf__propfind_context_t *ctx = userData;
+ svn_ra_serf__propfind_context_t *ctx = parser->user_data;
prop_state_e state;
prop_info_t *info;
@@ -295,10 +295,10 @@ start_propfind(svn_ra_serf__xml_parser_t
*/
static svn_error_t *
end_propfind(svn_ra_serf__xml_parser_t *parser,
- void *userData,
- svn_ra_serf__dav_props_t name)
+ svn_ra_serf__dav_props_t name,
+ apr_pool_t *scratch_pool)
{
- svn_ra_serf__propfind_context_t *ctx = userData;
+ svn_ra_serf__propfind_context_t *ctx = parser->user_data;
prop_state_e state;
prop_info_t *info;
@@ -392,11 +392,11 @@ end_propfind(svn_ra_serf__xml_parser_t *
*/
static svn_error_t *
cdata_propfind(svn_ra_serf__xml_parser_t *parser,
- void *userData,
const char *data,
- apr_size_t len)
+ apr_size_t len,
+ apr_pool_t *scratch_pool)
{
- svn_ra_serf__propfind_context_t *ctx = userData;
+ svn_ra_serf__propfind_context_t *ctx = parser->user_data;
prop_state_e state;
prop_info_t *info;
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=1303472&r1=1303471&r2=1303472&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h Wed Mar 21 17:29:23 2012
@@ -476,17 +476,17 @@ typedef struct svn_ra_serf__xml_parser_t
*/
typedef svn_error_t *
(*svn_ra_serf__xml_start_element_t)(svn_ra_serf__xml_parser_t *parser,
- void *baton,
svn_ra_serf__dav_props_t name,
- const char **attrs);
+ const char **attrs,
+ apr_pool_t *scratch_pool);
/* Callback invoked with @a baton by our XML @a parser when an element with
* the @a name is closed.
*/
typedef svn_error_t *
(*svn_ra_serf__xml_end_element_t)(svn_ra_serf__xml_parser_t *parser,
- void *baton,
- svn_ra_serf__dav_props_t name);
+ svn_ra_serf__dav_props_t name,
+ apr_pool_t *scratch_pool);
/* Callback invoked with @a baton by our XML @a parser when a CDATA portion
* of @a data with size @a len is encountered.
@@ -495,9 +495,9 @@ typedef svn_error_t *
*/
typedef svn_error_t *
(*svn_ra_serf__xml_cdata_chunk_handler_t)(svn_ra_serf__xml_parser_t *parser,
- void *baton,
const char *data,
- apr_size_t len);
+ apr_size_t len,
+ apr_pool_t *scratch_pool);
/*
* Helper structure associated with handle_xml_parser handler that will
Modified: subversion/trunk/subversion/libsvn_ra_serf/replay.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/replay.c?rev=1303472&r1=1303471&r2=1303472&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/replay.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/replay.c Wed Mar 21 17:29:23 2012
@@ -176,11 +176,11 @@ push_state(svn_ra_serf__xml_parser_t *pa
static svn_error_t *
start_replay(svn_ra_serf__xml_parser_t *parser,
- void *userData,
svn_ra_serf__dav_props_t name,
- const char **attrs)
+ const char **attrs,
+ apr_pool_t *scratch_pool)
{
- replay_context_t *ctx = userData;
+ replay_context_t *ctx = parser->user_data;
replay_state_e state;
state = parser->state->current_state;
@@ -473,10 +473,10 @@ start_replay(svn_ra_serf__xml_parser_t *
static svn_error_t *
end_replay(svn_ra_serf__xml_parser_t *parser,
- void *userData,
- svn_ra_serf__dav_props_t name)
+ svn_ra_serf__dav_props_t name,
+ apr_pool_t *scratch_pool)
{
- replay_context_t *ctx = userData;
+ replay_context_t *ctx = parser->user_data;
replay_state_e state;
state = parser->state->current_state;
@@ -558,11 +558,11 @@ end_replay(svn_ra_serf__xml_parser_t *pa
static svn_error_t *
cdata_replay(svn_ra_serf__xml_parser_t *parser,
- void *userData,
const char *data,
- apr_size_t len)
+ apr_size_t len,
+ apr_pool_t *scratch_pool)
{
- replay_context_t *replay_ctx = userData;
+ replay_context_t *replay_ctx = parser->user_data;
replay_state_e state;
UNUSED_CTX(replay_ctx);
Modified: subversion/trunk/subversion/libsvn_ra_serf/update.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/update.c?rev=1303472&r1=1303471&r2=1303472&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/update.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/update.c Wed Mar 21 17:29:23 2012
@@ -1329,11 +1329,11 @@ fetch_file(report_context_t *ctx, report
static svn_error_t *
start_report(svn_ra_serf__xml_parser_t *parser,
- void *userData,
svn_ra_serf__dav_props_t name,
- const char **attrs)
+ const char **attrs,
+ apr_pool_t *scratch_pool)
{
- report_context_t *ctx = userData;
+ report_context_t *ctx = parser->user_data;
report_state_e state;
state = parser->state->current_state;
@@ -1793,10 +1793,10 @@ start_report(svn_ra_serf__xml_parser_t *
static svn_error_t *
end_report(svn_ra_serf__xml_parser_t *parser,
- void *userData,
- svn_ra_serf__dav_props_t name)
+ svn_ra_serf__dav_props_t name,
+ apr_pool_t *scratch_pool)
{
- report_context_t *ctx = userData;
+ report_context_t *ctx = parser->user_data;
report_state_e state;
state = parser->state->current_state;
@@ -2048,11 +2048,11 @@ end_report(svn_ra_serf__xml_parser_t *pa
static svn_error_t *
cdata_report(svn_ra_serf__xml_parser_t *parser,
- void *userData,
const char *data,
- apr_size_t len)
+ apr_size_t len,
+ apr_pool_t *scratch_pool)
{
- report_context_t *ctx = userData;
+ report_context_t *ctx = parser->user_data;
UNUSED_CTX(ctx);
Modified: subversion/trunk/subversion/libsvn_ra_serf/util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/util.c?rev=1303472&r1=1303471&r2=1303472&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/util.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/util.c Wed Mar 21 17:29:23 2012
@@ -786,11 +786,11 @@ svn_ra_serf__context_run_wait(svn_boolea
*/
static svn_error_t *
start_error(svn_ra_serf__xml_parser_t *parser,
- void *userData,
svn_ra_serf__dav_props_t name,
- const char **attrs)
+ const char **attrs,
+ apr_pool_t *scratch_pool)
{
- svn_ra_serf__server_error_t *ctx = userData;
+ svn_ra_serf__server_error_t *ctx = parser->user_data;
if (!ctx->in_error &&
strcmp(name.namespace, "DAV:") == 0 &&
@@ -828,10 +828,10 @@ start_error(svn_ra_serf__xml_parser_t *p
*/
static svn_error_t *
end_error(svn_ra_serf__xml_parser_t *parser,
- void *userData,
- svn_ra_serf__dav_props_t name)
+ svn_ra_serf__dav_props_t name,
+ apr_pool_t *scratch_pool)
{
- svn_ra_serf__server_error_t *ctx = userData;
+ svn_ra_serf__server_error_t *ctx = parser->user_data;
if (ctx->in_error &&
strcmp(name.namespace, "DAV:") == 0 &&
@@ -866,11 +866,11 @@ end_error(svn_ra_serf__xml_parser_t *par
*/
static svn_error_t *
cdata_error(svn_ra_serf__xml_parser_t *parser,
- void *userData,
const char *data,
- apr_size_t len)
+ apr_size_t len,
+ apr_pool_t *scratch_pool)
{
- svn_ra_serf__server_error_t *ctx = userData;
+ svn_ra_serf__server_error_t *ctx = parser->user_data;
if (ctx->collect_cdata)
{
@@ -1053,11 +1053,11 @@ parse_dav_status(int *status_code_out, s
*/
static svn_error_t *
start_207(svn_ra_serf__xml_parser_t *parser,
- void *userData,
svn_ra_serf__dav_props_t name,
- const char **attrs)
+ const char **attrs,
+ apr_pool_t *scratch_pool)
{
- svn_ra_serf__server_error_t *ctx = userData;
+ svn_ra_serf__server_error_t *ctx = parser->user_data;
if (!ctx->in_error &&
strcmp(name.namespace, "DAV:") == 0 &&
@@ -1088,10 +1088,10 @@ start_207(svn_ra_serf__xml_parser_t *par
*/
static svn_error_t *
end_207(svn_ra_serf__xml_parser_t *parser,
- void *userData,
- svn_ra_serf__dav_props_t name)
+ svn_ra_serf__dav_props_t name,
+ apr_pool_t *scratch_pool)
{
- svn_ra_serf__server_error_t *ctx = userData;
+ svn_ra_serf__server_error_t *ctx = parser->user_data;
if (ctx->in_error &&
strcmp(name.namespace, "DAV:") == 0 &&
@@ -1132,11 +1132,11 @@ end_207(svn_ra_serf__xml_parser_t *parse
*/
static svn_error_t *
cdata_207(svn_ra_serf__xml_parser_t *parser,
- void *userData,
const char *data,
- apr_size_t len)
+ apr_size_t len,
+ apr_pool_t *scratch_pool)
{
- svn_ra_serf__server_error_t *ctx = userData;
+ svn_ra_serf__server_error_t *ctx = parser->user_data;
if (ctx->collect_cdata)
{
@@ -1237,11 +1237,14 @@ svn_ra_serf__handle_multistatus_only(ser
return svn_error_trace(err);
}
+
+/* Conforms to Expat's XML_StartElementHandler */
static void
start_xml(void *userData, const char *raw_name, const char **attrs)
{
svn_ra_serf__xml_parser_t *parser = userData;
svn_ra_serf__dav_props_t name;
+ apr_pool_t *scratch_pool;
if (parser->error)
return;
@@ -1249,31 +1252,43 @@ start_xml(void *userData, const char *ra
if (!parser->state)
svn_ra_serf__xml_push_state(parser, 0);
+ /* ### get a real scratch_pool */
+ scratch_pool = parser->state->pool;
+
svn_ra_serf__define_ns(&parser->state->ns_list, attrs, parser->state->pool);
svn_ra_serf__expand_ns(&name, parser->state->ns_list, raw_name);
- parser->error = parser->start(parser, parser->user_data, name, attrs);
+ parser->error = parser->start(parser, name, attrs, scratch_pool);
}
+
+/* Conforms to Expat's XML_EndElementHandler */
static void
end_xml(void *userData, const char *raw_name)
{
svn_ra_serf__xml_parser_t *parser = userData;
svn_ra_serf__dav_props_t name;
+ apr_pool_t *scratch_pool;
if (parser->error)
return;
+ /* ### get a real scratch_pool */
+ scratch_pool = parser->state->pool;
+
svn_ra_serf__expand_ns(&name, parser->state->ns_list, raw_name);
- parser->error = parser->end(parser, parser->user_data, name);
+ parser->error = parser->end(parser, name, scratch_pool);
}
+
+/* Conforms to Expat's XML_CharacterDataHandler */
static void
cdata_xml(void *userData, const char *data, int len)
{
svn_ra_serf__xml_parser_t *parser = userData;
+ apr_pool_t *scratch_pool;
if (parser->error)
return;
@@ -1281,7 +1296,10 @@ cdata_xml(void *userData, const char *da
if (!parser->state)
svn_ra_serf__xml_push_state(parser, 0);
- parser->error = parser->cdata(parser, parser->user_data, data, len);
+ /* ### get a real scratch_pool */
+ scratch_pool = parser->state->pool;
+
+ parser->error = parser->cdata(parser, data, len, scratch_pool);
}
/* Flip the requisite bits in CTX to indicate that processing of the