You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2013/12/28 16:52:49 UTC
svn commit: r1553853 - in /subversion/trunk/subversion/libsvn_ra_serf:
property.c serf.c update.c
Author: rhuijben
Date: Sat Dec 28 15:52:49 2013
New Revision: 1553853
URL: http://svn.apache.org/r1553853
Log:
Following up on r1553809, fix some more variable references.
* subversion/libsvn_ra_serf/property.c
(propfind_opened,
create_propfind_body): Update caller.
* subversion/libsvn_ra_serf/serf.c
(svn_ra_serf__rev_prop,
get_dirent_props): Update caller.
* subversion/libsvn_ra_serf/update.c
(start_report,
end_report): Update caller.
Modified:
subversion/trunk/subversion/libsvn_ra_serf/property.c
subversion/trunk/subversion/libsvn_ra_serf/serf.c
subversion/trunk/subversion/libsvn_ra_serf/update.c
Modified: subversion/trunk/subversion/libsvn_ra_serf/property.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/property.c?rev=1553853&r1=1553852&r2=1553853&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/property.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/property.c Sat Dec 28 15:52:49 2013
@@ -193,7 +193,7 @@ propfind_opened(svn_ra_serf__xml_estate_
if (entered_state == PROPVAL)
{
- svn_ra_serf__xml_note(xes, PROPVAL, "ns", tag->namespace);
+ svn_ra_serf__xml_note(xes, PROPVAL, "ns", tag->xmlns);
svn_ra_serf__xml_note(xes, PROPVAL, "name", tag->name);
}
else if (entered_state == PROPSTAT)
@@ -499,7 +499,7 @@ create_propfind_body(serf_bucket_t **bkt
body_bkt = serf_bucket_aggregate_create(alloc);
prop = ctx->find_props;
- while (prop && prop->namespace)
+ while (prop && prop->xmlns)
{
/* special case the allprop case. */
if (strcmp(prop->name, "allprop") == 0)
@@ -519,7 +519,7 @@ create_propfind_body(serf_bucket_t **bkt
alloc);
serf_bucket_aggregate_append(body_bkt, tmp);
- tmp = SERF_BUCKET_SIMPLE_STRING(prop->namespace, alloc);
+ tmp = SERF_BUCKET_SIMPLE_STRING(prop->xmlns, alloc);
serf_bucket_aggregate_append(body_bkt, tmp);
tmp = SERF_BUCKET_SIMPLE_STRING_LEN("\"/>", sizeof("\"/>")-1,
Modified: subversion/trunk/subversion/libsvn_ra_serf/serf.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/serf.c?rev=1553853&r1=1553852&r2=1553853&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/serf.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/serf.c Sat Dec 28 15:52:49 2013
@@ -922,9 +922,9 @@ svn_ra_serf__rev_prop(svn_ra_session_t *
if (strncmp(name, SVN_PROP_PREFIX, sizeof(SVN_PROP_PREFIX)-1) == 0
&& !strchr(name + sizeof(SVN_PROP_PREFIX)-1, ':'))
{
- specific_props[0].namespace = SVN_DAV_PROP_NS_SVN;
+ specific_props[0].xmlns = SVN_DAV_PROP_NS_SVN;
specific_props[0].name = name + sizeof(SVN_PROP_PREFIX)-1;
- specific_props[1].namespace = NULL;
+ specific_props[1].xmlns = NULL;
specific_props[1].name = NULL;
fetch_props = specific_props;
@@ -1153,42 +1153,42 @@ get_dirent_props(apr_uint32_t dirent_fie
if (dirent_fields & SVN_DIRENT_KIND)
{
prop = apr_array_push(props);
- prop->namespace = "DAV:";
+ prop->xmlns = "DAV:";
prop->name = "resourcetype";
}
if (dirent_fields & SVN_DIRENT_SIZE)
{
prop = apr_array_push(props);
- prop->namespace = "DAV:";
+ prop->xmlns = "DAV:";
prop->name = "getcontentlength";
}
if (dirent_fields & SVN_DIRENT_HAS_PROPS)
{
prop = apr_array_push(props);
- prop->namespace = SVN_DAV_PROP_NS_DAV;
+ prop->xmlns = SVN_DAV_PROP_NS_DAV;
prop->name = "deadprop-count";
}
if (dirent_fields & SVN_DIRENT_CREATED_REV)
{
svn_ra_serf__dav_props_t *p = apr_array_push(props);
- p->namespace = "DAV:";
+ p->xmlns = "DAV:";
p->name = SVN_DAV__VERSION_NAME;
}
if (dirent_fields & SVN_DIRENT_TIME)
{
prop = apr_array_push(props);
- prop->namespace = "DAV:";
+ prop->xmlns = "DAV:";
prop->name = SVN_DAV__CREATIONDATE;
}
if (dirent_fields & SVN_DIRENT_LAST_AUTHOR)
{
prop = apr_array_push(props);
- prop->namespace = "DAV:";
+ prop->xmlns = "DAV:";
prop->name = "creator-displayname";
}
}
@@ -1199,12 +1199,12 @@ get_dirent_props(apr_uint32_t dirent_fie
The neon behavior is to retrieve all properties in this case */
prop = apr_array_push(props);
- prop->namespace = "DAV:";
+ prop->xmlns = "DAV:";
prop->name = "allprop";
}
prop = apr_array_push(props);
- prop->namespace = NULL;
+ prop->xmlns = NULL;
prop->name = NULL;
return (svn_ra_serf__dav_props_t *) props->elts;
Modified: subversion/trunk/subversion/libsvn_ra_serf/update.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/update.c?rev=1553853&r1=1553852&r2=1553853&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/update.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/update.c Sat Dec 28 15:52:49 2013
@@ -1958,7 +1958,7 @@ start_report(svn_ra_serf__xml_parser_t *
if (strcmp(name.name, "checked-in") == 0)
{
info = push_state(parser, ctx, IGNORE_PROP_NAME);
- info->prop_ns = name.namespace;
+ info->prop_ns = name.xmlns;
info->prop_name = apr_pstrdup(parser->state->pool, name.name);
info->prop_encoding = NULL;
svn_stringbuf_setempty(info->prop_value);
@@ -2018,7 +2018,7 @@ start_report(svn_ra_serf__xml_parser_t *
if (strcmp(name.name, "checked-in") == 0)
{
info = push_state(parser, ctx, IGNORE_PROP_NAME);
- info->prop_ns = name.namespace;
+ info->prop_ns = name.xmlns;
info->prop_name = apr_pstrdup(parser->state->pool, name.name);
info->prop_encoding = NULL;
svn_stringbuf_setempty(info->prop_value);
@@ -2128,7 +2128,7 @@ start_report(svn_ra_serf__xml_parser_t *
info = push_state(parser, ctx, PROP);
- info->prop_ns = name.namespace;
+ info->prop_ns = name.xmlns;
info->prop_name = apr_pstrdup(parser->state->pool, name.name);
info->prop_encoding = svn_xml_get_attr_value("encoding", attrs);
svn_stringbuf_setempty(info->prop_value);
@@ -2407,7 +2407,7 @@ end_report(svn_ra_serf__xml_parser_t *pa
ns_name_match = NULL;
for (ns = dir->ns_list; ns; ns = ns->next)
{
- if (strcmp(ns->namespace, info->prop_ns) == 0)
+ if (strcmp(ns->xmlns, info->prop_ns) == 0)
{
ns_name_match = ns;
if (strcmp(ns->url, info->prop_name) == 0)
@@ -2423,11 +2423,11 @@ end_report(svn_ra_serf__xml_parser_t *pa
ns = apr_palloc(dir->pool, sizeof(*ns));
if (!ns_name_match)
{
- ns->namespace = apr_pstrdup(dir->pool, info->prop_ns);
+ ns->xmlns = apr_pstrdup(dir->pool, info->prop_ns);
}
else
{
- ns->namespace = ns_name_match->namespace;
+ ns->xmlns = ns_name_match->xmlns;
}
ns->url = apr_pstrdup(dir->pool, info->prop_name);
@@ -2474,12 +2474,12 @@ end_report(svn_ra_serf__xml_parser_t *pa
}
svn_ra_serf__set_ver_prop(props, info->base_name, info->base_rev,
- ns->namespace, ns->url, set_val_str, pool);
+ ns->xmlns, ns->url, set_val_str, pool);
/* Advance handling: if we spotted the md5-checksum property on
the wire, remember it's value. */
if (strcmp(ns->url, "md5-checksum") == 0
- && strcmp(ns->namespace, SVN_DAV_PROP_NS_DAV) == 0)
+ && strcmp(ns->xmlns, SVN_DAV_PROP_NS_DAV) == 0)
info->final_checksum = apr_pstrdup(info->pool, set_val_str->data);
svn_ra_serf__xml_pop_state(parser);