[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subversion-cvs
Subject:    svn commit: rev 1601 - trunk/subversion/libsvn_delta
From:       bcollins () tigris ! org
Date:       2002-03-26 22:03:13
[Download RAW message or body]

Author: bcollins
Date: 2002-03-26 22:03 GMT
New Revision: 1601

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

    (write_handler): Wrap db->consumer_func() call in SVN_ERR() so that it
      actually returns the error (fixes a segv caused by brokeness
      elsewhere). Remove the now unused "err" var, and return SVN_NO_ERROR
      if the while() loop completes.


Modified: trunk/subversion/libsvn_delta/svndiff.c
==============================================================================
--- trunk/subversion/libsvn_delta/svndiff.c	(original)
+++ trunk/subversion/libsvn_delta/svndiff.c	Tue Mar 26 16:03:12 2002
@@ -363,7 +363,6 @@
   const unsigned char *p, *end;
   apr_off_t val, sview_offset;
   apr_size_t sview_len, tview_len, inslen, newlen, remaining, npos;
-  svn_error_t *err;
   svn_txdelta_op_t *op;
   int ninst;
 
@@ -489,7 +488,7 @@
       window.new_data = &new_data;
 
       /* Send it off.  */
-      err = db->consumer_func (&window, db->consumer_baton);
+      SVN_ERR(db->consumer_func (&window, db->consumer_baton));
 
       /* Make a new subpool and buffer, saving aside the remaining
          data in the old buffer.  */
@@ -512,7 +511,7 @@
       db->subpool = newpool;
     }
 
-  return err;
+  return SVN_NO_ERROR;
 }
 
 


[prev in list] [next in list] [prev in thread] [next in thread]