You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2013/10/28 11:38:17 UTC
svn commit: r1536307 [2/2] - in /subversion/trunk: subversion/include/
subversion/libsvn_client/ subversion/libsvn_delta/ subversion/libsvn_fs/
subversion/libsvn_fs_base/ subversion/libsvn_fs_base/bdb/
subversion/libsvn_fs_fs/ subversion/libsvn_fs_x/ s...
Modified: subversion/trunk/subversion/libsvn_wc/adm_files.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_files.c?rev=1536307&r1=1536306&r2=1536307&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_files.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_files.c Mon Oct 28 10:38:15 2013
@@ -117,7 +117,7 @@ svn_wc__adm_child(const char *path,
path,
adm_dir_name,
child,
- (char *)NULL);
+ SVN_VA_NULL);
}
Modified: subversion/trunk/subversion/libsvn_wc/externals.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/externals.c?rev=1536307&r1=1536306&r2=1536307&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/externals.c (original)
+++ subversion/trunk/subversion/libsvn_wc/externals.c Mon Oct 28 10:38:15 2013
@@ -1556,7 +1556,7 @@ svn_wc__resolve_relative_external_url(co
apr_pstrndup(scratch_pool, url, num_leading_slashes),
svn_relpath_canonicalize(url + num_leading_slashes,
scratch_pool),
- (char*)NULL);
+ SVN_VA_NULL);
}
else
{
@@ -1663,7 +1663,7 @@ svn_wc__resolve_relative_external_url(co
SVN_ERR(uri_scheme(&scheme, repos_root_url, scratch_pool));
*resolved_url = svn_uri_canonicalize(apr_pstrcat(scratch_pool, scheme,
- ":", url, (char *)NULL),
+ ":", url, SVN_VA_NULL),
result_pool);
return SVN_NO_ERROR;
}
Modified: subversion/trunk/subversion/libsvn_wc/old-and-busted.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/old-and-busted.c?rev=1536307&r1=1536306&r2=1536307&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/old-and-busted.c (original)
+++ subversion/trunk/subversion/libsvn_wc/old-and-busted.c Mon Oct 28 10:38:15 2013
@@ -443,7 +443,7 @@ svn_wc__serialize_file_external(const ch
SVN_ERR(opt_revision_to_string(&s1, path, peg_rev, pool));
SVN_ERR(opt_revision_to_string(&s2, path, rev, pool));
- s = apr_pstrcat(pool, s1, ":", s2, ":", path, (char *)NULL);
+ s = apr_pstrcat(pool, s1, ":", s2, ":", path, SVN_VA_NULL);
}
else
s = NULL;
Modified: subversion/trunk/subversion/libsvn_wc/relocate.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/relocate.c?rev=1536307&r1=1536306&r2=1536307&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/relocate.c (original)
+++ subversion/trunk/subversion/libsvn_wc/relocate.c Mon Oct 28 10:38:15 2013
@@ -148,7 +148,7 @@ svn_wc_relocate4(svn_wc_context_t *wc_ct
if (old_url_len == from_len)
new_url = to;
else
- new_url = apr_pstrcat(scratch_pool, to, old_url + from_len, (char *)NULL);
+ new_url = apr_pstrcat(scratch_pool, to, old_url + from_len, SVN_VA_NULL);
if (! svn_path_is_url(new_url))
return svn_error_createf(SVN_ERR_WC_INVALID_RELOCATION, NULL,
_("Invalid relocation destination: '%s' "
Modified: subversion/trunk/subversion/libsvn_wc/upgrade.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/upgrade.c?rev=1536307&r1=1536306&r2=1536307&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/upgrade.c (original)
+++ subversion/trunk/subversion/libsvn_wc/upgrade.c Mon Oct 28 10:38:15 2013
@@ -400,7 +400,7 @@ build_lockfile_path(const char *local_di
local_dir_abspath,
svn_wc_get_adm_dir(result_pool),
ADM_LOCK,
- (char *)NULL);
+ SVN_VA_NULL);
}
@@ -875,21 +875,21 @@ migrate_node_props(const char *dir_abspa
apr_pstrcat(scratch_pool,
name,
SVN_WC__BASE_EXT,
- (char *)NULL),
+ SVN_VA_NULL),
scratch_pool);
revert_abspath = svn_dirent_join(basedir_abspath,
apr_pstrcat(scratch_pool,
name,
SVN_WC__REVERT_EXT,
- (char *)NULL),
+ SVN_VA_NULL),
scratch_pool);
working_abspath = svn_dirent_join(propsdir_abspath,
apr_pstrcat(scratch_pool,
name,
SVN_WC__WORK_EXT,
- (char *)NULL),
+ SVN_VA_NULL),
scratch_pool);
}
@@ -1248,7 +1248,7 @@ rename_pristine_file(void *baton,
== PRISTINE_BASENAME_OLD_LEN))
{
const char *new_abspath
- = apr_pstrcat(pool, abspath, PRISTINE_STORAGE_EXT, (char *)NULL);
+ = apr_pstrcat(pool, abspath, PRISTINE_STORAGE_EXT, SVN_VA_NULL);
SVN_ERR(svn_io_file_rename(abspath, new_abspath, pool));
}
@@ -1350,7 +1350,7 @@ bump_to_29(void *baton, svn_sqlite__db_t
pristine_dir_abspath = svn_dirent_join_many(scratch_pool, wcroot_abspath,
svn_wc_get_adm_dir(scratch_pool),
PRISTINE_STORAGE_RELPATH,
- (char *)NULL);
+ SVN_VA_NULL);
SVN_ERR(svn_io_dir_walk2(pristine_dir_abspath, APR_FINFO_MIN,
rename_pristine_file, NULL, scratch_pool));
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1536307&r1=1536306&r2=1536307&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Mon Oct 28 10:38:15 2013
@@ -13456,7 +13456,7 @@ svn_wc__db_temp_wcroot_tempdir(const cha
wcroot->abspath,
svn_wc_get_adm_dir(scratch_pool),
WCROOT_TEMPDIR_RELPATH,
- (char *)NULL);
+ SVN_VA_NULL);
return SVN_NO_ERROR;
}
Modified: subversion/trunk/subversion/libsvn_wc/wc_db_pristine.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db_pristine.c?rev=1536307&r1=1536306&r2=1536307&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_pristine.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_pristine.c Mon Oct 28 10:38:15 2013
@@ -67,7 +67,7 @@ get_pristine_fname(const char **pristine
wcroot_abspath,
svn_wc_get_adm_dir(scratch_pool),
PRISTINE_STORAGE_RELPATH,
- (char *)NULL);
+ SVN_VA_NULL);
/* We should have a valid checksum and (thus) a valid digest. */
SVN_ERR_ASSERT(hexdigest != NULL);
@@ -78,14 +78,14 @@ get_pristine_fname(const char **pristine
subdir[2] = '\0';
hexdigest = apr_pstrcat(scratch_pool, hexdigest, PRISTINE_STORAGE_EXT,
- (char *)NULL);
+ SVN_VA_NULL);
/* The file is located at DIR/.svn/pristine/XX/XXYYZZ...svn-base */
*pristine_abspath = svn_dirent_join_many(result_pool,
base_dir_abspath,
subdir,
hexdigest,
- (char *)NULL);
+ SVN_VA_NULL);
return SVN_NO_ERROR;
}
@@ -253,7 +253,7 @@ pristine_get_tempdir(svn_wc__db_wcroot_t
{
return svn_dirent_join_many(result_pool, wcroot->abspath,
svn_wc_get_adm_dir(scratch_pool),
- PRISTINE_TEMPDIR_RELPATH, (char *)NULL);
+ PRISTINE_TEMPDIR_RELPATH, SVN_VA_NULL);
}
svn_error_t *
Modified: subversion/trunk/subversion/mod_authz_svn/mod_authz_svn.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_authz_svn/mod_authz_svn.c?rev=1536307&r1=1536306&r2=1536307&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_authz_svn/mod_authz_svn.c (original)
+++ subversion/trunk/subversion/mod_authz_svn/mod_authz_svn.c Mon Oct 28 10:38:15 2013
@@ -363,7 +363,7 @@ get_access_conf(request_rec *r, authz_sv
{
access_file = svn_dirent_join_many(scratch_pool, repos_path, "conf",
conf->repo_relative_access_file,
- (char *)NULL);
+ SVN_VA_NULL);
}
}
else
@@ -404,7 +404,7 @@ get_access_conf(request_rec *r, authz_sv
}
cache_key = apr_pstrcat(scratch_pool, "mod_authz_svn:",
- access_file, groups_file, (char *)NULL);
+ access_file, groups_file, SVN_VA_NULL);
apr_pool_userdata_get(&user_data, cache_key, r->connection->pool);
access_conf = user_data;
if (access_conf == NULL)
@@ -572,7 +572,7 @@ req_check_access(request_rec *r,
repos_path = svn_fspath__canonicalize(repos_path, r->pool);
*repos_path_ref = apr_pstrcat(r->pool, repos_name, ":", repos_path,
- (char *)NULL);
+ SVN_VA_NULL);
if (r->method_number == M_MOVE || r->method_number == M_COPY)
{
@@ -620,7 +620,7 @@ req_check_access(request_rec *r,
dest_repos_path = svn_fspath__canonicalize(dest_repos_path, r->pool);
*dest_repos_path_ref = apr_pstrcat(r->pool, dest_repos_name, ":",
- dest_repos_path, (char *)NULL);
+ dest_repos_path, SVN_VA_NULL);
}
/* Retrieve/cache authorization file */
Modified: subversion/trunk/subversion/mod_dav_svn/authz.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/authz.c?rev=1536307&r1=1536306&r2=1536307&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/authz.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/authz.c Mon Oct 28 10:38:15 2013
@@ -57,7 +57,7 @@ dav_svn__allow_read(request_rec *r,
/* Sometimes we get paths that do not start with '/' and
hence below uri concatenation would lead to wrong uris .*/
if (path && path[0] != '/')
- path = apr_pstrcat(pool, "/", path, (char *)NULL);
+ path = apr_pstrcat(pool, "/", path, SVN_VA_NULL);
/* If bypass is specified and authz has exported the provider.
Otherwise, we fall through to the full version. This should be
Modified: subversion/trunk/subversion/mod_dav_svn/lock.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/lock.c?rev=1536307&r1=1536306&r2=1536307&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/lock.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/lock.c Mon Oct 28 10:38:15 2013
@@ -92,7 +92,7 @@ svn_lock_to_dav_lock(dav_lock **dlock,
"<D:owner xmlns:D=\"DAV:\">",
apr_xml_quote_string(pool,
slock->comment, 1),
- "</D:owner>", (char *)NULL);
+ "</D:owner>", SVN_VA_NULL);
}
else
{
@@ -134,7 +134,7 @@ unescape_xml(const char **output,
apr_xml_doc *xml_doc;
apr_status_t apr_err;
const char *xml_input = apr_pstrcat
- (pool, "<?xml version=\"1.0\" encoding=\"utf-8\"?>", input, (char *)NULL);
+ (pool, "<?xml version=\"1.0\" encoding=\"utf-8\"?>", input, SVN_VA_NULL);
apr_err = apr_xml_parser_feed(xml_parser, xml_input, strlen(xml_input));
if (!apr_err)
Modified: subversion/trunk/subversion/mod_dav_svn/mirror.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/mirror.c?rev=1536307&r1=1536306&r2=1536307&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/mirror.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/mirror.c Mon Oct 28 10:38:15 2013
@@ -56,7 +56,7 @@ static int proxy_request_fixup(request_r
r->filename = (char *) svn_path_uri_encode(apr_pstrcat(r->pool, "proxy:",
master_uri,
uri_segment,
- (char *)NULL),
+ SVN_VA_NULL),
r->pool);
r->handler = "proxy-server";
@@ -102,11 +102,11 @@ int dav_svn__proxy_request_fixup(request
r->method_number == M_GET) {
if ((seg = ap_strstr(r->uri, root_dir))) {
if (ap_strstr_c(seg, apr_pstrcat(r->pool, special_uri,
- "/wrk/", (char *)NULL))
+ "/wrk/", SVN_VA_NULL))
|| ap_strstr_c(seg, apr_pstrcat(r->pool, special_uri,
- "/txn/", (char *)NULL))
+ "/txn/", SVN_VA_NULL))
|| ap_strstr_c(seg, apr_pstrcat(r->pool, special_uri,
- "/txr/", (char *)NULL))) {
+ "/txr/", SVN_VA_NULL))) {
int rv;
seg += strlen(root_dir);
rv = proxy_request_fixup(r, master_uri, seg);
@@ -259,7 +259,7 @@ apr_status_t dav_svn__location_header_fi
new_uri = ap_construct_url(r->pool,
apr_pstrcat(r->pool,
dav_svn__get_root_dir(r), "/",
- start_foo, (char *)NULL),
+ start_foo, SVN_VA_NULL),
r);
apr_table_set(r->headers_out, "Location", new_uri);
}
Modified: subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c?rev=1536307&r1=1536306&r2=1536307&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c Mon Oct 28 10:38:15 2013
@@ -746,7 +746,7 @@ const char *
dav_svn__get_me_resource_uri(request_rec *r)
{
return apr_pstrcat(r->pool, dav_svn__get_special_uri(r), "/me",
- (char *)NULL);
+ SVN_VA_NULL);
}
@@ -754,7 +754,7 @@ const char *
dav_svn__get_rev_stub(request_rec *r)
{
return apr_pstrcat(r->pool, dav_svn__get_special_uri(r), "/rev",
- (char *)NULL);
+ SVN_VA_NULL);
}
@@ -762,7 +762,7 @@ const char *
dav_svn__get_rev_root_stub(request_rec *r)
{
return apr_pstrcat(r->pool, dav_svn__get_special_uri(r), "/rvr",
- (char *)NULL);
+ SVN_VA_NULL);
}
@@ -770,14 +770,14 @@ const char *
dav_svn__get_txn_stub(request_rec *r)
{
return apr_pstrcat(r->pool, dav_svn__get_special_uri(r), "/txn",
- (char *)NULL);
+ SVN_VA_NULL);
}
const char *
dav_svn__get_txn_root_stub(request_rec *r)
{
- return apr_pstrcat(r->pool, dav_svn__get_special_uri(r), "/txr", (char *)NULL);
+ return apr_pstrcat(r->pool, dav_svn__get_special_uri(r), "/txr", SVN_VA_NULL);
}
@@ -785,7 +785,7 @@ const char *
dav_svn__get_vtxn_stub(request_rec *r)
{
return apr_pstrcat(r->pool, dav_svn__get_special_uri(r), "/vtxn",
- (char *)NULL);
+ SVN_VA_NULL);
}
@@ -793,7 +793,7 @@ const char *
dav_svn__get_vtxn_root_stub(request_rec *r)
{
return apr_pstrcat(r->pool, dav_svn__get_special_uri(r), "/vtxr",
- (char *)NULL);
+ SVN_VA_NULL);
}
Modified: subversion/trunk/subversion/mod_dav_svn/reports/replay.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/reports/replay.c?rev=1536307&r1=1536306&r2=1536307&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/reports/replay.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/reports/replay.c Mon Oct 28 10:38:15 2013
@@ -406,7 +406,7 @@ malformed_element_error(const char *tagn
"The request's '", tagname,
"' element is malformed; there "
"is a problem with the client.",
- (char *)NULL),
+ SVN_VA_NULL),
SVN_DAV_ERROR_NAMESPACE, SVN_DAV_ERROR_TAG);
}
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=1536307&r1=1536306&r2=1536307&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/reports/update.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/reports/update.c Mon Oct 28 10:38:15 2013
@@ -913,7 +913,7 @@ malformed_element_error(const char *tagn
const char *errstr = apr_pstrcat(pool, "The request's '", tagname,
"' element is malformed; there "
"is a problem with the client.",
- (char *)NULL);
+ SVN_VA_NULL);
return dav_svn__new_error_tag(pool, HTTP_BAD_REQUEST, 0, errstr,
SVN_DAV_ERROR_NAMESPACE, SVN_DAV_ERROR_TAG);
}
Modified: subversion/trunk/subversion/mod_dav_svn/repos.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/repos.c?rev=1536307&r1=1536306&r2=1536307&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/repos.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/repos.c Mon Oct 28 10:38:15 2013
@@ -1154,7 +1154,7 @@ create_private_resource(const dav_resour
if (base->info->repos->root_path[1])
comb->res.uri = apr_pstrcat(base->pool, base->info->repos->root_path,
- path->data, (char *)NULL);
+ path->data, SVN_VA_NULL);
else
comb->res.uri = path->data;
comb->res.info = &comb->priv;
@@ -1516,7 +1516,7 @@ get_parentpath_resource(request_rec *r,
if (r->uri[len-1] != '/')
{
new_uri = apr_pstrcat(r->pool, ap_escape_uri(r->pool, r->uri),
- "/", (char *)NULL);
+ "/", SVN_VA_NULL);
apr_table_setn(r->headers_out, "Location",
ap_construct_url(r->pool, new_uri, r));
return dav_svn__new_error(r->pool, HTTP_MOVED_PERMANENTLY, 0,
@@ -2159,7 +2159,7 @@ get_resource(request_rec *r,
}
/* Retrieve/cache open repository */
- repos_key = apr_pstrcat(r->pool, "mod_dav_svn:", fs_path, (char *)NULL);
+ repos_key = apr_pstrcat(r->pool, "mod_dav_svn:", fs_path, SVN_VA_NULL);
apr_pool_userdata_get(&userdata, repos_key, r->connection->pool);
repos->repos = userdata;
if (repos->repos == NULL)
@@ -2365,7 +2365,7 @@ get_resource(request_rec *r,
"/",
r->args ? "?" : "",
r->args ? r->args : "",
- (char *)NULL);
+ SVN_VA_NULL);
apr_table_setn(r->headers_out, "Location",
ap_construct_url(r->pool, new_path, r));
return dav_svn__new_error(r->pool, HTTP_MOVED_PERMANENTLY, 0,
@@ -3366,7 +3366,7 @@ deliver(const dav_resource *resource, ap
/* ### The xml output doesn't like to see a trailing slash on
### the visible portion, so avoid that. */
if (is_dir)
- href = apr_pstrcat(entry_pool, href, "/", (char *)NULL);
+ href = apr_pstrcat(entry_pool, href, "/", SVN_VA_NULL);
if (gen_html)
name = href;
@@ -3618,11 +3618,11 @@ deliver(const dav_resource *resource, ap
resource->info->repos->base_url,
ap_escape_uri(resource->pool,
resource->info->r->uri),
- (char *)NULL);
+ SVN_VA_NULL);
str_root = apr_pstrcat(resource->pool,
resource->info->repos->base_url,
resource->info->repos->root_path,
- (char *)NULL);
+ SVN_VA_NULL);
serr = svn_subst_build_keywords3(&kw, keywords->data,
str_cmt_rev, str_uri, str_root,
@@ -4160,7 +4160,7 @@ do_walk(walker_ctx_t *ctx, int depth)
apr_pstrmemdup(iterpool,
ctx->repos_path->data,
ctx->repos_path->len),
- key, (char *)NULL);
+ key, SVN_VA_NULL);
if (! dav_svn__allow_read(ctx->info.r, ctx->info.repos,
repos_relpath, ctx->info.root.rev,
iterpool))
@@ -4321,7 +4321,7 @@ dav_svn__create_working_resource(dav_res
if (base->info->repos->root_path[1])
res->uri = apr_pstrcat(base->pool, base->info->repos->root_path,
- path, (char *)NULL);
+ path, SVN_VA_NULL);
else
res->uri = path;
res->hooks = &dav_svn__hooks_repository;
Modified: subversion/trunk/subversion/mod_dav_svn/version.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/version.c?rev=1536307&r1=1536306&r2=1536307&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/version.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/version.c Mon Oct 28 10:38:15 2013
@@ -298,25 +298,25 @@ get_option(const dav_resource *resource,
apr_table_set(r->headers_out, SVN_DAV_ROOT_URI_HEADER, repos_root_uri);
apr_table_set(r->headers_out, SVN_DAV_ME_RESOURCE_HEADER,
apr_pstrcat(resource->pool, repos_root_uri, "/",
- dav_svn__get_me_resource_uri(r), (char *)NULL));
+ dav_svn__get_me_resource_uri(r), SVN_VA_NULL));
apr_table_set(r->headers_out, SVN_DAV_REV_ROOT_STUB_HEADER,
apr_pstrcat(resource->pool, repos_root_uri, "/",
- dav_svn__get_rev_root_stub(r), (char *)NULL));
+ dav_svn__get_rev_root_stub(r), SVN_VA_NULL));
apr_table_set(r->headers_out, SVN_DAV_REV_STUB_HEADER,
apr_pstrcat(resource->pool, repos_root_uri, "/",
- dav_svn__get_rev_stub(r), (char *)NULL));
+ dav_svn__get_rev_stub(r), SVN_VA_NULL));
apr_table_set(r->headers_out, SVN_DAV_TXN_ROOT_STUB_HEADER,
apr_pstrcat(resource->pool, repos_root_uri, "/",
- dav_svn__get_txn_root_stub(r), (char *)NULL));
+ dav_svn__get_txn_root_stub(r), SVN_VA_NULL));
apr_table_set(r->headers_out, SVN_DAV_TXN_STUB_HEADER,
apr_pstrcat(resource->pool, repos_root_uri, "/",
- dav_svn__get_txn_stub(r), (char *)NULL));
+ dav_svn__get_txn_stub(r), SVN_VA_NULL));
apr_table_set(r->headers_out, SVN_DAV_VTXN_ROOT_STUB_HEADER,
apr_pstrcat(resource->pool, repos_root_uri, "/",
- dav_svn__get_vtxn_root_stub(r), (char *)NULL));
+ dav_svn__get_vtxn_root_stub(r), SVN_VA_NULL));
apr_table_set(r->headers_out, SVN_DAV_VTXN_STUB_HEADER,
apr_pstrcat(resource->pool, repos_root_uri, "/",
- dav_svn__get_vtxn_stub(r), (char *)NULL));
+ dav_svn__get_vtxn_stub(r), SVN_VA_NULL));
apr_table_set(r->headers_out, SVN_DAV_ALLOW_BULK_UPDATES,
bulk_upd_conf == CONF_BULKUPD_ON ? "On" :
bulk_upd_conf == CONF_BULKUPD_OFF ? "Off" : "Prefer");
Modified: subversion/trunk/subversion/svn/conflict-callbacks.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?rev=1536307&r1=1536306&r2=1536307&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Mon Oct 28 10:38:15 2013
@@ -599,21 +599,21 @@ prompt_string(const resolver_option_t *o
}
if (! first)
- result = apr_pstrcat(pool, result, ",", (char *)NULL);
+ result = apr_pstrcat(pool, result, ",", SVN_VA_NULL);
s = apr_psprintf(pool, _(" (%s) %s"),
opt->code, _(opt->short_desc));
slen = svn_utf_cstring_utf8_width(s);
/* Break the line if adding the next option would make it too long */
if (this_line_len + slen > MAX_PROMPT_WIDTH)
{
- result = apr_pstrcat(pool, result, line_sep, (char *)NULL);
+ result = apr_pstrcat(pool, result, line_sep, SVN_VA_NULL);
this_line_len = left_margin;
}
- result = apr_pstrcat(pool, result, s, (char *)NULL);
+ result = apr_pstrcat(pool, result, s, SVN_VA_NULL);
this_line_len += slen;
first = FALSE;
}
- return apr_pstrcat(pool, result, ": ", (char *)NULL);
+ return apr_pstrcat(pool, result, ": ", SVN_VA_NULL);
}
/* Return a help string listing the OPTIONS. */
@@ -636,13 +636,13 @@ help_string(const resolver_option_t *opt
}
else
{
- result = apr_pstrcat(pool, result, "\n", (char *)NULL);
+ result = apr_pstrcat(pool, result, "\n", SVN_VA_NULL);
}
}
result = apr_pstrcat(pool, result,
_("Words in square brackets are the corresponding "
"--accept option arguments.\n"),
- (char *)NULL);
+ SVN_VA_NULL);
return result;
}
Modified: subversion/trunk/subversion/svn/info-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/info-cmd.c?rev=1536307&r1=1536306&r2=1536307&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/info-cmd.c (original)
+++ subversion/trunk/subversion/svn/info-cmd.c Mon Oct 28 10:38:15 2013
@@ -115,7 +115,7 @@ print_info_xml(void *baton,
info->repos_root_URL,
info->URL, pool),
pool),
- (char *)NULL));
+ SVN_VA_NULL));
}
if (info->repos_root_URL || info->repos_UUID)
Modified: subversion/trunk/subversion/svn/notify.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/notify.c?rev=1536307&r1=1536306&r2=1536307&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/notify.c (original)
+++ subversion/trunk/subversion/svn/notify.c Mon Oct 28 10:38:15 2013
@@ -485,7 +485,7 @@ notify(void *baton, const svn_wc_notify_
apr_pstrcat(pool, s,
"%"APR_UINT64_T_FMT
" and fuzz %lu (%s)\n",
- (char *)NULL),
+ SVN_VA_NULL),
n->hunk_original_start,
n->hunk_original_length,
n->hunk_modified_start,
@@ -502,7 +502,7 @@ notify(void *baton, const svn_wc_notify_
apr_pstrcat(pool, s,
"%"APR_UINT64_T_FMT
" and fuzz %lu\n",
- (char *)NULL),
+ SVN_VA_NULL),
n->hunk_original_start,
n->hunk_original_length,
n->hunk_modified_start,
@@ -523,7 +523,7 @@ notify(void *baton, const svn_wc_notify_
err = svn_cmdline_printf(pool,
apr_pstrcat(pool, s,
"%"APR_UINT64_T_FMT" (%s)\n",
- (char *)NULL),
+ SVN_VA_NULL),
n->hunk_original_start,
n->hunk_original_length,
n->hunk_modified_start,
@@ -537,7 +537,7 @@ notify(void *baton, const svn_wc_notify_
err = svn_cmdline_printf(pool,
apr_pstrcat(pool, s,
"%"APR_UINT64_T_FMT"\n",
- (char *)NULL),
+ SVN_VA_NULL),
n->hunk_original_start,
n->hunk_original_length,
n->hunk_modified_start,
Modified: subversion/trunk/subversion/svn/status.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/status.c?rev=1536307&r1=1536306&r2=1536307&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/status.c (original)
+++ subversion/trunk/subversion/svn/status.c Mon Oct 28 10:38:15 2013
@@ -319,7 +319,7 @@ print_status(const char *target_abspath,
apr_psprintf(pool,
_("swapped places with %s"),
relpath),
- (char *)NULL);
+ SVN_VA_NULL);
}
else if (status->moved_from_abspath || status->moved_to_abspath)
{
@@ -334,7 +334,7 @@ print_status(const char *target_abspath,
moved_from_line = apr_pstrcat(pool, "\n > ",
apr_psprintf(pool, _("moved from %s"),
relpath),
- (char *)NULL);
+ SVN_VA_NULL);
}
if (status->moved_to_abspath)
@@ -346,7 +346,7 @@ print_status(const char *target_abspath,
moved_to_line = apr_pstrcat(pool, "\n > ",
apr_psprintf(pool, _("moved to %s"),
relpath),
- (char *)NULL);
+ SVN_VA_NULL);
}
}
Modified: subversion/trunk/subversion/svnauth/svnauth.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnauth/svnauth.c?rev=1536307&r1=1536306&r2=1536307&view=diff
==============================================================================
--- subversion/trunk/subversion/svnauth/svnauth.c (original)
+++ subversion/trunk/subversion/svnauth/svnauth.c Mon Oct 28 10:38:15 2013
@@ -213,16 +213,16 @@ subcommand_help(apr_getopt_t *os, void *
footer, svn_dirent_local_style(config_path, pool));
#endif
#ifdef SVN_HAVE_GNOME_KEYRING
- footer = apr_pstrcat(pool, footer, " Gnome Keyring\n", (char *)NULL);
+ footer = apr_pstrcat(pool, footer, " Gnome Keyring\n", SVN_VA_NULL);
#endif
#ifdef SVN_HAVE_GPG_AGENT
- footer = apr_pstrcat(pool, footer, " GPG-Agent\n", (char *)NULL);
+ footer = apr_pstrcat(pool, footer, " GPG-Agent\n", SVN_VA_NULL);
#endif
#ifdef SVN_HAVE_KEYCHAIN_SERVICES
- footer = apr_pstrcat(pool, footer, " Mac OS X Keychain\n", (char *)NULL);
+ footer = apr_pstrcat(pool, footer, " Mac OS X Keychain\n", SVN_VA_NULL);
#endif
#ifdef SVN_HAVE_KWALLET
- footer = apr_pstrcat(pool, footer, " KWallet (KDE)\n", (char *)NULL);
+ footer = apr_pstrcat(pool, footer, " KWallet (KDE)\n", SVN_VA_NULL);
#endif
}
Modified: subversion/trunk/subversion/svndumpfilter/svndumpfilter.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svndumpfilter/svndumpfilter.c?rev=1536307&r1=1536306&r2=1536307&view=diff
==============================================================================
--- subversion/trunk/subversion/svndumpfilter/svndumpfilter.c (original)
+++ subversion/trunk/subversion/svndumpfilter/svndumpfilter.c Mon Oct 28 10:38:15 2013
@@ -550,9 +550,9 @@ new_node_record(void **node_baton,
/* Ensure that paths start with a leading '/'. */
if (node_path[0] != '/')
- node_path = apr_pstrcat(pool, "/", node_path, (char *)NULL);
+ node_path = apr_pstrcat(pool, "/", node_path, SVN_VA_NULL);
if (copyfrom_path && copyfrom_path[0] != '/')
- copyfrom_path = apr_pstrcat(pool, "/", copyfrom_path, (char *)NULL);
+ copyfrom_path = apr_pstrcat(pool, "/", copyfrom_path, SVN_VA_NULL);
nb->do_skip = skip_path(node_path, pb->prefixes,
pb->do_exclude, pb->glob);
@@ -1554,7 +1554,7 @@ main(int argc, const char *argv[])
SVN_INT_ERR(svn_utf_cstring_to_utf8(&prefix, os->argv[i], pool));
prefix = svn_relpath__internal_style(prefix, pool);
if (prefix[0] != '/')
- prefix = apr_pstrcat(pool, "/", prefix, (char *)NULL);
+ prefix = apr_pstrcat(pool, "/", prefix, SVN_VA_NULL);
APR_ARRAY_PUSH(opt_state.prefixes, const char *) = prefix;
}
@@ -1585,7 +1585,7 @@ main(int argc, const char *argv[])
{
const char *prefix = APR_ARRAY_IDX(targets, i, const char *);
if (prefix[0] != '/')
- prefix = apr_pstrcat(pool, "/", prefix, (char *)NULL);
+ prefix = apr_pstrcat(pool, "/", prefix, SVN_VA_NULL);
APR_ARRAY_PUSH(opt_state.prefixes, const char *) = prefix;
}
}
Modified: subversion/trunk/subversion/svnmucc/svnmucc.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnmucc/svnmucc.c?rev=1536307&r1=1536306&r2=1536307&view=diff
==============================================================================
--- subversion/trunk/subversion/svnmucc/svnmucc.c (original)
+++ subversion/trunk/subversion/svnmucc/svnmucc.c Mon Oct 28 10:38:15 2013
@@ -1419,7 +1419,7 @@ main(int argc, const char **argv)
/* ### These relpaths are already URI-encoded. */
url = apr_pstrcat(pool, root_url, "/",
svn_relpath_canonicalize(url, pool),
- (char *)NULL);
+ SVN_VA_NULL);
}
url = sanitize_url(url, pool);
action->path[j] = url;
Modified: subversion/trunk/subversion/tests/cmdline/entries-dump.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/entries-dump.c?rev=1536307&r1=1536306&r2=1536307&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/entries-dump.c (original)
+++ subversion/trunk/subversion/tests/cmdline/entries-dump.c Mon Oct 28 10:38:15 2013
@@ -105,7 +105,7 @@ entries_dump(const char *dir_path, svn_w
SVN_ERR(svn_wc__read_entries_old(&entries, dir_abspath, pool, pool));
lockfile_path = svn_dirent_join_many(pool, dir_path,
svn_wc_get_adm_dir(pool),
- "lock", (char *)NULL);
+ "lock", SVN_VA_NULL);
SVN_ERR(svn_io_check_path(lockfile_path, &kind, pool));
locked = (kind == svn_node_file);
}
Modified: subversion/trunk/subversion/tests/libsvn_client/client-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_client/client-test.c?rev=1536307&r1=1536306&r2=1536307&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_client/client-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_client/client-test.c Mon Oct 28 10:38:15 2013
@@ -391,7 +391,7 @@ test_patch(const svn_test_opts_t *opts,
/* Create the patch file. */
patch_file_path = svn_dirent_join_many(pool, cwd,
"test-patch", "test-patch.diff",
- (char *)NULL);
+ SVN_VA_NULL);
SVN_ERR(svn_io_file_open(&patch_file, patch_file_path,
(APR_READ | APR_WRITE | APR_CREATE | APR_TRUNCATE),
APR_OS_DEFAULT, pool));
Modified: subversion/trunk/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c?rev=1536307&r1=1536306&r2=1536307&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c Mon Oct 28 10:38:15 2013
@@ -304,7 +304,7 @@ pack_filesystem(const svn_test_opts_t *o
{
path = svn_dirent_join_many(pool, REPO_NAME, "revs",
apr_psprintf(pool, "%d.pack", i / SHARD_SIZE),
- "pack", (char *)NULL);
+ "pack", SVN_VA_NULL);
/* These files should exist. */
SVN_ERR(svn_io_check_path(path, &kind, pool));
@@ -314,7 +314,7 @@ pack_filesystem(const svn_test_opts_t *o
path = svn_dirent_join_many(pool, REPO_NAME, "revs",
apr_psprintf(pool, "%d.pack", i / SHARD_SIZE),
- "manifest", (char *)NULL);
+ "manifest", SVN_VA_NULL);
SVN_ERR(svn_io_check_path(path, &kind, pool));
if (kind != svn_node_file)
return svn_error_createf(SVN_ERR_FS_GENERAL, NULL,
@@ -324,7 +324,7 @@ pack_filesystem(const svn_test_opts_t *o
/* This directory should not exist. */
path = svn_dirent_join_many(pool, REPO_NAME, "revs",
apr_psprintf(pool, "%d", i / SHARD_SIZE),
- (char *)NULL);
+ SVN_VA_NULL);
SVN_ERR(svn_io_check_path(path, &kind, pool));
if (kind != svn_node_none)
return svn_error_createf(SVN_ERR_FS_GENERAL, NULL,
@@ -346,7 +346,7 @@ pack_filesystem(const svn_test_opts_t *o
/* Finally, make sure the final revision directory does exist. */
path = svn_dirent_join_many(pool, REPO_NAME, "revs",
apr_psprintf(pool, "%d", (i / SHARD_SIZE) + 1),
- (char *)NULL);
+ SVN_VA_NULL);
SVN_ERR(svn_io_check_path(path, &kind, pool));
if (kind != svn_node_none)
return svn_error_createf(SVN_ERR_FS_GENERAL, NULL,
@@ -378,7 +378,7 @@ pack_even_filesystem(const svn_test_opts
SVN_ERR(create_packed_filesystem(REPO_NAME, opts, MAX_REV, SHARD_SIZE,
pool));
- path = svn_dirent_join_many(pool, REPO_NAME, "revs", "2.pack", (char *)NULL);
+ path = svn_dirent_join_many(pool, REPO_NAME, "revs", "2.pack", SVN_VA_NULL);
SVN_ERR(svn_io_check_path(path, &kind, pool));
if (kind != svn_node_dir)
return svn_error_createf(SVN_ERR_FS_GENERAL, NULL,
@@ -692,7 +692,7 @@ recover_fully_packed(const svn_test_opts
apr_psprintf(pool, "%ld/%ld",
after_rev / SHARD_SIZE,
after_rev),
- (char *)NULL),
+ SVN_VA_NULL),
FALSE, pool));
err = svn_fs_recover(REPO_NAME, NULL, NULL, pool);
if (! err)
Modified: subversion/trunk/subversion/tests/libsvn_fs_x/fs-x-pack-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_fs_x/fs-x-pack-test.c?rev=1536307&r1=1536306&r2=1536307&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_fs_x/fs-x-pack-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_fs_x/fs-x-pack-test.c Mon Oct 28 10:38:15 2013
@@ -288,7 +288,7 @@ pack_filesystem(const svn_test_opts_t *o
{
path = svn_dirent_join_many(pool, REPO_NAME, "revs",
apr_psprintf(pool, "%d.pack", i / SHARD_SIZE),
- "pack", (char *)NULL);
+ "pack", SVN_VA_NULL);
/* These files should exist. */
SVN_ERR(svn_io_check_path(path, &kind, pool));
@@ -300,7 +300,7 @@ pack_filesystem(const svn_test_opts_t *o
{
path = svn_dirent_join_many(pool, REPO_NAME, "revs",
apr_psprintf(pool, "%d.pack", i / SHARD_SIZE),
- "manifest", (char *)NULL);
+ "manifest", SVN_VA_NULL);
SVN_ERR(svn_io_check_path(path, &kind, pool));
if (kind != svn_node_file)
return svn_error_createf(SVN_ERR_FS_GENERAL, NULL,
@@ -311,7 +311,7 @@ pack_filesystem(const svn_test_opts_t *o
{
path = svn_dirent_join_many(pool, REPO_NAME, "revs",
apr_psprintf(pool, "%d.pack", i / SHARD_SIZE),
- "pack.l2p", (char *)NULL);
+ "pack.l2p", SVN_VA_NULL);
SVN_ERR(svn_io_check_path(path, &kind, pool));
if (kind != svn_node_file)
return svn_error_createf(SVN_ERR_FS_GENERAL, NULL,
@@ -320,7 +320,7 @@ pack_filesystem(const svn_test_opts_t *o
path = svn_dirent_join_many(pool, REPO_NAME, "revs",
apr_psprintf(pool, "%d.pack", i / SHARD_SIZE),
- "pack.p2l", (char *)NULL);
+ "pack.p2l", SVN_VA_NULL);
SVN_ERR(svn_io_check_path(path, &kind, pool));
if (kind != svn_node_file)
return svn_error_createf(SVN_ERR_FS_GENERAL, NULL,
@@ -331,7 +331,7 @@ pack_filesystem(const svn_test_opts_t *o
/* This directory should not exist. */
path = svn_dirent_join_many(pool, REPO_NAME, "revs",
apr_psprintf(pool, "%d", i / SHARD_SIZE),
- (char *)NULL);
+ SVN_VA_NULL);
SVN_ERR(svn_io_check_path(path, &kind, pool));
if (kind != svn_node_none)
return svn_error_createf(SVN_ERR_FS_GENERAL, NULL,
@@ -353,7 +353,7 @@ pack_filesystem(const svn_test_opts_t *o
/* Finally, make sure the final revision directory does exist. */
path = svn_dirent_join_many(pool, REPO_NAME, "revs",
apr_psprintf(pool, "%d", (i / SHARD_SIZE) + 1),
- (char *)NULL);
+ SVN_VA_NULL);
SVN_ERR(svn_io_check_path(path, &kind, pool));
if (kind != svn_node_none)
return svn_error_createf(SVN_ERR_FS_GENERAL, NULL,
@@ -385,7 +385,7 @@ pack_even_filesystem(const svn_test_opts
SVN_ERR(create_packed_filesystem(REPO_NAME, opts, MAX_REV, SHARD_SIZE,
pool));
- path = svn_dirent_join_many(pool, REPO_NAME, "revs", "2.pack", (char *)NULL);
+ path = svn_dirent_join_many(pool, REPO_NAME, "revs", "2.pack", SVN_VA_NULL);
SVN_ERR(svn_io_check_path(path, &kind, pool));
if (kind != svn_node_dir)
return svn_error_createf(SVN_ERR_FS_GENERAL, NULL,
@@ -724,7 +724,7 @@ recover_fully_packed(const svn_test_opts
apr_psprintf(pool, "%ld/%ld",
after_rev / SHARD_SIZE,
after_rev),
- (char *)NULL),
+ SVN_VA_NULL),
FALSE, pool));
err = svn_fs_recover(REPO_NAME, NULL, NULL, pool);
if (! err)
Modified: subversion/trunk/subversion/tests/libsvn_ra_local/ra-local-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_ra_local/ra-local-test.c?rev=1536307&r1=1536306&r2=1536307&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_ra_local/ra-local-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_ra_local/ra-local-test.c Mon Oct 28 10:38:15 2013
@@ -220,7 +220,7 @@ check_split_url(const char *repos_path,
SVN_ERR(svn_uri_get_file_url_from_dirent(&root_url, repos_path, pool));
if (in_repos_path)
- url = apr_pstrcat(pool, root_url, in_repos_path, (char *)NULL);
+ url = apr_pstrcat(pool, root_url, in_repos_path, SVN_VA_NULL);
else
url = root_url;
Modified: subversion/trunk/subversion/tests/libsvn_repos/repos-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_repos/repos-test.c?rev=1536307&r1=1536306&r2=1536307&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_repos/repos-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_repos/repos-test.c Mon Oct 28 10:38:15 2013
@@ -485,19 +485,19 @@ print_chrevs(const apr_array_header_t *r
outstr = apr_pstrcat(pool,
outstr,
apr_psprintf(pool, "%ld ", rev),
- (char *)NULL);
+ SVN_VA_NULL);
}
}
- outstr = apr_pstrcat(pool, outstr, "} Expected: { ", (char *)NULL);
+ outstr = apr_pstrcat(pool, outstr, "} Expected: { ", SVN_VA_NULL);
for (i = 0; i < num_revs_expected; i++)
{
outstr = apr_pstrcat(pool,
outstr,
apr_psprintf(pool, "%ld ",
revs_expected[i]),
- (char *)NULL);
+ SVN_VA_NULL);
}
- return apr_pstrcat(pool, outstr, "}", (char *)NULL);
+ return apr_pstrcat(pool, outstr, "}", SVN_VA_NULL);
}
@@ -1455,8 +1455,8 @@ in_repo_authz(const svn_test_opts_t *opt
repos_root = svn_repos_path(repos, pool);
SVN_ERR(svn_uri_get_file_url_from_dirent(&repos_url, repos_root, pool));
- authz_url = apr_pstrcat(pool, repos_url, "/authz", (char *)NULL);
- noent_authz_url = apr_pstrcat(pool, repos_url, "/A/authz", (char *)NULL);
+ authz_url = apr_pstrcat(pool, repos_url, "/authz", SVN_VA_NULL);
+ noent_authz_url = apr_pstrcat(pool, repos_url, "/A/authz", SVN_VA_NULL);
/* absolute file URL. */
SVN_ERR(svn_repos_authz_read2(&authz_cfg, authz_url, NULL, TRUE, pool));
@@ -1594,11 +1594,11 @@ in_repo_groups_authz(const svn_test_opts
/* Calculate URLs */
repos_root = svn_repos_path(repos, pool);
SVN_ERR(svn_uri_get_file_url_from_dirent(&repos_url, repos_root, pool));
- authz_url = apr_pstrcat(pool, repos_url, "/authz", (char *)NULL);
- empty_authz_url = apr_pstrcat(pool, repos_url, "/empty-authz", (char *)NULL);
- noent_authz_url = apr_pstrcat(pool, repos_url, "/A/authz", (char *)NULL);
- groups_url = apr_pstrcat(pool, repos_url, "/groups", (char *)NULL);
- noent_groups_url = apr_pstrcat(pool, repos_url, "/A/groups", (char *)NULL);
+ authz_url = apr_pstrcat(pool, repos_url, "/authz", SVN_VA_NULL);
+ empty_authz_url = apr_pstrcat(pool, repos_url, "/empty-authz", SVN_VA_NULL);
+ noent_authz_url = apr_pstrcat(pool, repos_url, "/A/authz", SVN_VA_NULL);
+ groups_url = apr_pstrcat(pool, repos_url, "/groups", SVN_VA_NULL);
+ noent_groups_url = apr_pstrcat(pool, repos_url, "/A/groups", SVN_VA_NULL);
/* absolute file URLs. */
Modified: subversion/trunk/subversion/tests/libsvn_subr/config-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/config-test.c?rev=1536307&r1=1536306&r2=1536307&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/config-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/config-test.c Mon Oct 28 10:38:15 2013
@@ -109,7 +109,7 @@ test_text_retrieval(apr_pool_t *pool)
if (!srcdir)
SVN_ERR(init_params(pool));
- cfg_file = apr_pstrcat(pool, srcdir, "/", "config-test.cfg", (char *)NULL);
+ cfg_file = apr_pstrcat(pool, srcdir, "/", "config-test.cfg", SVN_VA_NULL);
SVN_ERR(svn_config_read3(&cfg, cfg_file, TRUE, FALSE, FALSE, pool));
/* Test values retrieved from our ConfigParser instance against
@@ -160,7 +160,7 @@ test_boolean_retrieval(apr_pool_t *pool)
if (!srcdir)
SVN_ERR(init_params(pool));
- cfg_file = apr_pstrcat(pool, srcdir, "/", "config-test.cfg", (char *)NULL);
+ cfg_file = apr_pstrcat(pool, srcdir, "/", "config-test.cfg", SVN_VA_NULL);
SVN_ERR(svn_config_read3(&cfg, cfg_file, TRUE, FALSE, FALSE, pool));
for (i = 0; true_keys[i] != NULL; i++)
@@ -220,7 +220,7 @@ test_has_section_case_insensitive(apr_po
if (!srcdir)
SVN_ERR(init_params(pool));
- cfg_file = apr_pstrcat(pool, srcdir, "/", "config-test.cfg", (char *)NULL);
+ cfg_file = apr_pstrcat(pool, srcdir, "/", "config-test.cfg", SVN_VA_NULL);
SVN_ERR(svn_config_read3(&cfg, cfg_file, TRUE, FALSE, FALSE, pool));
if (! svn_config_has_section(cfg, "section1"))
@@ -250,7 +250,7 @@ test_has_section_case_sensitive(apr_pool
if (!srcdir)
SVN_ERR(init_params(pool));
- cfg_file = apr_pstrcat(pool, srcdir, "/", "config-test.cfg", (char *)NULL);
+ cfg_file = apr_pstrcat(pool, srcdir, "/", "config-test.cfg", SVN_VA_NULL);
SVN_ERR(svn_config_read3(&cfg, cfg_file, TRUE, TRUE, FALSE, pool));
if (! svn_config_has_section(cfg, "section1"))
@@ -293,7 +293,7 @@ test_has_option_case_sensitive(apr_pool_
if (!srcdir)
SVN_ERR(init_params(pool));
- cfg_file = apr_pstrcat(pool, srcdir, "/", "config-test.cfg", (char *)NULL);
+ cfg_file = apr_pstrcat(pool, srcdir, "/", "config-test.cfg", SVN_VA_NULL);
SVN_ERR(svn_config_read3(&cfg, cfg_file, TRUE, TRUE, TRUE, pool));
for (i = 0; i < test_data_size; ++i)
@@ -323,7 +323,7 @@ test_stream_interface(apr_pool_t *pool)
if (!srcdir)
SVN_ERR(init_params(pool));
- cfg_file = apr_pstrcat(pool, srcdir, "/", "config-test.cfg", (char *)NULL);
+ cfg_file = apr_pstrcat(pool, srcdir, "/", "config-test.cfg", SVN_VA_NULL);
SVN_ERR(svn_stream_open_readonly(&stream, cfg_file, pool, pool));
SVN_ERR(svn_config_parse(&cfg, stream, TRUE, TRUE, pool));
@@ -363,7 +363,7 @@ test_read_only_mode(apr_pool_t *pool)
if (!srcdir)
SVN_ERR(init_params(pool));
- cfg_file = apr_pstrcat(pool, srcdir, "/", "config-test.cfg", (char *)NULL);
+ cfg_file = apr_pstrcat(pool, srcdir, "/", "config-test.cfg", SVN_VA_NULL);
SVN_ERR(svn_config_read3(&cfg, cfg_file, TRUE, TRUE, FALSE, pool));
/* setting CFG to r/o mode shall toggle the r/o mode and expand values */
Modified: subversion/trunk/subversion/tests/libsvn_subr/dirent_uri-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/dirent_uri-test.c?rev=1536307&r1=1536306&r2=1536307&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/dirent_uri-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/dirent_uri-test.c Mon Oct 28 10:38:15 2013
@@ -269,7 +269,7 @@ test_dirent_join(apr_pool_t *pool)
"\"%s\". expected \"%s\"",
base, comp, result, expect);
- result = svn_dirent_join_many(pool, base, comp, (char *)NULL);
+ result = svn_dirent_join_many(pool, base, comp, SVN_VA_NULL);
if (strcmp(result, expect))
return svn_error_createf(SVN_ERR_TEST_FAILED, NULL,
"svn_dirent_join_many(\"%s\", \"%s\") returned "
@@ -1936,7 +1936,7 @@ test_dirent_get_absolute(apr_pool_t *poo
expect_abs = expect;
if (*expect == '%')
- expect_abs = apr_pstrcat(pool, curdir, expect + 1, (char *)NULL);
+ expect_abs = apr_pstrcat(pool, curdir, expect + 1, SVN_VA_NULL);
#ifdef SVN_USE_DOS_PATHS
if (*expect == '@')
expect_abs = apr_pstrcat(pool, curdironc, expect + 1, NULL);
Modified: subversion/trunk/subversion/tests/libsvn_subr/path-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/path-test.c?rev=1536307&r1=1536306&r2=1536307&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/path-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/path-test.c Mon Oct 28 10:38:15 2013
@@ -489,7 +489,7 @@ test_path_join(apr_pool_t *pool)
if (svn_path_is_url(base))
continue;
- result = svn_path_join_many(pool, base, comp, (char *)NULL);
+ result = svn_path_join_many(pool, base, comp, SVN_VA_NULL);
if (strcmp(result, expect))
return svn_error_createf(SVN_ERR_TEST_FAILED, NULL,
"svn_path_join_many(\"%s\", \"%s\") returned "
@@ -1527,7 +1527,7 @@ condense_targets_tests_helper(const char
/* Verify the common part with the expected (prefix with cwd). */
if (*exp_common == '%')
- exp_common_abs = apr_pstrcat(pool, curdir, exp_common + 1, (char *)NULL);
+ exp_common_abs = apr_pstrcat(pool, curdir, exp_common + 1, SVN_VA_NULL);
if (strcmp(common_path, exp_common_abs) != 0)
{
@@ -1544,7 +1544,7 @@ condense_targets_tests_helper(const char
{
const char * target = APR_ARRAY_IDX(condensed_targets, i, const char*);
if (token && (*token == '%'))
- token = apr_pstrcat(pool, curdir, token + 1, (char *)NULL);
+ token = apr_pstrcat(pool, curdir, token + 1, SVN_VA_NULL);
if (! token ||
(target && (strcmp(target, token) != 0)))
{
Modified: subversion/trunk/subversion/tests/libsvn_subr/translate-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/translate-test.c?rev=1536307&r1=1536306&r2=1536307&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/translate-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/translate-test.c Mon Oct 28 10:38:15 2013
@@ -325,8 +325,8 @@ substitute_and_verify(const char *test_n
apr_size_t idx = 0;
apr_size_t i;
const char *expect[(sizeof(lines) / sizeof(*lines))];
- const char *src_fname = apr_pstrcat(pool, test_name, ".src", (char *)NULL);
- const char *dst_fname = apr_pstrcat(pool, test_name, ".dst", (char *)NULL);
+ const char *src_fname = apr_pstrcat(pool, test_name, ".src", SVN_VA_NULL);
+ const char *dst_fname = apr_pstrcat(pool, test_name, ".dst", SVN_VA_NULL);
svn_string_t *val;
apr_pool_t *subpool = svn_pool_create(pool);
@@ -419,27 +419,27 @@ substitute_and_verify(const char *test_n
"Valid $LastChangedRevision: ",
rev,
" $, started unexpanded.",
- (char *)NULL);
+ SVN_VA_NULL);
expect[5 - 1] =
apr_pstrcat(pool, "Line 5: ",
"Valid $Rev: ", rev, " $, started unexpanded.",
- (char *)NULL);
+ SVN_VA_NULL);
expect[26 - 1] =
apr_pstrcat(pool, "Line 26: ",
"Emptily expanded keyword $Rev: ", rev," $.",
- (char *)NULL);
+ SVN_VA_NULL);
expect[29 - 1] =
apr_pstrcat(pool, "Line 29: ",
"Valid $LastChangedRevision: ",
rev,
" $, started expanded.",
- (char *)NULL);
+ SVN_VA_NULL);
expect[30 - 1] =
apr_pstrcat(pool, "Line 30: ",
"Valid $Rev: ",
rev,
" $, started expanded.",
- (char *)NULL);
+ SVN_VA_NULL);
}
else /* unexpand */
{
@@ -462,31 +462,31 @@ substitute_and_verify(const char *test_n
"Valid $LastChangedDate: ",
date,
" $, started unexpanded.",
- (char *)NULL);
+ SVN_VA_NULL);
expect[13 - 1] =
apr_pstrcat(pool, "Line 13: ",
"Valid $Date: ", date, " $, started unexpanded.",
- (char *)NULL);
+ SVN_VA_NULL);
expect[33 - 1] =
apr_pstrcat(pool, "Line 33: ",
"Valid $LastChangedDate: ",
date,
" $, started expanded.",
- (char *)NULL);
+ SVN_VA_NULL);
expect[34 - 1] =
apr_pstrcat(pool, "Line 34: ",
"Valid $Date: ", date, " $, started expanded.",
- (char *)NULL);
+ SVN_VA_NULL);
expect[51 - 1] =
apr_pstrcat(pool, "Line 51: ",
"same, but with embedded keyword ",
"$$$$$$$$Date: ", date, " $$$$$$$$$$.",
- (char *)NULL);
+ SVN_VA_NULL);
expect[52 - 1] =
apr_pstrcat(pool, "Line 52: ",
"same, with expanded, empty keyword ",
"$$$$$$Date: ", date, " $$$$$$.",
- (char *)NULL);
+ SVN_VA_NULL);
}
else /* unexpand */
{
@@ -511,46 +511,46 @@ substitute_and_verify(const char *test_n
"Valid $LastChangedBy: ",
author,
" $, started unexpanded.",
- (char *)NULL);
+ SVN_VA_NULL);
expect[9 - 1] =
apr_pstrcat(pool, "Line 9: ",
"Valid $Author: ", author, " $, started unexpanded.",
- (char *)NULL);
+ SVN_VA_NULL);
expect[37 - 1] =
apr_pstrcat(pool, "Line 37: ",
"Valid $LastChangedBy: ", author,
- " $, started expanded.", (char *)NULL);
+ " $, started expanded.", SVN_VA_NULL);
expect[38 - 1] =
apr_pstrcat(pool, "Line 38: ",
"Valid $Author: ", author, " $, started expanded.",
- (char *)NULL);
+ SVN_VA_NULL);
expect[46 - 1] =
apr_pstrcat(pool, "Line 46: ",
"Empty $Author: ", author, " $, started expanded.",
- (char *)NULL);
+ SVN_VA_NULL);
expect[71 - 1] =
- apr_pstrcat(pool, ".$veR$Author: ", author, " $", (char *)NULL);
+ apr_pstrcat(pool, ".$veR$Author: ", author, " $", SVN_VA_NULL);
expect[74 - 1] =
apr_pstrcat(pool, "Line 74: ",
"Valid $Author: ", author, " $, started expanded.",
- (char *)NULL);
+ SVN_VA_NULL);
expect[79 - 1] =
apr_pstrcat(pool, "Line 79: ",
"Valid $Author: ", author, " $, started expanded.",
- (char *)NULL);
+ SVN_VA_NULL);
expect[80 - 1] =
apr_pstrcat(pool, "Line 80: ",
"Valid $Author: ", author, " $, started expanded.",
- (char *)NULL);
+ SVN_VA_NULL);
expect[81 - 1] =
apr_pstrcat(pool, "Line 81: ",
"Valid $Author: ", author, " $, started expanded.",
- (char *)NULL);
+ SVN_VA_NULL);
expect[82 - 1] =
apr_pstrcat(pool, "Line 82: ",
"Valid $Author: ", author, " $, started expanded.",
- (char *)NULL);
+ SVN_VA_NULL);
}
else /* unexpand */
{
@@ -581,23 +581,23 @@ substitute_and_verify(const char *test_n
expect[16 - 1] =
apr_pstrcat(pool, "Line 16: ",
"Valid $HeadURL: ", url, " $, started unexpanded.",
- (char *)NULL);
+ SVN_VA_NULL);
expect[17 - 1] =
apr_pstrcat(pool, "Line 17: ",
"Valid $URL: ", url, " $, started unexpanded.",
- (char *)NULL);
+ SVN_VA_NULL);
expect[41 - 1] =
apr_pstrcat(pool, "Line 41: ",
"Valid $HeadURL: ", url, " $, started expanded.",
- (char *)NULL);
+ SVN_VA_NULL);
expect[42 - 1] =
apr_pstrcat(pool, "Line 42: ",
"Valid $URL: ", url, " $, started expanded.",
- (char *)NULL);
+ SVN_VA_NULL);
expect[75 - 1] =
apr_pstrcat(pool, "Line 75: ",
"Valid $URL: ", url, " $, started expanded.",
- (char *)NULL);
+ SVN_VA_NULL);
}
else /* unexpand */
{
@@ -622,14 +622,14 @@ substitute_and_verify(const char *test_n
"Two keywords back to back: "
"$Author: ", author, " $"
"$Rev: ", rev, " $.",
- (char *)NULL);
+ SVN_VA_NULL);
expect[49 - 1] =
apr_pstrcat(pool, "Line 49: ",
"One keyword, one not, back to back: "
"$Author: ", author, " $Rev$.",
- (char *)NULL);
+ SVN_VA_NULL);
expect[70 - 1] =
- apr_pstrcat(pool, "$Author: ", author, " $Rev$.", (char *)NULL);
+ apr_pstrcat(pool, "$Author: ", author, " $Rev$.", SVN_VA_NULL);
}
/* Else Lines 48, 49, and 70 remain unchanged. */
}
@@ -641,14 +641,14 @@ substitute_and_verify(const char *test_n
apr_pstrcat(pool, "Line 48: ",
"Two keywords back to back: "
"$Author$$Rev: ", rev, " $.",
- (char *)NULL);
+ SVN_VA_NULL);
expect[49 - 1] =
apr_pstrcat(pool, "Line 49: ",
"One keyword, one not, back to back: "
"$Author$Rev: ", rev, " $.",
- (char *)NULL);
+ SVN_VA_NULL);
expect[70 - 1] =
- apr_pstrcat(pool, "$Author$Rev: ", rev, " $.", (char *)NULL);
+ apr_pstrcat(pool, "$Author$Rev: ", rev, " $.", SVN_VA_NULL);
}
/* Else Lines 48, 49, and 70 remain unchanged. */
}
@@ -660,14 +660,14 @@ substitute_and_verify(const char *test_n
apr_pstrcat(pool, "Line 48: ",
"Two keywords back to back: "
"$Author: ", author, " $$Rev$.",
- (char *)NULL);
+ SVN_VA_NULL);
expect[49 - 1] =
apr_pstrcat(pool, "Line 49: ",
"One keyword, one not, back to back: "
"$Author: ", author, " $Rev$.",
- (char *)NULL);
+ SVN_VA_NULL);
expect[70 - 1] =
- apr_pstrcat(pool, "$Author: ", author, " $Rev$.", (char *)NULL);
+ apr_pstrcat(pool, "$Author: ", author, " $Rev$.", SVN_VA_NULL);
}
/* Else Lines 48, 49, and 70 remain unchanged. */
}
@@ -684,14 +684,14 @@ substitute_and_verify(const char *test_n
"keyword in a keyword: $Author: ",
author,
" $Date$ $",
- (char *)NULL);
+ SVN_VA_NULL);
}
else /* unexpand */
{
expect[24 - 1] =
apr_pstrcat(pool, "Line 24: ",
"keyword in a keyword: $Author$Date$ $",
- (char *)NULL);
+ SVN_VA_NULL);
}
}
else if (date && (! author))
@@ -703,7 +703,7 @@ substitute_and_verify(const char *test_n
"keyword in a keyword: $Author: $Date: ",
date,
" $ $",
- (char *)NULL);
+ SVN_VA_NULL);
}
/* Else Line 24 remains unchanged. */
}
@@ -716,14 +716,14 @@ substitute_and_verify(const char *test_n
"keyword in a keyword: $Author: ",
author,
" $Date$ $",
- (char *)NULL);
+ SVN_VA_NULL);
}
else /* unexpand */
{
expect[24 - 1] =
apr_pstrcat(pool, "Line 24: ",
"keyword in a keyword: $Author$Date$ $",
- (char *)NULL);
+ SVN_VA_NULL);
}
}
/* Else neither author nor date, so Line 24 remains unchanged. */
Modified: subversion/trunk/subversion/tests/libsvn_wc/entries-compat.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/entries-compat.c?rev=1536307&r1=1536306&r2=1536307&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/entries-compat.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/entries-compat.c Mon Oct 28 10:38:15 2013
@@ -377,7 +377,7 @@ test_entries_alloc(apr_pool_t *pool)
"fake-wc",
WC_NAME,
"D",
- (char *)NULL);
+ SVN_VA_NULL);
SVN_ERR(svn_wc_entry(&entry, local_relpath, adm_access, TRUE, pool));
SVN_TEST_ASSERT(entry == apr_hash_get(entries, "D", APR_HASH_KEY_STRING));
@@ -413,7 +413,7 @@ test_stubs(apr_pool_t *pool)
"fake-wc",
WC_NAME,
"M",
- (char *)NULL);
+ SVN_VA_NULL);
SVN_ERR(svn_wc_adm_open3(&adm_access,
NULL /* associated */,
Modified: subversion/trunk/subversion/tests/libsvn_wc/utils.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/utils.c?rev=1536307&r1=1536306&r2=1536307&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/utils.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/utils.c Mon Oct 28 10:38:15 2013
@@ -354,7 +354,7 @@ sbox_wc_switch(svn_test__sandbox_t *b,
svn_revnum_t result_rev;
svn_opt_revision_t head_rev = { svn_opt_revision_head, {0} };
- url = apr_pstrcat(b->pool, b->repos_url, url, (char*)NULL);
+ url = apr_pstrcat(b->pool, b->repos_url, url, SVN_VA_NULL);
SVN_ERR(svn_client_create_context2(&ctx, NULL, b->pool));
ctx->wc_ctx = b->wc_ctx;
return svn_client_switch3(&result_rev, sbox_wc_path(b, path), url,
Modified: subversion/trunk/tools/client-side/svn-bench/notify.c
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/client-side/svn-bench/notify.c?rev=1536307&r1=1536306&r2=1536307&view=diff
==============================================================================
--- subversion/trunk/tools/client-side/svn-bench/notify.c (original)
+++ subversion/trunk/tools/client-side/svn-bench/notify.c Mon Oct 28 10:38:15 2013
@@ -348,7 +348,7 @@ notify(void *baton, const svn_wc_notify_
apr_pstrcat(pool, s,
"%"APR_UINT64_T_FMT
" and fuzz %lu (%s)\n",
- (char *)NULL),
+ SVN_VA_NULL),
n->hunk_original_start,
n->hunk_original_length,
n->hunk_modified_start,
@@ -365,7 +365,7 @@ notify(void *baton, const svn_wc_notify_
apr_pstrcat(pool, s,
"%"APR_UINT64_T_FMT
" and fuzz %lu\n",
- (char *)NULL),
+ SVN_VA_NULL),
n->hunk_original_start,
n->hunk_original_length,
n->hunk_modified_start,
@@ -386,7 +386,7 @@ notify(void *baton, const svn_wc_notify_
err = svn_cmdline_printf(pool,
apr_pstrcat(pool, s,
"%"APR_UINT64_T_FMT" (%s)\n",
- (char *)NULL),
+ SVN_VA_NULL),
n->hunk_original_start,
n->hunk_original_length,
n->hunk_modified_start,
@@ -400,7 +400,7 @@ notify(void *baton, const svn_wc_notify_
err = svn_cmdline_printf(pool,
apr_pstrcat(pool, s,
"%"APR_UINT64_T_FMT"\n",
- (char *)NULL),
+ SVN_VA_NULL),
n->hunk_original_start,
n->hunk_original_length,
n->hunk_modified_start,