Author: julianfoad
Date: Tue Dec 11 16:16:30 2012
New Revision: 1420247
URL: http://svn.apache.org/viewvc?rev=1420247&view=rev
Log:
* subversion/libsvn_wc/wc_db.c
(revert_list_read_baton): Add 'const' to an array here...
(revert_list_read): ... so we don't need to cast away 'const' here, and
can simplify the initialization.
Modified:
subversion/trunk/subversion/libsvn_wc/wc_db.c
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1420247&r1=1420246&r2=1420247&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Tue Dec 11 16:16:30 2012
@@ -6156,7 +6156,7 @@ svn_wc__db_op_revert(svn_wc__db_t *db,
/* Baton for passing args to revert_list_read(). */
struct revert_list_read_baton {
svn_boolean_t *reverted;
- apr_array_header_t *marker_paths;
+ const apr_array_header_t *marker_paths;
svn_boolean_t *copied_here;
svn_kind_t *kind;
apr_pool_t *result_pool;
@@ -6199,18 +6199,15 @@ revert_list_read(void *baton,
scratch_pool);
if (conflict_data)
{
- const apr_array_header_t *marker_paths;
svn_skel_t *conflicts = svn_skel__parse(conflict_data,
conflict_len,
scratch_pool);
- SVN_ERR(svn_wc__conflict_read_markers(&marker_paths,
+ SVN_ERR(svn_wc__conflict_read_markers(&b->marker_paths,
b->db, wcroot->abspath,
conflicts,
b->result_pool,
scratch_pool));
- /* De-const-ify. */
- b->marker_paths = (apr_array_header_t *)marker_paths;
}
if (!svn_sqlite__column_is_null(stmt, 1)) /* notify */
