You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by bl...@apache.org on 2010/12/22 03:03:34 UTC
svn commit: r1051733 - in /subversion/trunk/subversion/mod_dav_svn:
dav_svn.h merge.c version.c
Author: blair
Date: Wed Dec 22 02:03:34 2010
New Revision: 1051733
URL: http://svn.apache.org/viewvc?rev=1051733&view=rev
Log:
Constify. This commit will let a successive commit introduce a
utility function that generates a const char * message combining an
error from svn_fs_commit_txn() and/or from the post-commit hook.
* subversion/mod_dav_svn/dav_svn.h,
* subversion/mod_dav_svn/merge.c
(dav_svn__merge_response):
Change the char *post_commit_err argument to be a const char *.
* subversion/mod_dav_svn/version.c
(merge):
Declare the local char *post_commit_err as a const char *.
Modified:
subversion/trunk/subversion/mod_dav_svn/dav_svn.h
subversion/trunk/subversion/mod_dav_svn/merge.c
subversion/trunk/subversion/mod_dav_svn/version.c
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=1051733&r1=1051732&r2=1051733&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/dav_svn.h (original)
+++ subversion/trunk/subversion/mod_dav_svn/dav_svn.h Wed Dec 22 02:03:34 2010
@@ -572,7 +572,7 @@ dav_error *
dav_svn__merge_response(ap_filter_t *output,
const dav_svn_repos *repos,
svn_revnum_t new_rev,
- char *post_commit_err,
+ const char *post_commit_err,
apr_xml_elem *prop_elem,
svn_boolean_t disable_merge_response,
apr_pool_t *pool);
Modified: subversion/trunk/subversion/mod_dav_svn/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/merge.c?rev=1051733&r1=1051732&r2=1051733&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/merge.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/merge.c Wed Dec 22 02:03:34 2010
@@ -209,7 +209,7 @@ dav_error *
dav_svn__merge_response(ap_filter_t *output,
const dav_svn_repos *repos,
svn_revnum_t new_rev,
- char *post_commit_err,
+ const char *post_commit_err,
apr_xml_elem *prop_elem,
svn_boolean_t disable_merge_response,
apr_pool_t *pool)
Modified: subversion/trunk/subversion/mod_dav_svn/version.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/version.c?rev=1051733&r1=1051732&r2=1051733&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/version.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/version.c Wed Dec 22 02:03:34 2010
@@ -1322,7 +1322,7 @@ merge(dav_resource *target,
svn_fs_txn_t *txn;
const char *conflict;
svn_error_t *serr;
- char *post_commit_err = NULL;
+ const char *post_commit_err = NULL;
svn_revnum_t new_rev;
apr_hash_t *locks;
svn_boolean_t disable_merge_response = FALSE;