svn commit: r13179 - trunk/subversion/libsvn_delta

Author: philip
Date: Sun Feb 27 10:17:46 2005
New Revision: 13179

Modified:
   trunk/subversion/libsvn_delta/compose_delta.c
   trunk/subversion/libsvn_delta/text_delta.c
Log:
* subversion/libsvn_delta/compose_delta.c
  (copy_source_ops): Add a FIXME comment to some dubious code.

* subversion/libsvn_delta/text_delta.c
  (svn_txdelta__apply_instructions): Remove an assert since it's
  pointless to test "unsigned >= 0".


Modified: trunk/subversion/libsvn_delta/compose_delta.c
Url: 
http://svn.collab.net/viewcvs/svn/trunk/subversion/libsvn_delta/compose_delta.c?view=diff&rev=13179&p1=trunk/subversion/libsvn_delta/compose_delta.c&r1=13178&p2=trunk/subversion/libsvn_delta/compose_delta.c&r2=13179
==============================================================================
--- trunk/subversion/libsvn_delta/compose_delta.c       (original)
+++ trunk/subversion/libsvn_delta/compose_delta.c       Sun Feb 27 10:17:46 2005
@@ -673,6 +673,9 @@
               apr_size_t tgt_off = target_offset;
               assert(ptn_length > ptn_overlap);
 
+              /* ### FIXME: ptn_overlap is unsigned, so the if() condition
+                 below is always true!  Either it should be '> 0', or the
+                 code block should be unconditional.  See also r2288. */
               if (ptn_overlap >= 0)
                 {
                   /* Issue second subrange in the pattern. */

Modified: trunk/subversion/libsvn_delta/text_delta.c
Url: 
http://svn.collab.net/viewcvs/svn/trunk/subversion/libsvn_delta/text_delta.c?view=diff&rev=13179&p1=trunk/subversion/libsvn_delta/text_delta.c&r1=13178&p2=trunk/subversion/libsvn_delta/text_delta.c&r2=13179
==============================================================================
--- trunk/subversion/libsvn_delta/text_delta.c  (original)
+++ trunk/subversion/libsvn_delta/text_delta.c  Sun Feb 27 10:17:46 2005
@@ -490,7 +490,6 @@
                                   ? op->length : *tlen - tpos);
 
       /* Check some invariants common to all instructions.  */
-      assert (op->offset >= 0 && op->length >= 0);
       assert (tpos + op->length <= window->tview_len);
 
       switch (op->action_code)