subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1355539 - /subversion/trunk/subversion/libsvn_wc/conflicts.c
Date Fri, 29 Jun 2012 19:57:32 GMT
Author: rhuijben
Date: Fri Jun 29 19:57:31 2012
New Revision: 1355539

URL: http://svn.apache.org/viewvc?rev=1355539&view=rev
Log:
Avoid some 'const' warnings by making a private function return a non-const
skel referenced from a const skel.

* subversion/libsvn_wc/conflicts.c
  (conflict__get_operation,
   conflict__get_conflict): Return non-const skels as output argument.

  (svn_wc__conflict_skel_add_prop_conflict): Fix double commenting.
  (svn_wc__conflict_read_text_conflict,
   svn_wc__conflict_read_prop_conflict): Update callers.

Modified:
    subversion/trunk/subversion/libsvn_wc/conflicts.c

Modified: subversion/trunk/subversion/libsvn_wc/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.c?rev=1355539&r1=1355538&r2=1355539&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Fri Jun 29 19:57:31 2012
@@ -136,7 +136,7 @@ conflict__prepend_location(svn_skel_t *s
 /* Get the operation part of CONFLICT_SKELL or NULL if no operation is set
    at this time */
 static svn_error_t *
-conflict__get_operation(const svn_skel_t **why,
+conflict__get_operation(svn_skel_t **why,
                         const svn_skel_t *conflict_skel)
 {
   SVN_ERR_ASSERT(conflict_skel
@@ -253,7 +253,7 @@ svn_wc__conflict_skel_set_op_merge(svn_s
 /* Gets the conflict data of the specified type CONFLICT_TYPE from
    CONFLICT_SKEL, or NULL if no such conflict is recorded */
 static svn_error_t *
-conflict__get_conflict(const svn_skel_t **conflict,
+conflict__get_conflict(svn_skel_t **conflict,
                        const svn_skel_t *conflict_skel,
                        const char *conflict_type)
 {
@@ -377,7 +377,7 @@ svn_wc__conflict_skel_add_prop_conflict(
   SVN_ERR_ASSERT(!prop_conflict); /* ### Use proper error? */
 
   /* This function currently implements:
-  /* ("prop"
+     ("prop"
       ("marker_relpath")
       prop-conflicted_prop_names
       old-props
@@ -503,7 +503,7 @@ svn_wc__conflict_read_text_conflict(cons
                                     apr_pool_t *result_pool,
                                     apr_pool_t *scratch_pool)
 {
-  const svn_skel_t *text_conflict;
+  svn_skel_t *text_conflict;
   svn_skel_t *m;
 
   SVN_ERR(conflict__get_conflict(&text_conflict, conflict_skel,
@@ -576,7 +576,7 @@ svn_wc__conflict_read_prop_conflict(cons
                                     apr_pool_t *result_pool,
                                     apr_pool_t *scratch_pool)
 {
-  const svn_skel_t *prop_conflict;
+  svn_skel_t *prop_conflict;
   svn_skel_t *c;
 
   SVN_ERR(conflict__get_conflict(&prop_conflict, conflict_skel,



Mime
View raw message