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 2015/03/04 07:23:50 UTC
svn commit: r1663865 -
/subversion/branches/mod-dav-svn-expressions/subversion/mod_dav_svn/mod_dav_svn.c
Author: brane
Date: Wed Mar 4 06:23:50 2015
New Revision: 1663865
URL: http://svn.apache.org/r1663865
Log:
On the mod-dav-svn-expressions branch:
Properly terminate variadic argument lists.
* subversion/mod_dav_svn/mod_dav_svn.c
(SVNPath_cmd, SVNParentPath_cmd): Use SVN_VA_NULL instead of NULL to
terminate the argument list of apr_pstrcat.
Modified:
subversion/branches/mod-dav-svn-expressions/subversion/mod_dav_svn/mod_dav_svn.c
Modified: subversion/branches/mod-dav-svn-expressions/subversion/mod_dav_svn/mod_dav_svn.c
URL: http://svn.apache.org/viewvc/subversion/branches/mod-dav-svn-expressions/subversion/mod_dav_svn/mod_dav_svn.c?rev=1663865&r1=1663864&r2=1663865&view=diff
==============================================================================
--- subversion/branches/mod-dav-svn-expressions/subversion/mod_dav_svn/mod_dav_svn.c (original)
+++ subversion/branches/mod-dav-svn-expressions/subversion/mod_dav_svn/mod_dav_svn.c Wed Mar 4 06:23:50 2015
@@ -507,7 +507,7 @@ SVNPath_cmd(cmd_parms *cmd, void *config
if (expr_err)
{
return apr_pstrcat(cmd->temp_pool, "Cannot parse expression '",
- arg2, "' in SVNPath: ", expr_err, NULL);
+ arg2, "' in SVNPath: ", expr_err, SVN_VA_NULL);
}
#else
return "Expressions require httpd v2.4.0 or higher"
@@ -525,7 +525,7 @@ SVNPath_cmd(cmd_parms *cmd, void *config
{
return apr_pstrcat(cmd->temp_pool,
"Cannot parse Location expression '",
- conf->root_dir, "': ", expr_err, NULL);
+ conf->root_dir, "': ", expr_err, SVN_VA_NULL);
}
}
#endif /* SVN_AP_HAS_EXPRESSIONS */
@@ -555,7 +555,8 @@ SVNParentPath_cmd(cmd_parms *cmd, void *
if (expr_err)
{
return apr_pstrcat(cmd->temp_pool, "Cannot parse expression '",
- arg2, "'in SVNParentPath: ", expr_err, NULL);
+ arg2, "'in SVNParentPath: ", expr_err,
+ SVN_VA_NULL);
}
#else
return "Expressions require httpd v2.4.0 or higher"
@@ -573,7 +574,7 @@ SVNParentPath_cmd(cmd_parms *cmd, void *
{
return apr_pstrcat(
cmd->temp_pool, "Cannot parse Location expression '",
- conf->root_dir, "': ", expr_err, NULL);
+ conf->root_dir, "': ", expr_err, SVN_VA_NULL);
}
}
#endif /* SVN_AP_HAS_EXPRESSIONS */