You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2013/10/23 18:52:35 UTC
svn commit: r1535070 - in /subversion/trunk/subversion: libsvn_delta/
libsvn_fs/ libsvn_fs_fs/ libsvn_ra_serf/ libsvn_repos/ libsvn_subr/
mod_dav_svn/ svn/ svnauth/
Author: philip
Date: Wed Oct 23 16:52:35 2013
New Revision: 1535070
URL: http://svn.apache.org/r1535070
Log:
Cast NULL to (char *) in vararg apr_pstrcat call.
* subversion/libsvn_delta/compat.c
(apply_change): here
* subversion/libsvn_fs/editor.c
(FSPATH): here
* subversion/libsvn_fs_fs/caching.c
(svn_fs_fs__initialize_caches): here
* subversion/libsvn_ra_serf/util_error.c
(svn_ra_serf__wrap_err): here
* subversion/libsvn_repos/commit.c
(ev2_check_authz): here
* subversion/libsvn_subr/config.c
(get_category_config): here
* subversion/libsvn_subr/dirent_uri.c
(svn_uri_get_dirent_from_file_url,
svn_uri_get_file_url_from_dirent): here
* subversion/libsvn_subr/error.c
(svn_error_wrap_apr): here
* subversion/libsvn_subr/io.c
(svn_io_run_diff3_3): here
* subversion/libsvn_subr/named_atomic.c
(svn_atomic_namespace__create,
svn_atomic_namespace__cleanup): here
* subversion/libsvn_subr/sysinfo.c
(debian_release): here
* subversion/mod_dav_svn/authz.c
(dav_svn__allow_read): here
* subversion/mod_dav_svn/repos.c
(deliver): here
* subversion/svn/info-cmd.c
(print_info_xml): here
* subversion/svnauth/svnauth.c
(subcommand_help): here
Modified:
subversion/trunk/subversion/libsvn_delta/compat.c
subversion/trunk/subversion/libsvn_fs/editor.c
subversion/trunk/subversion/libsvn_fs_fs/caching.c
subversion/trunk/subversion/libsvn_ra_serf/util_error.c
subversion/trunk/subversion/libsvn_repos/commit.c
subversion/trunk/subversion/libsvn_subr/config.c
subversion/trunk/subversion/libsvn_subr/dirent_uri.c
subversion/trunk/subversion/libsvn_subr/error.c
subversion/trunk/subversion/libsvn_subr/io.c
subversion/trunk/subversion/libsvn_subr/named_atomic.c
subversion/trunk/subversion/libsvn_subr/sysinfo.c
subversion/trunk/subversion/mod_dav_svn/authz.c
subversion/trunk/subversion/mod_dav_svn/repos.c
subversion/trunk/subversion/svn/info-cmd.c
subversion/trunk/subversion/svnauth/svnauth.c
Modified: subversion/trunk/subversion/libsvn_delta/compat.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_delta/compat.c?rev=1535070&r1=1535069&r2=1535070&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_delta/compat.c (original)
+++ subversion/trunk/subversion/libsvn_delta/compat.c Wed Oct 23 16:52:35 2013
@@ -1628,7 +1628,7 @@ apply_change(void **dir_baton,
/* Make this an FS path by prepending "/" */
if (copyfrom_url[0] != '/')
copyfrom_url = apr_pstrcat(scratch_pool, "/",
- copyfrom_url, NULL);
+ copyfrom_url, (char *)NULL);
}
copyfrom_rev = change->copyfrom_rev;
Modified: subversion/trunk/subversion/libsvn_fs/editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs/editor.c?rev=1535070&r1=1535069&r2=1535070&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs/editor.c (original)
+++ subversion/trunk/subversion/libsvn_fs/editor.c Wed Oct 23 16:52:35 2013
@@ -62,7 +62,7 @@ struct edit_baton {
svn_fs_root_t *root;
};
-#define FSPATH(relpath, pool) apr_pstrcat(pool, "/", relpath, NULL)
+#define FSPATH(relpath, pool) apr_pstrcat(pool, "/", relpath, (char *)NULL)
#define UNUSED(x) ((void)(x))
Modified: subversion/trunk/subversion/libsvn_fs_fs/caching.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/caching.c?rev=1535070&r1=1535069&r2=1535070&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/caching.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/caching.c Wed Oct 23 16:52:35 2013
@@ -394,7 +394,7 @@ svn_fs_fs__initialize_caches(svn_fs_t *f
fs,
pool));
- prefix = apr_pstrcat(pool, "ns:", cache_namespace, ":", prefix, NULL);
+ prefix = apr_pstrcat(pool, "ns:", cache_namespace, ":", prefix, (char *)NULL);
membuffer = svn_cache__get_global_membuffer_cache();
Modified: subversion/trunk/subversion/libsvn_ra_serf/util_error.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/util_error.c?rev=1535070&r1=1535069&r2=1535070&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/util_error.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/util_error.c Wed Oct 23 16:52:35 2013
@@ -88,7 +88,8 @@ svn_ra_serf__wrap_err(apr_status_t statu
}
if (err_msg)
{
- err->message = apr_pstrcat(err->pool, msg, ": ", err_msg, NULL);
+ err->message = apr_pstrcat(err->pool, msg, ": ", err_msg,
+ (char *)NULL);
}
else
{
Modified: subversion/trunk/subversion/libsvn_repos/commit.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/commit.c?rev=1535070&r1=1535069&r2=1535070&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/commit.c (original)
+++ subversion/trunk/subversion/libsvn_repos/commit.c Wed Oct 23 16:52:35 2013
@@ -1013,7 +1013,7 @@ ev2_check_authz(const struct ev2_baton *
return SVN_NO_ERROR;
if (relpath)
- fspath = apr_pstrcat(scratch_pool, "/", relpath, NULL);
+ fspath = apr_pstrcat(scratch_pool, "/", relpath, (char *)NULL);
else
fspath = NULL;
Modified: subversion/trunk/subversion/libsvn_subr/config.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/config.c?rev=1535070&r1=1535069&r2=1535070&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/config.c (original)
+++ subversion/trunk/subversion/libsvn_subr/config.c Wed Oct 23 16:52:35 2013
@@ -264,9 +264,9 @@ get_category_config(svn_config_t **cfg,
{
#ifdef WIN32
sys_reg_path = apr_pstrcat(pool, SVN_REGISTRY_SYS_CONFIG_PATH,
- category, NULL);
+ category, (char *)NULL);
usr_reg_path = apr_pstrcat(pool, SVN_REGISTRY_USR_CONFIG_PATH,
- category, NULL);
+ category, (char *)NULL);
#endif /* WIN32 */
err = svn_config__sys_config_path(&sys_cfg_path, category, pool);
Modified: subversion/trunk/subversion/libsvn_subr/dirent_uri.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/dirent_uri.c?rev=1535070&r1=1535069&r2=1535070&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/dirent_uri.c (original)
+++ subversion/trunk/subversion/libsvn_subr/dirent_uri.c Wed Oct 23 16:52:35 2013
@@ -2398,7 +2398,7 @@ svn_uri_get_dirent_from_file_url(const c
"no path"), url);
/* We still know that the path starts with a slash. */
- *dirent = apr_pstrcat(pool, "//", hostname, dup_path, NULL);
+ *dirent = apr_pstrcat(pool, "//", hostname, dup_path, (char *)NULL);
}
else
*dirent = dup_path;
@@ -2438,11 +2438,11 @@ svn_uri_get_file_url_from_dirent(const c
/* Handle UNC paths //server/share -> file://server/share */
assert(dirent[1] == '/'); /* Expect UNC, not non-absolute */
- *url = apr_pstrcat(pool, "file:", dirent, NULL);
+ *url = apr_pstrcat(pool, "file:", dirent, (char *)NULL);
}
else
{
- char *uri = apr_pstrcat(pool, "file:///", dirent, NULL);
+ char *uri = apr_pstrcat(pool, "file:///", dirent, (char *)NULL);
apr_size_t len = 8 /* strlen("file:///") */ + strlen(dirent);
/* "C:/" is a canonical dirent on Windows,
Modified: subversion/trunk/subversion/libsvn_subr/error.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/error.c?rev=1535070&r1=1535069&r2=1535070&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/error.c (original)
+++ subversion/trunk/subversion/libsvn_subr/error.c Wed Oct 23 16:52:35 2013
@@ -202,7 +202,8 @@ svn_error_wrap_apr(apr_status_t status,
va_end(ap);
if (msg_apr)
{
- err->message = apr_pstrcat(err->pool, msg, ": ", msg_apr, NULL);
+ err->message = apr_pstrcat(err->pool, msg, ": ", msg_apr,
+ (char *)NULL);
}
else
{
Modified: subversion/trunk/subversion/libsvn_subr/io.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/io.c?rev=1535070&r1=1535069&r2=1535070&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/io.c (original)
+++ subversion/trunk/subversion/libsvn_subr/io.c Wed Oct 23 16:52:35 2013
@@ -3171,7 +3171,8 @@ svn_io_run_diff3_3(int *exitcode,
svn_config_get(cfg, &diff_cmd, SVN_CONFIG_SECTION_HELPERS,
SVN_CONFIG_OPTION_DIFF_CMD, SVN_CLIENT_DIFF);
SVN_ERR(cstring_to_utf8(&diff_utf8, diff_cmd, pool));
- args[i++] = apr_pstrcat(pool, "--diff-program=", diff_utf8, NULL);
+ args[i++] = apr_pstrcat(pool, "--diff-program=", diff_utf8,
+ (char *)NULL);
#ifndef NDEBUG
++nargs;
#endif
Modified: subversion/trunk/subversion/libsvn_subr/named_atomic.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/named_atomic.c?rev=1535070&r1=1535069&r2=1535070&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/named_atomic.c (original)
+++ subversion/trunk/subversion/libsvn_subr/named_atomic.c Wed Oct 23 16:52:35 2013
@@ -413,8 +413,8 @@ svn_atomic_namespace__create(svn_atomic_
/* construct the names of the system objects that we need
*/
- shm_name = apr_pstrcat(subpool, name, SHM_NAME_SUFFIX, NULL);
- lock_name = apr_pstrcat(subpool, name, MUTEX_NAME_SUFFIX, NULL);
+ shm_name = apr_pstrcat(subpool, name, SHM_NAME_SUFFIX, (char *)NULL);
+ lock_name = apr_pstrcat(subpool, name, MUTEX_NAME_SUFFIX, (char *)NULL);
/* initialize the lock objects
*/
@@ -508,8 +508,8 @@ svn_atomic_namespace__cleanup(const char
const char *shm_name, *lock_name;
/* file names used for the specified namespace */
- shm_name = apr_pstrcat(pool, name, SHM_NAME_SUFFIX, NULL);
- lock_name = apr_pstrcat(pool, name, MUTEX_NAME_SUFFIX, NULL);
+ shm_name = apr_pstrcat(pool, name, SHM_NAME_SUFFIX, (char *)NULL);
+ lock_name = apr_pstrcat(pool, name, MUTEX_NAME_SUFFIX, (char *)NULL);
/* remove these files if they exist */
SVN_ERR(svn_io_remove_file2(shm_name, TRUE, pool));
Modified: subversion/trunk/subversion/libsvn_subr/sysinfo.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/sysinfo.c?rev=1535070&r1=1535069&r2=1535070&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/sysinfo.c (original)
+++ subversion/trunk/subversion/libsvn_subr/sysinfo.c Wed Oct 23 16:52:35 2013
@@ -500,7 +500,7 @@ debian_release(apr_pool_t *pool)
return NULL;
stringbuf_first_line_only(buffer);
- return apr_pstrcat(pool, "Debian ", buffer->data, NULL);
+ return apr_pstrcat(pool, "Debian ", buffer->data, (char *)NULL);
}
/* Try to find the Linux distribution name, or return info from uname. */
Modified: subversion/trunk/subversion/mod_dav_svn/authz.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/authz.c?rev=1535070&r1=1535069&r2=1535070&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/authz.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/authz.c Wed Oct 23 16:52:35 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, NULL);
+ path = apr_pstrcat(pool, "/", path, (char *)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/repos.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/repos.c?rev=1535070&r1=1535069&r2=1535070&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/repos.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/repos.c Wed Oct 23 16:52:35 2013
@@ -3618,11 +3618,11 @@ deliver(const dav_resource *resource, ap
resource->info->repos->base_url,
ap_escape_uri(resource->pool,
resource->info->r->uri),
- NULL);
+ (char *)NULL);
str_root = apr_pstrcat(resource->pool,
resource->info->repos->base_url,
resource->info->repos->root_path,
- NULL);
+ (char *)NULL);
serr = svn_subst_build_keywords3(&kw, keywords->data,
str_cmt_rev, str_uri, str_root,
Modified: subversion/trunk/subversion/svn/info-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/info-cmd.c?rev=1535070&r1=1535069&r2=1535070&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/info-cmd.c (original)
+++ subversion/trunk/subversion/svn/info-cmd.c Wed Oct 23 16:52:35 2013
@@ -115,7 +115,7 @@ print_info_xml(void *baton,
info->repos_root_URL,
info->URL, pool),
pool),
- NULL));
+ (char *)NULL));
}
if (info->repos_root_URL || info->repos_UUID)
Modified: subversion/trunk/subversion/svnauth/svnauth.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnauth/svnauth.c?rev=1535070&r1=1535069&r2=1535070&view=diff
==============================================================================
--- subversion/trunk/subversion/svnauth/svnauth.c (original)
+++ subversion/trunk/subversion/svnauth/svnauth.c Wed Oct 23 16:52:35 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", NULL);
+ footer = apr_pstrcat(pool, footer, " Gnome Keyring\n", (char *)NULL);
#endif
#ifdef SVN_HAVE_GPG_AGENT
- footer = apr_pstrcat(pool, footer, " GPG-Agent\n", NULL);
+ footer = apr_pstrcat(pool, footer, " GPG-Agent\n", (char *)NULL);
#endif
#ifdef SVN_HAVE_KEYCHAIN_SERVICES
- footer = apr_pstrcat(pool, footer, " Mac OS X Keychain\n", NULL);
+ footer = apr_pstrcat(pool, footer, " Mac OS X Keychain\n", (char *)NULL);
#endif
#ifdef SVN_HAVE_KWALLET
- footer = apr_pstrcat(pool, footer, " KWallet (KDE)\n", NULL);
+ footer = apr_pstrcat(pool, footer, " KWallet (KDE)\n", (char *)NULL);
#endif
}