svn commit: r780300 - /couchdb/trunk/src/couchdb/couch_file.erl

[da...@apache.org]

Author: damien
Date: Sat May 30 17:12:48 2009
New Revision: 780300

URL: http://svn.apache.org/viewvc?rev=780300&view=rev
Log:
Fix for couch_file bug found with etap test suite

Modified:
    couchdb/trunk/src/couchdb/couch_file.erl

Modified: couchdb/trunk/src/couchdb/couch_file.erl
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_file.erl?rev=780300&r1=780299&r2=780300&view=diff
==============================================================================
--- couchdb/trunk/src/couchdb/couch_file.erl (original)
+++ couchdb/trunk/src/couchdb/couch_file.erl Sat May 30 17:12:48 2009
@@ -468,7 +468,7 @@
     case split_iolist(IoList, (?SIZE_BLOCK - BlockOffset), []) of
     {Begin, End} ->
         [Begin | make_blocks(0, End)];
-    _Size ->
+    _SplitRemaining ->
         IoList
     end.
 
@@ -485,8 +485,8 @@
     case split_iolist(Sublist, SplitAt, BeginAcc) of
     {Begin, End} ->
         {Begin, [End | Rest]};
-    Len ->
-        split_iolist(Rest, SplitAt - Len, [Sublist | BeginAcc])
+    SplitRemaining ->
+        split_iolist(Rest, SplitAt - (SplitAt - SplitRemaining), [Sublist | BeginAcc])
     end;
 split_iolist([Byte | Rest], SplitAt, BeginAcc) when is_integer(Byte) ->
     split_iolist(Rest, SplitAt - 1, [Byte | BeginAcc]).