svn commit: r1132953 - /subversion/trunk/subversion/libsvn_wc/props.c

[julianfoad]

Author: julianfoad
Date: Tue Jun  7 10:57:30 2011
New Revision: 1132953

URL: http://svn.apache.org/viewvc?rev=1132953&view=rev
Log:
* subversion/libsvn_wc/props.c
  (svn_wc_canonicalize_svn_prop): Remove some unnecessary string conversions.

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

Modified: subversion/trunk/subversion/libsvn_wc/props.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/props.c?rev=1132953&r1=1132952&r2=1132953&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/props.c (original)
+++ subversion/trunk/subversion/libsvn_wc/props.c Tue Jun  7 10:57:30 2011
@@ -2407,6 +2407,7 @@ svn_wc_canonicalize_svn_prop(const svn_s
 
   SVN_ERR(validate_prop_against_node_kind(propname, path, kind, pool));
 
+  /* This code may place the new prop val in either NEW_VALUE or PROPVAL. */
   if (!skip_some_checks && (strcmp(propname, SVN_PROP_EOL_STYLE) == 0))
     {
       svn_subst_eol_style_t eol_style;
@@ -2461,7 +2462,7 @@ svn_wc_canonicalize_svn_prop(const svn_s
   else if (svn_prop_is_boolean(propname))
     {
       /* SVN_PROP_EXECUTABLE, SVN_PROP_NEEDS_LOCK, SVN_PROP_SPECIAL */
-      new_value = svn_stringbuf_create_from_string(&boolean_value, pool);
+      propval = &boolean_value;
     }
   else if (strcmp(propname, SVN_PROP_MERGEINFO) == 0)
     {
@@ -2479,7 +2480,7 @@ svn_wc_canonicalize_svn_prop(const svn_s
           svn_dirent_local_style(path, pool));
 
       SVN_ERR(svn_mergeinfo_to_string(&new_value_str, mergeinfo, pool));
-      new_value = svn_stringbuf_create_from_string(new_value_str, pool);
+      propval = new_value_str;
     }
 
   if (new_value)