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 12:48:44 UTC
svn commit: r1553809 - in /subversion/trunk/subversion:
libsvn_ra_serf/multistatus.c libsvn_ra_serf/ra_serf.h libsvn_ra_serf/xml.c
mod_dav_svn/dav_svn.h mod_dav_svn/util.c
Author: rhuijben
Date: Sat Dec 28 11:48:44 2013
New Revision: 1553809
URL: http://svn.apache.org/r1553809
Log:
Make some internal namespace variable and argument names a bit friendlier to
C++ oriented editors and developer tools.
* subversion/libsvn_ra_serf/multistatus.c
(global): Tweak comment.
(multistatus_opened): Update user.
* subversion/libsvn_ra_serf/ra_serf.h
(svn_ra_serf__dav_props_t,
ns_t): Rename 'namespace' variables to 'xmlns'.
* subversion/libsvn_ra_serf/xml.c
(define_namespaces,
svn_ra_serf__expand_ns,
svn_ra_serf__xml_cb_start,
svn_ra_serf__xml_cb_cdata): Update caller.
* subversion/mod_dav_svn/dav_svn.h
(dav_svn__new_error_tag): Rename argument.
* subversion/mod_dav_svn/util.c
(dav_svn__new_error_tag): Rename argument.
Modified:
subversion/trunk/subversion/libsvn_ra_serf/multistatus.c
subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h
subversion/trunk/subversion/libsvn_ra_serf/xml.c
subversion/trunk/subversion/mod_dav_svn/dav_svn.h
subversion/trunk/subversion/mod_dav_svn/util.c
Modified: subversion/trunk/subversion/libsvn_ra_serf/multistatus.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/multistatus.c?rev=1553809&r1=1553808&r2=1553809&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/multistatus.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/multistatus.c Sat Dec 28 11:48:44 2013
@@ -125,7 +125,10 @@ typedef enum iprops_state_e {
Or on request failures
<D:error>
- <S:error>
+ <X:some-error xmlns="QQ" />
+ <D:human-readable code="12345">
+ Some Subversion error
+ </D:human-readable>
</D:error>
*/
@@ -260,7 +263,7 @@ multistatus_opened(svn_ra_serf__xml_esta
switch (entered_state)
{
case MS_PROPSTAT_PROP_NAME:
- if (strcmp(tag->namespace, SVN_DAV_PROP_NS_SVN) == 0)
+ if (strcmp(tag->xmlns, SVN_DAV_PROP_NS_SVN) == 0)
propname = apr_pstrcat(scratch_pool, SVN_PROP_PREFIX, tag->name,
SVN_VA_NULL);
else
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=1553809&r1=1553808&r2=1553809&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h Sat Dec 28 11:48:44 2013
@@ -266,7 +266,7 @@ struct svn_ra_serf__session_t {
*/
typedef struct svn_ra_serf__dav_props_t {
/* Element namespace */
- const char *namespace;
+ const char *xmlns;
/* Element name */
const char *name;
} svn_ra_serf__dav_props_t;
@@ -276,7 +276,7 @@ typedef struct svn_ra_serf__dav_props_t
*/
typedef struct ns_t {
/* The assigned name. */
- const char *namespace;
+ const char *xmlns;
/* The full URL for this namespace. */
const char *url;
/* The next namespace in our list. */
Modified: subversion/trunk/subversion/libsvn_ra_serf/xml.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/xml.c?rev=1553809&r1=1553808&r2=1553809&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/xml.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/xml.c Sat Dec 28 11:48:44 2013
@@ -141,7 +141,7 @@ define_namespaces(svn_ra_serf__ns_t **ns
/* Have we already defined this ns previously? */
for (cur_ns = *ns_list; cur_ns; cur_ns = cur_ns->next)
{
- if (strcmp(cur_ns->namespace, prefix) == 0)
+ if (strcmp(cur_ns->xmlns, prefix) == 0)
{
found = TRUE;
break;
@@ -158,7 +158,7 @@ define_namespaces(svn_ra_serf__ns_t **ns
else
pool = baton;
new_ns = apr_palloc(pool, sizeof(*new_ns));
- new_ns->namespace = apr_pstrdup(pool, prefix);
+ new_ns->xmlns = apr_pstrdup(pool, prefix);
new_ns->url = apr_pstrdup(pool, tmp_attrs[1]);
/* Push into the front of NS_LIST. Parent states will point
@@ -199,9 +199,9 @@ svn_ra_serf__expand_ns(svn_ra_serf__dav_
for (ns = ns_list; ns; ns = ns->next)
{
- if (strncmp(ns->namespace, name, colon - name) == 0)
+ if (strncmp(ns->xmlns, name, colon - name) == 0)
{
- returned_prop_name->namespace = ns->url;
+ returned_prop_name->xmlns = ns->url;
returned_prop_name->name = colon + 1;
return;
}
@@ -213,9 +213,9 @@ svn_ra_serf__expand_ns(svn_ra_serf__dav_
for (ns = ns_list; ns; ns = ns->next)
{
- if (! ns->namespace[0])
+ if (! ns->xmlns[0])
{
- returned_prop_name->namespace = ns->url;
+ returned_prop_name->xmlns = ns->url;
returned_prop_name->name = name;
return;
}
@@ -224,7 +224,7 @@ svn_ra_serf__expand_ns(svn_ra_serf__dav_
/* If the prefix is not found, then the name is NOT within a
namespace. */
- returned_prop_name->namespace = "";
+ returned_prop_name->xmlns = "";
returned_prop_name->name = name;
}
@@ -640,7 +640,7 @@ svn_ra_serf__xml_cb_start(svn_ra_serf__x
/* If we're waiting for an element to close, then just ignore all
other element-opens. */
- if (xmlctx->waiting.namespace != NULL)
+ if (xmlctx->waiting.xmlns != NULL)
return SVN_NO_ERROR;
/* Look for xmlns: attributes. Lazily create the state pool if any
@@ -660,7 +660,7 @@ svn_ra_serf__xml_cb_start(svn_ra_serf__x
/* Found a specific transition. */
if (strcmp(elemname.name, scan->name) == 0
- && strcmp(elemname.namespace, scan->ns) == 0)
+ && strcmp(elemname.xmlns, scan->ns) == 0)
break;
}
if (scan->ns == NULL)
@@ -750,7 +750,7 @@ svn_ra_serf__xml_cb_start(svn_ra_serf__x
/* Some basic copies to set up the new estate. */
new_xes->state = scan->to_state;
new_xes->tag.name = apr_pstrdup(new_pool, elemname.name);
- new_xes->tag.namespace = apr_pstrdup(new_pool, elemname.namespace);
+ new_xes->tag.xmlns = apr_pstrdup(new_pool, elemname.xmlns);
new_xes->custom_close = scan->custom_close;
/* Start with the parent's namespace set. */
@@ -783,15 +783,15 @@ svn_ra_serf__xml_cb_end(svn_ra_serf__xml
svn_ra_serf__expand_ns(&elemname, xes->ns_list, raw_name);
- if (xmlctx->waiting.namespace != NULL)
+ if (xmlctx->waiting.xmlns != NULL)
{
/* If this element is not the closer, then keep waiting... */
if (strcmp(elemname.name, xmlctx->waiting.name) != 0
- || strcmp(elemname.namespace, xmlctx->waiting.namespace) != 0)
+ || strcmp(elemname.xmlns, xmlctx->waiting.xmlns) != 0)
return SVN_NO_ERROR;
/* Found it. Stop waiting, and go back for more. */
- xmlctx->waiting.namespace = NULL;
+ xmlctx->waiting.xmlns = NULL;
return SVN_NO_ERROR;
}
@@ -803,7 +803,7 @@ svn_ra_serf__xml_cb_end(svn_ra_serf__xml
would imply closing an ancestor tag (where did ours go?) or a spurious
tag closure. */
if (strcmp(elemname.name, xes->tag.name) != 0
- || strcmp(elemname.namespace, xes->tag.namespace) != 0)
+ || strcmp(elemname.xmlns, xes->tag.xmlns) != 0)
return svn_error_create(SVN_ERR_XML_MALFORMED, NULL,
_("The response contains invalid XML"));
@@ -857,7 +857,7 @@ svn_ra_serf__xml_cb_cdata(svn_ra_serf__x
{
/* If we are waiting for a closing tag, then we are uninterested in
the cdata. Just return. */
- if (xmlctx->waiting.namespace != NULL)
+ if (xmlctx->waiting.xmlns != NULL)
return SVN_NO_ERROR;
/* If the current state is collecting cdata, then copy the cdata. */
Modified: subversion/trunk/subversion/mod_dav_svn/dav_svn.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/dav_svn.h?rev=1553809&r1=1553808&r2=1553809&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/dav_svn.h (original)
+++ subversion/trunk/subversion/mod_dav_svn/dav_svn.h Sat Dec 28 11:48:44 2013
@@ -796,7 +796,7 @@ dav_svn__new_error_tag(apr_pool_t *pool,
int status,
int error_id,
const char *desc,
- const char *namespace,
+ const char *xmlns,
const char *tagname);
Modified: subversion/trunk/subversion/mod_dav_svn/util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/util.c?rev=1553809&r1=1553808&r2=1553809&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/util.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/util.c Sat Dec 28 11:48:44 2013
@@ -70,7 +70,7 @@ dav_svn__new_error_tag(apr_pool_t *pool,
int status,
int error_id,
const char *desc,
- const char *namespace,
+ const char *xmlns,
const char *tagname)
{
if (error_id == 0)
@@ -78,7 +78,7 @@ dav_svn__new_error_tag(apr_pool_t *pool,
#if AP_MODULE_MAGIC_AT_LEAST(20091119,0)
return dav_new_error_tag(pool, status, error_id, 0,
- desc, namespace, tagname);
+ desc, xmlns, tagname);
#else
/* dav_new_error_tag will record errno but Subversion makes no attempt
to ensure that it is valid. We reset it to avoid putting incorrect