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 2014/03/26 19:20:27 UTC
svn commit: r1581984 - in /subversion/trunk/subversion/mod_dav_svn: authz.c
dav_svn.h liveprops.c merge.c reports/update.c repos.c util.c version.c
Author: rhuijben
Date: Wed Mar 26 18:20:26 2014
New Revision: 1581984
URL: http://svn.apache.org/r1581984
Log:
Use an svn_boolean_t argument type for a mod_dav_svn internal
api argument instead of an int with values 0 and 1.
No functional changes.
* subversion/mod_dav_svn/authz.c
(dav_svn__allow_read): Update caller.
* subversion/mod_dav_svn/dav_svn.h
(dav_svn__build_uri): Use boolean argument type.
* subversion/mod_dav_svn/liveprops.c
(insert_prop_internal): Update caller.
* subversion/mod_dav_svn/merge.c
(send_response,
dav_svn__merge_response): Update caller.
* subversion/mod_dav_svn/reports/update.c
(send_vsn_url,
add_helper): Update caller.
* subversion/mod_dav_svn/repos.c
(prep_version): Update caller.
* subversion/mod_dav_svn/util.c
(dav_svn__build_uri): Update argument type.
* subversion/mod_dav_svn/version.c
(get_option,
dav_svn__checkin): Update caller.
Modified:
subversion/trunk/subversion/mod_dav_svn/authz.c
subversion/trunk/subversion/mod_dav_svn/dav_svn.h
subversion/trunk/subversion/mod_dav_svn/liveprops.c
subversion/trunk/subversion/mod_dav_svn/merge.c
subversion/trunk/subversion/mod_dav_svn/reports/update.c
subversion/trunk/subversion/mod_dav_svn/repos.c
subversion/trunk/subversion/mod_dav_svn/util.c
subversion/trunk/subversion/mod_dav_svn/version.c
Modified: subversion/trunk/subversion/mod_dav_svn/authz.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/authz.c?rev=1581984&r1=1581983&r2=1581984&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/authz.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/authz.c Wed Mar 26 18:20:26 2014
@@ -80,7 +80,8 @@ dav_svn__allow_read(request_rec *r,
uri_type = DAV_SVN__BUILD_URI_PUBLIC;
/* Build a Version Resource uri representing (rev, path). */
- uri = dav_svn__build_uri(repos, uri_type, rev, path, FALSE, pool);
+ uri = dav_svn__build_uri(repos, uri_type, rev, path, FALSE /* add_href */,
+ pool);
/* Check if GET would work against this uri. */
subreq = ap_sub_req_method_uri("GET", uri, r, r->output_filters);
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=1581984&r1=1581983&r2=1581984&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/dav_svn.h (original)
+++ subversion/trunk/subversion/mod_dav_svn/dav_svn.h Wed Mar 26 18:20:26 2014
@@ -876,7 +876,7 @@ dav_svn__build_uri(const dav_svn_repos *
enum dav_svn__build_what what,
svn_revnum_t revision,
const char *path,
- int add_href,
+ svn_boolean_t add_href,
apr_pool_t *pool);
Modified: subversion/trunk/subversion/mod_dav_svn/liveprops.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/liveprops.c?rev=1581984&r1=1581983&r2=1581984&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/liveprops.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/liveprops.c Wed Mar 26 18:20:26 2014
@@ -549,7 +549,7 @@ insert_prop_internal(const dav_resource
return DAV_PROP_INSERT_NOTSUPP;
value = dav_svn__build_uri(resource->info->repos, DAV_SVN__BUILD_URI_BC,
resource->info->root.rev, NULL,
- 1 /* add_href */, scratch_pool);
+ TRUE /* add_href */, scratch_pool);
break;
case DAV_PROPID_checked_in:
@@ -578,7 +578,8 @@ insert_prop_internal(const dav_resource
}
s = dav_svn__build_uri(resource->info->repos,
DAV_SVN__BUILD_URI_BASELINE,
- revnum, NULL, 0 /* add_href */, scratch_pool);
+ revnum, NULL, FALSE /* add_href */,
+ scratch_pool);
value = apr_psprintf(scratch_pool, "<D:href>%s</D:href>",
apr_xml_quote_string(scratch_pool, s, 1));
}
@@ -596,7 +597,7 @@ insert_prop_internal(const dav_resource
s = dav_svn__build_uri(resource->info->repos,
DAV_SVN__BUILD_URI_VERSION,
rev_to_use, resource->info->repos_path,
- 0 /* add_href */, scratch_pool);
+ FALSE /* add_href */, scratch_pool);
value = apr_psprintf(scratch_pool, "<D:href>%s</D:href>",
apr_xml_quote_string(scratch_pool, s, 1));
}
@@ -610,7 +611,7 @@ insert_prop_internal(const dav_resource
return DAV_PROP_INSERT_NOTSUPP;
value = dav_svn__build_uri(resource->info->repos, DAV_SVN__BUILD_URI_VCC,
SVN_IGNORED_REVNUM, NULL,
- 1 /* add_href */, scratch_pool);
+ TRUE /* add_href */, scratch_pool);
break;
case DAV_PROPID_version_name:
Modified: subversion/trunk/subversion/mod_dav_svn/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/merge.c?rev=1581984&r1=1581983&r2=1581984&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/merge.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/merge.c Wed Mar 26 18:20:26 2014
@@ -85,7 +85,7 @@ send_response(const dav_svn_repos *repos
SVN_IGNORED_REVNUM, path, 0 /* add_href */, pool);
rev_to_use = dav_svn__get_safe_cr(root, path, pool);
vsn_url = dav_svn__build_uri(repos, DAV_SVN__BUILD_URI_VERSION,
- rev_to_use, path, 0 /* add_href */, pool);
+ rev_to_use, path, FALSE /* add_href */, pool);
status = ap_fputstrs(output, bb,
"<D:response>" DEBUG_CR
"<D:href>",
@@ -243,7 +243,7 @@ dav_svn__merge_response(ap_filter_t *out
/* the HREF for the baseline is actually the VCC */
vcc = dav_svn__build_uri(repos, DAV_SVN__BUILD_URI_VCC, SVN_IGNORED_REVNUM,
- NULL, 0 /* add_href */, pool);
+ NULL, FALSE /* add_href */, pool);
/* the version-name of the baseline is the revision number */
rev = apr_psprintf(pool, "%ld", new_rev);
Modified: subversion/trunk/subversion/mod_dav_svn/reports/update.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/reports/update.c?rev=1581984&r1=1581983&r2=1581984&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/reports/update.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/reports/update.c Wed Mar 26 18:20:26 2014
@@ -253,13 +253,13 @@ send_vsn_url(item_baton_t *baton, apr_po
{
href = dav_svn__build_uri(baton->uc->resource->info->repos,
DAV_SVN__BUILD_URI_REVROOT,
- revision, path, 0 /* add_href */, pool);
+ revision, path, FALSE /* add_href */, pool);
}
else
{
href = dav_svn__build_uri(baton->uc->resource->info->repos,
DAV_SVN__BUILD_URI_VERSION,
- revision, path, 0 /* add_href */, pool);
+ revision, path, FALSE /* add_href */, pool);
}
return dav_svn__brigade_printf(baton->uc->bb, baton->uc->output,
@@ -346,7 +346,7 @@ add_helper(svn_boolean_t is_dir,
bc_url = dav_svn__build_uri(child->uc->resource->info->repos,
DAV_SVN__BUILD_URI_BC,
revision, real_path,
- 0 /* add_href */, pool);
+ FALSE /* add_href */, pool);
bc_url = svn_urlpath__canonicalize(bc_url, pool);
/* ugh, build_uri ignores the path and just builds the root
Modified: subversion/trunk/subversion/mod_dav_svn/repos.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/repos.c?rev=1581984&r1=1581983&r2=1581984&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/repos.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/repos.c Wed Mar 26 18:20:26 2014
@@ -894,7 +894,7 @@ prep_version(dav_resource_combined *comb
comb->res.uri = dav_svn__build_uri(comb->priv.repos,
DAV_SVN__BUILD_URI_BASELINE,
comb->priv.root.rev, NULL,
- 0 /* add_href */,
+ FALSE /* add_href */,
pool);
return NULL;
@@ -4403,7 +4403,7 @@ dav_svn__working_to_regular_resource(dav
/* if rev was specific, create baseline-collection URL */
path = dav_svn__build_uri(repos, DAV_SVN__BUILD_URI_BC,
priv->root.rev, priv->repos_path,
- 0, resource->pool);
+ FALSE /* add_href */, resource->pool);
}
path = svn_path_uri_encode(path, resource->pool);
priv->uri_path = svn_stringbuf_create(path, resource->pool);
Modified: subversion/trunk/subversion/mod_dav_svn/util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/util.c?rev=1581984&r1=1581983&r2=1581984&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/util.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/util.c Wed Mar 26 18:20:26 2014
@@ -227,7 +227,7 @@ dav_svn__build_uri(const dav_svn_repos *
enum dav_svn__build_what what,
svn_revnum_t revision,
const char *path,
- int add_href,
+ svn_boolean_t add_href,
apr_pool_t *pool)
{
const char *root_path = repos->root_path;
Modified: subversion/trunk/subversion/mod_dav_svn/version.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/version.c?rev=1581984&r1=1581983&r2=1581984&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/version.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/version.c Wed Mar 26 18:20:26 2014
@@ -178,7 +178,8 @@ get_option(const dav_resource *resource,
request_rec *r = resource->info->r;
const char *repos_root_uri =
dav_svn__build_uri(resource->info->repos, DAV_SVN__BUILD_URI_PUBLIC,
- SVN_IGNORED_REVNUM, "", 0, resource->pool);
+ SVN_IGNORED_REVNUM, "", FALSE /* add_href */,
+ resource->pool);
/* ### DAV:version-history-collection-set */
if (elem->ns != APR_XML_NS_DAV_ID
@@ -199,7 +200,7 @@ get_option(const dav_resource *resource,
dav_svn__build_uri(resource->info->repos,
DAV_SVN__BUILD_URI_ACT_COLLECTION,
SVN_INVALID_REVNUM, NULL,
- 1 /* add_href */,
+ TRUE /* add_href */,
resource->pool));
apr_text_append(resource->pool, option,
"</D:activity-collection-set>");
@@ -1040,7 +1041,7 @@ dav_svn__checkin(dav_resource *resource,
uri = dav_svn__build_uri(resource->info->repos,
DAV_SVN__BUILD_URI_VERSION,
new_rev, resource->info->repos_path,
- 0, resource->pool);
+ FALSE /* add_href */, resource->pool);
err = dav_svn__create_version_resource(version_resource, uri,
resource->pool);