svn commit: r1356486 - /subversion/trunk/subversion/libsvn_wc/conflicts.c

[ju...@apache.org]

Author: julianfoad
Date: Mon Jul  2 21:08:08 2012
New Revision: 1356486

URL: http://svn.apache.org/viewvc?rev=1356486&view=rev
Log:
* subversion/libsvn_wc/conflicts.c
  (conflict__get_conflict): Fix warnings: make the output non-const and
    remove an unused variable. Add a blank line between declarations and
    statements.

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=1356486&r1=1356485&r2=1356486&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Mon Jul  2 21:08:08 2012
@@ -136,7 +136,7 @@ conflict__prepend_location(svn_skel_t *s
 /* Deserialize a svn_wc_conflict_version_t from the skel.
    Set *LOCATION to NULL when the data is not a svn_wc_conflict_version_t. */
 static svn_error_t *
-conflict__read_location(const svn_wc_conflict_version_t **location,
+conflict__read_location(svn_wc_conflict_version_t **location,
                         const svn_skel_t *skel,
                         apr_pool_t *result_pool,
                         apr_pool_t *scratch_pool)
@@ -311,14 +311,12 @@ conflict__get_conflict(svn_skel_t **conf
                        const char *conflict_type)
 {
   svn_skel_t *c;
-  apr_size_t len;
+
   SVN_ERR_ASSERT(conflict_skel
                  && conflict_skel->children
                  && conflict_skel->children->next
                  && !conflict_skel->children->next->is_atom);
 
-  len = strlen(conflict_type);
-
   for(c = conflict_skel->children->next->children;
       c;
       c = c->next)