subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From i...@apache.org
Subject svn commit: r1684014 - /subversion/trunk/subversion/libsvn_delta/svndiff.c
Date Sun, 07 Jun 2015 09:53:54 GMT
Author: ivan
Date: Sun Jun  7 09:53:54 2015
New Revision: 1684014

URL: http://svn.apache.org/r1684014
Log:
Use existing API to construct svn_string_t.

* subversion/libsvn_delta/svndiff.c
  (decode_window): Use svn_stringbuf__morph_into_string() and
   svn_string_ncreate() to construct svn_string_t.

Modified:
    subversion/trunk/subversion/libsvn_delta/svndiff.c

Modified: subversion/trunk/subversion/libsvn_delta/svndiff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_delta/svndiff.c?rev=1684014&r1=1684013&r2=1684014&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_delta/svndiff.c (original)
+++ subversion/trunk/subversion/libsvn_delta/svndiff.c Sun Jun  7 09:53:54 2015
@@ -513,7 +513,7 @@ decode_window(svn_txdelta_window_t *wind
   int ninst;
   apr_size_t npos;
   svn_txdelta_op_t *ops, *op;
-  svn_string_t *new_data = apr_palloc(pool, sizeof(*new_data));
+  svn_string_t *new_data;
 
   window->sview_offset = sview_offset;
   window->sview_len = sview_len;
@@ -535,19 +535,13 @@ decode_window(svn_txdelta_window_t *wind
       data = (unsigned char *)instout->data;
       insend = (unsigned char *)instout->data + instout->len;
 
-      new_data->data = (const char *) ndout->data;
-      new_data->len = newlen;
+      new_data = svn_stringbuf__morph_into_string(ndout);
     }
   else
     {
       /* Copy the data because an svn_string_t must have the invariant
          data[len]=='\0'. */
-      char *buf = apr_palloc(pool, newlen + 1);
-
-      memcpy(buf, insend, newlen);
-      buf[newlen] = '\0';
-      new_data->data = buf;
-      new_data->len = newlen;
+      new_data = svn_string_ncreate((const char*)insend, newlen, pool);
     }
 
   /* Count the instructions and make sure they are all valid.  */



Mime
View raw message