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/06/07 04:01:09 UTC
svn commit: r1347293 - 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 ra_serf.h xml.c
Author: gstein
Date: Thu Jun 7 02:01:08 2012
New Revision: 1347293
URL: http://svn.apache.org/viewvc?rev=1347293&view=rev
Log:
Remove the CUSTOM_OPEN flag from the transition table, since the
opened callback is invoked for all transitions. Add the new (tbd)
callback to the xml_context_create() function.
No real functional change.
* subversion/libsvn_ra_serf/ra_serf.h:
(svn_ra_serf__xml_transition_t): remove CUSTOM_OPEN. not needed.
(svn_ra_serf__xml_context_create): add CDATA_CB callback
* subversion/libsvn_ra_serf/blame.c:
(blame_ttable): remove CUSTOM_OPEN flag. table still not used.
* subversion/libsvn_ra_serf/get_deleted_rev.c:
(getdrev_ttable): remove CUSTOM_OPEN flag.
(svn_ra_serf__get_deleted_rev): add CDATA_CB to ctx creation
* subversion/libsvn_ra_serf/getdate.c:
(date_ttable): remove CUSTOM_OPEN flag.
(svn_ra_serf__get_dated_revision): add CDATA_CB to ctx creation
* subversion/libsvn_ra_serf/getlocations.c:
(getloc_ttable): remove CUSTOM_OPEN flag.
(svn_ra_serf__get_locations): add CDATA_CB to ctx creation
* subversion/libsvn_ra_serf/getlocationsegments.c:
(gls_ttable): remove CUSTOM_OPEN flag.
(svn_ra_serf__get_location_segments): add CDATA_CB to ctx creation
* subversion/libsvn_ra_serf/getlocks.c:
(getlocks_ttable): remove CUSTOM_OPEN flag.
(svn_ra_serf__get_locks): add CDATA_CB to ctx creation
* subversion/libsvn_ra_serf/locks.c:
(locks_ttable): remove CUSTOM_OPEN flag.
(svn_ra_serf__get_lock): add CDATA_CB to ctx creation
(svn_ra_serf__lock): add CDATA_CB to ctx creation
* subversion/libsvn_ra_serf/log.c:
(log_ttable): remove CUSTOM_OPEN flag.
(svn_ra_serf__get_log): add CDATA_CB to ctx creation
* subversion/libsvn_ra_serf/merge.c:
(merge_ttable): remove CUSTOM_OPEN flag. table still not used.
* subversion/libsvn_ra_serf/mergeinfo.c:
(mergeinfo_ttable): remove CUSTOM_OPEN flag.
(svn_ra_serf__get_mergeinfo): add CDATA_CB to ctx creation
* subversion/libsvn_ra_serf/options.c:
(options_ttable): remove CUSTOM_OPEN flag.
(create_options_req): add CDATA_CB to ctx creation
* subversion/libsvn_ra_serf/xml.c:
(svn_ra_serf__xml_context_create): add CDATA_CB param and store into
the context.
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/ra_serf.h
subversion/trunk/subversion/libsvn_ra_serf/xml.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=1347293&r1=1347292&r2=1347293&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/blame.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/blame.c Thu Jun 7 02:01:08 2012
@@ -120,25 +120,25 @@ typedef struct blame_context_t {
#define S_ SVN_XML_NAMESPACE
static const svn_ra_serf__xml_transition_t blame_ttable[] = {
{ INITIAL, S_, "file-revs-report", FILE_REVS_REPORT,
- FALSE, { NULL }, FALSE, FALSE },
+ FALSE, { NULL }, FALSE },
{ FILE_REVS_REPORT, S_, "file-rev", FILE_REV,
- FALSE, { "path", "rev", NULL }, FALSE, TRUE },
+ FALSE, { "path", "rev", NULL }, TRUE },
{ FILE_REV, D_, "rev-prop", REV_PROP,
- TRUE, { "name", "?encoding", NULL }, FALSE, TRUE },
+ TRUE, { "name", "?encoding", NULL }, TRUE },
{ FILE_REV, D_, "set-prop", SET_PROP,
- TRUE, { "name", "?encoding", NULL }, FALSE, TRUE },
+ TRUE, { "name", "?encoding", NULL }, TRUE },
{ FILE_REV, D_, "remove-prop", REMOVE_PROP,
- FALSE, { "name", "?encoding", NULL }, FALSE, TRUE },
+ FALSE, { "name", "?encoding", NULL }, TRUE },
{ FILE_REV, D_, "merged-revision", MERGED_REVISION,
- FALSE, { NULL }, FALSE, FALSE },
+ FALSE, { NULL }, FALSE },
{ FILE_REV, D_, "txdelta", TXDELTA,
- TRUE, { NULL }, FALSE, TRUE },
+ TRUE, { NULL }, TRUE },
{ 0 }
};
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=1347293&r1=1347292&r2=1347293&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/get_deleted_rev.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/get_deleted_rev.c Thu Jun 7 02:01:08 2012
@@ -56,10 +56,10 @@ typedef struct drev_context_t {
#define S_ SVN_XML_NAMESPACE
static const svn_ra_serf__xml_transition_t getdrev_ttable[] = {
{ INITIAL, S_, "get-deleted-rev-report", REPORT,
- FALSE, { NULL }, FALSE, FALSE },
+ FALSE, { NULL }, FALSE },
{ REPORT, D_, SVN_DAV__VERSION_NAME, VERSION_NAME,
- TRUE, { NULL }, FALSE, TRUE },
+ TRUE, { NULL }, TRUE },
{ 0 }
};
@@ -151,7 +151,8 @@ svn_ra_serf__get_deleted_rev(svn_ra_sess
pool, pool));
xmlctx = svn_ra_serf__xml_context_create(getdrev_ttable,
- NULL, getdrev_closed, drev_ctx,
+ NULL, getdrev_closed, NULL,
+ drev_ctx,
pool);
handler = svn_ra_serf__create_expat_handler(xmlctx, pool);
Modified: subversion/trunk/subversion/libsvn_ra_serf/getdate.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/getdate.c?rev=1347293&r1=1347292&r2=1347293&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/getdate.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/getdate.c Thu Jun 7 02:01:08 2012
@@ -63,10 +63,10 @@ typedef struct date_context_t {
#define S_ SVN_XML_NAMESPACE
static const svn_ra_serf__xml_transition_t date_ttable[] = {
{ INITIAL, S_, "dated-rev-report", REPORT,
- FALSE, { NULL }, FALSE, FALSE },
+ FALSE, { NULL }, FALSE },
{ REPORT, D_, SVN_DAV__VERSION_NAME, VERSION_NAME,
- TRUE, { NULL }, FALSE, TRUE },
+ TRUE, { NULL }, TRUE },
{ 0 }
};
@@ -139,7 +139,8 @@ svn_ra_serf__get_dated_revision(svn_ra_s
SVN_ERR(svn_ra_serf__report_resource(&report_target, session, NULL, pool));
xmlctx = svn_ra_serf__xml_context_create(date_ttable,
- NULL, date_closed, date_ctx,
+ NULL, date_closed, NULL,
+ date_ctx,
pool);
handler = svn_ra_serf__create_expat_handler(xmlctx, pool);
Modified: subversion/trunk/subversion/libsvn_ra_serf/getlocations.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/getlocations.c?rev=1347293&r1=1347292&r2=1347293&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/getlocations.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/getlocations.c Thu Jun 7 02:01:08 2012
@@ -65,10 +65,10 @@ typedef struct loc_context_t {
#define S_ SVN_XML_NAMESPACE
static const svn_ra_serf__xml_transition_t getloc_ttable[] = {
{ INITIAL, S_, "get-locations-report", REPORT,
- FALSE, { NULL }, FALSE, FALSE },
+ FALSE, { NULL }, FALSE },
{ REPORT, S_, "location", LOCATION,
- FALSE, { "?rev", "?path", NULL }, FALSE, TRUE },
+ FALSE, { "?rev", "?path", NULL }, TRUE },
{ 0 }
};
@@ -175,7 +175,8 @@ svn_ra_serf__get_locations(svn_ra_sessio
pool, pool));
xmlctx = svn_ra_serf__xml_context_create(getloc_ttable,
- NULL, getloc_closed, loc_ctx,
+ NULL, getloc_closed, NULL,
+ loc_ctx,
pool);
handler = svn_ra_serf__create_expat_handler(xmlctx, pool);
Modified: subversion/trunk/subversion/libsvn_ra_serf/getlocationsegments.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/getlocationsegments.c?rev=1347293&r1=1347292&r2=1347293&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/getlocationsegments.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/getlocationsegments.c Thu Jun 7 02:01:08 2012
@@ -61,10 +61,10 @@ enum {
#define S_ SVN_XML_NAMESPACE
static const svn_ra_serf__xml_transition_t gls_ttable[] = {
{ INITIAL, S_, "get-location-segments-report", REPORT,
- FALSE, { NULL }, FALSE, FALSE },
+ FALSE, { NULL }, FALSE },
{ REPORT, S_, "location-segment", SEGMENT,
- FALSE, { "?path", "range-start", "range-end", NULL }, FALSE, TRUE },
+ FALSE, { "?path", "range-start", "range-end", NULL }, TRUE },
{ 0 }
};
@@ -177,7 +177,8 @@ svn_ra_serf__get_location_segments(svn_r
pool, pool));
xmlctx = svn_ra_serf__xml_context_create(gls_ttable,
- NULL, gls_closed, gls_ctx,
+ NULL, gls_closed, NULL,
+ gls_ctx,
pool);
handler = svn_ra_serf__create_expat_handler(xmlctx, pool);
Modified: subversion/trunk/subversion/libsvn_ra_serf/getlocks.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/getlocks.c?rev=1347293&r1=1347292&r2=1347293&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/getlocks.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/getlocks.c Thu Jun 7 02:01:08 2012
@@ -74,28 +74,28 @@ typedef struct lock_context_t {
#define S_ SVN_XML_NAMESPACE
static const svn_ra_serf__xml_transition_t getlocks_ttable[] = {
{ INITIAL, S_, "get-locks-report", REPORT,
- FALSE, { NULL }, FALSE, FALSE },
+ FALSE, { NULL }, FALSE },
{ REPORT, S_, "lock", LOCK,
- FALSE, { NULL }, FALSE, TRUE },
+ FALSE, { NULL }, TRUE },
{ LOCK, S_, "path", PATH,
- TRUE, { NULL }, FALSE, TRUE },
+ TRUE, { NULL }, TRUE },
{ LOCK, S_, "token", TOKEN,
- TRUE, { NULL }, FALSE, TRUE },
+ TRUE, { NULL }, TRUE },
{ LOCK, S_, "owner", OWNER,
- TRUE, { NULL }, FALSE, TRUE },
+ TRUE, { NULL }, TRUE },
{ LOCK, S_, "comment", COMMENT,
- TRUE, { NULL }, FALSE, TRUE },
+ TRUE, { NULL }, TRUE },
{ LOCK, S_, SVN_DAV__CREATIONDATE, CREATION_DATE,
- TRUE, { NULL }, FALSE, TRUE },
+ TRUE, { NULL }, TRUE },
{ LOCK, S_, "expirationdate", EXPIRATION_DATE,
- TRUE, { NULL }, FALSE, TRUE },
+ TRUE, { NULL }, TRUE },
{ 0 }
};
@@ -248,7 +248,8 @@ svn_ra_serf__get_locks(svn_ra_session_t
lock_ctx->hash = apr_hash_make(pool);
xmlctx = svn_ra_serf__xml_context_create(getlocks_ttable,
- NULL, getlocks_closed, lock_ctx,
+ NULL, getlocks_closed, NULL,
+ lock_ctx,
pool);
handler = svn_ra_serf__create_expat_handler(xmlctx, pool);
Modified: subversion/trunk/subversion/libsvn_ra_serf/locks.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/locks.c?rev=1347293&r1=1347292&r2=1347293&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/locks.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/locks.c Thu Jun 7 02:01:08 2012
@@ -85,24 +85,24 @@ static const svn_ra_serf__xml_transition
/* The INITIAL state can transition into D:prop (LOCK) or
to D:multistatus (PROPFIND) */
{ INITIAL, D_, "prop", PROP,
- FALSE, { NULL }, FALSE, FALSE },
+ FALSE, { NULL }, FALSE },
{ INITIAL, D_, "multistatus", MULTISTATUS,
- FALSE, { NULL }, FALSE, FALSE },
+ FALSE, { NULL }, FALSE },
{ MULTISTATUS, D_, "response", RESPONSE,
- FALSE, { NULL }, FALSE, FALSE },
+ FALSE, { NULL }, FALSE },
{ RESPONSE, D_, "propstat", PROPSTAT,
- FALSE, { NULL }, FALSE, FALSE },
+ FALSE, { NULL }, FALSE },
{ PROPSTAT, D_, "prop", PROP,
- FALSE, { NULL }, FALSE, FALSE },
+ FALSE, { NULL }, FALSE },
{ PROP, D_, "lockdiscovery", LOCK_DISCOVERY,
- FALSE, { NULL }, FALSE, FALSE },
+ FALSE, { NULL }, FALSE },
{ LOCK_DISCOVERY, D_, "activelock", ACTIVE_LOCK,
- FALSE, { NULL }, FALSE, FALSE },
+ FALSE, { NULL }, FALSE },
#if 0
/* ### we don't really need to parse locktype/lockscope. we know what
@@ -113,29 +113,29 @@ static const svn_ra_serf__xml_transition
### just isn't important to validate, so disable this for now... */
{ ACTIVE_LOCK, D_, "locktype", LOCK_TYPE,
- FALSE, { NULL }, FALSE, FALSE },
+ FALSE, { NULL }, FALSE },
{ LOCK_TYPE, D_, "write", WRITE,
- FALSE, { NULL }, FALSE, TRUE },
+ FALSE, { NULL }, TRUE },
{ ACTIVE_LOCK, D_, "lockscope", LOCK_SCOPE,
- FALSE, { NULL }, FALSE, FALSE },
+ FALSE, { NULL }, FALSE },
{ LOCK_SCOPE, D_, "exclusive", EXCLUSIVE,
- FALSE, { NULL }, FALSE, TRUE },
+ FALSE, { NULL }, TRUE },
#endif /* 0 */
{ ACTIVE_LOCK, D_, "timeout", TIMEOUT,
- TRUE, { NULL }, FALSE, TRUE },
+ TRUE, { NULL }, TRUE },
{ ACTIVE_LOCK, D_, "locktoken", LOCK_TOKEN,
- FALSE, { NULL }, FALSE, FALSE },
+ FALSE, { NULL }, FALSE },
{ LOCK_TOKEN, D_, "href", HREF,
- TRUE, { NULL }, FALSE, TRUE },
+ TRUE, { NULL }, TRUE },
{ ACTIVE_LOCK, D_, "owner", OWNER,
- TRUE, { NULL }, FALSE, TRUE },
+ TRUE, { NULL }, TRUE },
/* ACTIVE_LOCK has a D:depth child, but we can ignore that. */
@@ -381,7 +381,8 @@ svn_ra_serf__get_lock(svn_ra_session_t *
lock_ctx->lock->path = apr_pstrdup(pool, path); /* be sure */
xmlctx = svn_ra_serf__xml_context_create(locks_ttable,
- NULL, locks_closed, lock_ctx,
+ NULL, locks_closed, NULL,
+ lock_ctx,
pool);
handler = svn_ra_serf__create_expat_handler(xmlctx, pool);
@@ -471,7 +472,8 @@ svn_ra_serf__lock(svn_ra_session_t *ra_s
lock_ctx->path, iterpool);
xmlctx = svn_ra_serf__xml_context_create(locks_ttable,
- NULL, locks_closed, lock_ctx,
+ NULL, locks_closed, NULL,
+ lock_ctx,
iterpool);
handler = svn_ra_serf__create_expat_handler(xmlctx, iterpool);
Modified: subversion/trunk/subversion/libsvn_ra_serf/log.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/log.c?rev=1347293&r1=1347292&r2=1347293&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/log.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/log.c Thu Jun 7 02:01:08 2012
@@ -99,47 +99,47 @@ typedef struct log_context_t {
#define S_ SVN_XML_NAMESPACE
static const svn_ra_serf__xml_transition_t log_ttable[] = {
{ INITIAL, S_, "log-report", REPORT,
- FALSE, { NULL }, FALSE, FALSE },
+ FALSE, { NULL }, FALSE },
/* Note that we have an opener here. We need to construct a new LOG_ENTRY
to record multiple paths. */
{ REPORT, S_, "log-item", ITEM,
- FALSE, { NULL }, TRUE, TRUE },
+ FALSE, { NULL }, TRUE },
{ ITEM, D_, SVN_DAV__VERSION_NAME, VERSION,
- TRUE, { NULL }, FALSE, TRUE },
+ TRUE, { NULL }, TRUE },
{ ITEM, D_, "creator-displayname", CREATOR,
- TRUE, { "?encoding", NULL }, FALSE, TRUE },
+ TRUE, { "?encoding", NULL }, TRUE },
{ ITEM, S_, "date", DATE,
- TRUE, { "?encoding", NULL }, FALSE, TRUE },
+ TRUE, { "?encoding", NULL }, TRUE },
{ ITEM, D_, "comment", COMMENT,
- TRUE, { "?encoding", NULL }, FALSE, TRUE },
+ TRUE, { "?encoding", NULL }, TRUE },
{ ITEM, S_, "revprop", REVPROP,
- TRUE, { "name", "?encoding", NULL }, FALSE, TRUE },
+ TRUE, { "name", "?encoding", NULL }, TRUE },
{ ITEM, S_, "has-children", HAS_CHILDREN,
- FALSE, { NULL }, FALSE, TRUE },
+ FALSE, { NULL }, TRUE },
{ ITEM, S_, "subtractive-merge", SUBTRACTIVE_MERGE,
- FALSE, { NULL }, FALSE, TRUE },
+ FALSE, { NULL }, TRUE },
{ ITEM, S_, "added-path", ADDED_PATH,
TRUE, { "?node-kind", "?text-mods", "?prop-mods",
- "?copyfrom-path", "?copyfrom-rev", NULL }, FALSE, TRUE },
+ "?copyfrom-path", "?copyfrom-rev", NULL }, TRUE },
{ ITEM, S_, "replaced-path", REPLACED_PATH,
TRUE, { "?node-kind", "?text-mods", "?prop-mods",
- "?copyfrom-path", "?copyfrom-rev", NULL }, FALSE, TRUE },
+ "?copyfrom-path", "?copyfrom-rev", NULL }, TRUE },
{ ITEM, S_, "deleted-path", DELETED_PATH,
- TRUE, { "?node-kind", "?text-mods", "?prop-mods", NULL }, FALSE, TRUE },
+ TRUE, { "?node-kind", "?text-mods", "?prop-mods", NULL }, TRUE },
{ ITEM, S_, "modified-path", MODIFIED_PATH,
- TRUE, { "?node-kind", "?text-mods", "?prop-mods", NULL }, FALSE, TRUE },
+ TRUE, { "?node-kind", "?text-mods", "?prop-mods", NULL }, TRUE },
{ 0 }
};
@@ -585,7 +585,8 @@ svn_ra_serf__get_log(svn_ra_session_t *r
pool, pool));
xmlctx = svn_ra_serf__xml_context_create(log_ttable,
- log_opened, log_closed, log_ctx,
+ log_opened, log_closed, NULL,
+ log_ctx,
pool);
handler = svn_ra_serf__create_expat_handler(xmlctx, pool);
Modified: subversion/trunk/subversion/libsvn_ra_serf/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/merge.c?rev=1347293&r1=1347292&r2=1347293&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/merge.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/merge.c Thu Jun 7 02:01:08 2012
@@ -113,46 +113,46 @@ struct svn_ra_serf__merge_context_t
#define S_ SVN_XML_NAMESPACE
static const svn_ra_serf__xml_transition_t merge_ttable[] = {
{ INITIAL, S_, "merge-response", MERGE_RESPONSE,
- FALSE, { NULL }, FALSE, FALSE },
+ FALSE, { NULL }, FALSE },
{ MERGE_RESPONSE, S_, "updated-set", UPDATED_SET,
- FALSE, { NULL }, FALSE, FALSE },
+ FALSE, { NULL }, FALSE },
{ UPDATED_SET, D_, "response", RESPONSE,
- FALSE, { NULL }, FALSE, FALSE },
+ FALSE, { NULL }, FALSE },
{ RESPONSE, D_, "href", HREF,
- FALSE, { NULL }, FALSE, FALSE },
+ FALSE, { NULL }, FALSE },
{ RESPONSE, D_, "propstat", PROPSTAT,
- FALSE, { NULL }, FALSE, FALSE },
+ FALSE, { NULL }, FALSE },
{ PROPSTAT, D_, "prop", PROP,
- FALSE, { NULL }, FALSE, FALSE },
+ FALSE, { NULL }, FALSE },
#if 0
/* Not needed. */
{ PROPSTAT, D_, "status", STATUS,
- FALSE, { NULL }, FALSE, FALSE },
+ FALSE, { NULL }, FALSE },
#endif
{ PROP, D_, "resourcetype", RESOURCE_TYPE,
- FALSE, { NULL }, FALSE, FALSE },
+ FALSE, { NULL }, FALSE },
{ RESOURCE_TYPE, D_, "baseline", BASELINE,
- FALSE, { NULL }, FALSE, FALSE },
+ FALSE, { NULL }, FALSE },
{ RESOURCE_TYPE, D_, "collection", COLLECTION,
- FALSE, { NULL }, FALSE, FALSE },
+ FALSE, { NULL }, FALSE },
{ PROP, D_, "checked-in", SKIP_HREF,
- FALSE, { NULL }, FALSE, FALSE },
+ FALSE, { NULL }, FALSE },
{ PROP, "*", "*", PROP_VAL,
- FALSE, { NULL }, FALSE, FALSE },
+ FALSE, { NULL }, FALSE },
{ SKIP_HREF, D_, "href", PROP_VAL,
- FALSE, { NULL }, FALSE, FALSE },
+ FALSE, { NULL }, FALSE },
{ 0 }
};
Modified: subversion/trunk/subversion/libsvn_ra_serf/mergeinfo.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/mergeinfo.c?rev=1347293&r1=1347292&r2=1347293&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/mergeinfo.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/mergeinfo.c Thu Jun 7 02:01:08 2012
@@ -64,16 +64,16 @@ typedef struct mergeinfo_context_t {
#define S_ SVN_XML_NAMESPACE
static const svn_ra_serf__xml_transition_t mergeinfo_ttable[] = {
{ INITIAL, S_, SVN_DAV__MERGEINFO_REPORT, MERGEINFO_REPORT,
- FALSE, { NULL }, FALSE, FALSE },
+ FALSE, { NULL }, FALSE },
{ MERGEINFO_REPORT, S_, SVN_DAV__MERGEINFO_ITEM, MERGEINFO_ITEM,
- FALSE, { NULL }, FALSE, TRUE },
+ FALSE, { NULL }, TRUE },
{ MERGEINFO_ITEM, S_, SVN_DAV__MERGEINFO_PATH, MERGEINFO_PATH,
- TRUE, { NULL }, FALSE, TRUE },
+ TRUE, { NULL }, TRUE },
{ MERGEINFO_ITEM, S_, SVN_DAV__MERGEINFO_INFO, MERGEINFO_INFO,
- TRUE, { NULL }, FALSE, TRUE },
+ TRUE, { NULL }, TRUE },
{ 0 }
};
@@ -214,7 +214,7 @@ svn_ra_serf__get_mergeinfo(svn_ra_sessio
mergeinfo_ctx->include_descendants = include_descendants;
xmlctx = svn_ra_serf__xml_context_create(mergeinfo_ttable,
- NULL, mergeinfo_closed,
+ NULL, mergeinfo_closed, NULL,
mergeinfo_ctx,
pool);
handler = svn_ra_serf__create_expat_handler(xmlctx, pool);
Modified: subversion/trunk/subversion/libsvn_ra_serf/options.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/options.c?rev=1347293&r1=1347292&r2=1347293&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/options.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/options.c Thu Jun 7 02:01:08 2012
@@ -78,13 +78,13 @@ typedef struct options_context_t {
#define S_ SVN_XML_NAMESPACE
static const svn_ra_serf__xml_transition_t options_ttable[] = {
{ INITIAL, D_, "options-response", OPTIONS,
- FALSE, { NULL }, FALSE, FALSE },
+ FALSE, { NULL }, FALSE },
{ OPTIONS, D_, "activity-collection-set", ACTIVITY_COLLECTION,
- FALSE, { NULL }, FALSE, FALSE },
+ FALSE, { NULL }, FALSE },
{ ACTIVITY_COLLECTION, D_, "href", HREF,
- TRUE, { NULL }, FALSE, TRUE },
+ TRUE, { NULL }, TRUE },
{ 0 }
};
@@ -322,7 +322,8 @@ create_options_req(options_context_t **o
new_ctx->youngest_rev = SVN_INVALID_REVNUM;
xmlctx = svn_ra_serf__xml_context_create(options_ttable,
- NULL, options_closed, new_ctx,
+ NULL, options_closed, NULL,
+ new_ctx,
pool);
handler = svn_ra_serf__create_expat_handler(xmlctx, pool);
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=1347293&r1=1347292&r2=1347293&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h Thu Jun 7 02:01:08 2012
@@ -698,9 +698,6 @@ typedef struct svn_ra_serf__xml_transiti
exist on the element, or SVN_ERR_XML_ATTRIB_NOT_FOUND will be raised. */
const char *collect_attrs[11];
- /* When NAME is opened, should the callback be invoked? */
- svn_boolean_t custom_open;
-
/* When NAME is closed, should the callback be invoked? */
svn_boolean_t custom_close;
@@ -713,9 +710,7 @@ svn_ra_serf__xml_context_create(
const svn_ra_serf__xml_transition_t *ttable,
svn_ra_serf__xml_opened_t opened_cb,
svn_ra_serf__xml_closed_t closed_cb,
-#ifdef NOT_YET
svn_ra_serf__xml_cdata_t cdata_cb,
-#endif
void *baton,
apr_pool_t *result_pool);
Modified: subversion/trunk/subversion/libsvn_ra_serf/xml.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/xml.c?rev=1347293&r1=1347292&r2=1347293&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/xml.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/xml.c Thu Jun 7 02:01:08 2012
@@ -449,9 +449,7 @@ svn_ra_serf__xml_context_create(
const svn_ra_serf__xml_transition_t *ttable,
svn_ra_serf__xml_opened_t opened_cb,
svn_ra_serf__xml_closed_t closed_cb,
-#ifdef NOT_YET
svn_ra_serf__xml_cdata_t cdata_cb,
-#endif
void *baton,
apr_pool_t *result_pool)
{
@@ -462,9 +460,7 @@ svn_ra_serf__xml_context_create(
xmlctx->ttable = ttable;
xmlctx->opened_cb = opened_cb;
xmlctx->closed_cb = closed_cb;
-#if 0
xmlctx->cdata_cb = cdata_cb;
-#endif
xmlctx->baton = baton;
xmlctx->scratch_pool = svn_pool_create(result_pool);