From aef9dbd3a6cbb85085023d3c8565740e09fd6a77 Mon Sep 17 00:00:00 2001
From: Adam Kocoloski <kocolosk@apache.org>
Date: Sat, 21 Nov 2009 13:43:43 +0000
Subject: code improvements from tidier. Patch by Kostis Sagonas. COUCHDB-570

git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@882903 13f79535-47bb-0310-9956-ffa450edef68
---
 src/couchdb/couch_file.erl | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/couchdb/couch_file.erl')

diff --git a/src/couchdb/couch_file.erl b/src/couchdb/couch_file.erl
index 2dfc5403..5904260c 100644
--- a/src/couchdb/couch_file.erl
+++ b/src/couchdb/couch_file.erl
@@ -402,14 +402,14 @@ extract_header(Prefix, Bin) ->
 write_old_header(Fd, Prefix, Data) ->
     TermBin = term_to_binary(Data),
     % the size of all the bytes written to the header, including the md5 signature (16 bytes)
-    FilledSize = size(Prefix) + size(TermBin) + 16,
+    FilledSize = byte_size(Prefix) + byte_size(TermBin) + 16,
     {TermBin2, FilledSize2} =
     case FilledSize > ?HEADER_SIZE of
     true ->
         % too big!
         {ok, Pos} = append_binary(Fd, TermBin),
         PtrBin = term_to_binary({pointer_to_header_data, Pos}),
-        {PtrBin, size(Prefix) + size(PtrBin) + 16};
+        {PtrBin, byte_size(Prefix) + byte_size(PtrBin) + 16};
     false ->
         {TermBin, FilledSize}
     end,
@@ -465,7 +465,7 @@ calculate_total_read_len(BlockOffset, FinalLen) ->
         FinalLen;
     BlockLeft ->
         FinalLen + ((FinalLen - BlockLeft) div (?SIZE_BLOCK -1)) +
-            if ((FinalLen - BlockLeft) rem (?SIZE_BLOCK -1)) == 0 -> 0;
+            if ((FinalLen - BlockLeft) rem (?SIZE_BLOCK -1)) =:= 0 -> 0;
                 true -> 1 end
     end.
 
@@ -499,8 +499,8 @@ split_iolist(List, 0, BeginAcc) ->
     {lists:reverse(BeginAcc), List};
 split_iolist([], SplitAt, _BeginAcc) ->
     SplitAt;
-split_iolist([<<Bin/binary>> | Rest], SplitAt, BeginAcc)  when SplitAt > size(Bin) ->
-    split_iolist(Rest, SplitAt - size(Bin), [Bin | BeginAcc]);
+split_iolist([<<Bin/binary>> | Rest], SplitAt, BeginAcc) when SplitAt > byte_size(Bin) ->
+    split_iolist(Rest, SplitAt - byte_size(Bin), [Bin | BeginAcc]);
 split_iolist([<<Bin/binary>> | Rest], SplitAt, BeginAcc) ->
     <<Begin:SplitAt/binary,End/binary>> = Bin,
     split_iolist([End | Rest], 0, [Begin | BeginAcc]);
-- 
cgit v1.2.3