Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@subversion.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1805113 - /subversion/trunk/subversion/libsvn_delta/text_delta.c
Date: Tue, 15 Aug 2017 20:20:22 -0000
To: commits@subversion.apache.org
From: kotkov@apache.org
Message-Id: <20170815202025.0F8573A00E6@svn01-us-west.apache.org>
archived-at: Tue, 15 Aug 2017 20:20:29 -0000

Author: kotkov
Date: Tue Aug 15 20:20:22 2017
New Revision: 1805113

URL: http://svn.apache.org/viewvc?rev=1805113&view=rev
Log:
Minor code cleanup: use svn checksum routines instead of calling apr_md5
functions in the implementation of svn_txdelta_apply().

* subversion/libsvn_delta/text_delta.c
  (struct apply_baton): Make md5_context an svn_checksum_ctx_t.
  (apply_window): Replace apr_md5_final() with svn_checksum_final(),
   compose and handle potential errors.  Replace apr_md5_update() with
   svn_checksum_update().
  (svn_txdelta_apply): Update context initialization.

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

Modified: subversion/trunk/subversion/libsvn_delta/text_delta.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_delta/text_delta.c?rev=1805113&r1=1805112&r2=1805113&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_delta/text_delta.c (original)
+++ subversion/trunk/subversion/libsvn_delta/text_delta.c Tue Aug 15 20:20:22 2017
@@ -102,7 +102,7 @@ struct apply_baton {
   char *tbuf;                   /* Target buffer */
   apr_size_t tbuf_size;         /* Allocated target buffer space */
 
-  apr_md5_ctx_t md5_context;    /* Leads to result_digest below. */
+  svn_checksum_ctx_t *md5_context; /* Leads to result_digest below. */
   unsigned char *result_digest; /* MD5 digest of resultant fulltext;
                                    must point to at least APR_MD5_DIGESTSIZE
                                    bytes of storage. */
@@ -720,15 +720,22 @@ apply_window(svn_txdelta_window_t *windo
 {
   struct apply_baton *ab = (struct apply_baton *) baton;
   apr_size_t len;
-  svn_error_t *err;
+  svn_error_t *err = SVN_NO_ERROR;
 
   if (window == NULL)
     {
       /* We're done; just clean up.  */
       if (ab->result_digest)
-        apr_md5_final(ab->result_digest, &(ab->md5_context));
+        {
+          svn_checksum_t *md5_checksum;
+
+          err = svn_checksum_final(&md5_checksum, ab->md5_context, ab->pool);
+          if (!err)
+            memcpy(ab->result_digest, md5_checksum->digest,
+                   svn_checksum_size(md5_checksum));
+        }
 
-      err = svn_stream_close(ab->target);
+      err = svn_error_compose_create(err, svn_stream_close(ab->target));
       svn_pool_destroy(ab->pool);
 
       return err;
@@ -791,7 +798,7 @@ apply_window(svn_txdelta_window_t *windo
 
   /* Just update the context here. */
   if (ab->result_digest)
-    apr_md5_update(&(ab->md5_context), ab->tbuf, len);
+    SVN_ERR(svn_checksum_update(ab->md5_context, ab->tbuf, len));
 
   return svn_stream_write(ab->target, ab->tbuf, &len);
 }
@@ -822,7 +829,7 @@ svn_txdelta_apply(svn_stream_t *source,
   ab->result_digest = result_digest;
 
   if (result_digest)
-    apr_md5_init(&(ab->md5_context));
+    ab->md5_context = svn_checksum_ctx_create(svn_checksum_md5, subpool);
 
   if (error_info)
     ab->error_info = apr_pstrdup(subpool, error_info);