[Mldonkey-commits] Changes to mldonkey/src/utils/lib/sparseFile.ml

[mldonkey-commits]

Index: mldonkey/src/utils/lib/sparseFile.ml
diff -u mldonkey/src/utils/lib/sparseFile.ml:1.1 
mldonkey/src/utils/lib/sparseFile.ml:1.2
--- mldonkey/src/utils/lib/sparseFile.ml:1.1    Tue Apr 22 22:33:40 2003
+++ mldonkey/src/utils/lib/sparseFile.ml        Sun Oct 16 20:42:55 2005
@@ -27,19 +27,16 @@
        }; 
   }
 
-let (+) = Int64.add
-let (-) = Int64.sub
-
 let chunk_min_size = ref 65000
 
 let split_chunk c pos =
   let cc = {
     created = None;
     pos = pos;
-    len = c.len - pos;
+    len = c.len -- pos;
    } in
   c.next <- Some cc;
-  c.len <- (pos - c.pos)
+  c.len <- pos -- c.pos
 
 let rec extend_chunk c size = 
   match c.next with
@@ -52,19 +49,19 @@
          append_chunk c cc;
          remove_chunk cc;
          c.next <- cc.next;
-         c.len <- (cc.pos + cc.len) - c.pos;
+         c.len <- (cc.pos ++ cc.len) -- c.pos;
        end
      else
-     if cc.len >= size + !chunk_min_size then 
+     if cc.len >= size ++ !chunk_min_size then 
        begin
-         split_chunk cc (cc.pos + size);
+         split_chunk cc (cc.pos ++ size);
          extend_chunk c size;
        end 
      else
        begin
          c.next <- cc.next;
-         c.len <- (cc.pos + cc.len) - c.pos;
-         ftruncate_chunk c (c.len + cc.len);
+         c.len <- (cc.pos ++ cc.len) -- c.pos;
+         ftruncate_chunk c (c.len ++ cc.len);
        end
 
 let open_chunk c = ()
@@ -74,31 +71,31 @@
   let c = t.chunks in
   let rec iter c =
 
-    if c.created <> None && c.pos <= pos && c.pos + c.len >= pos + len then
-       (open_chunk c, pos - c.pos)
+    if c.created <> None && c.pos <= pos && c.pos ++ c.len >= pos ++ len then
+       (open_chunk c, pos -- c.pos)
     else
-    if c.created <> None && pos <= c.pos + c.len + !chunk_min_size then
+    if c.created <> None && pos <= c.pos ++ c.len ++ !chunk_min_size then
       begin
-        extend_chunk c (maxi !chunk_min_size (pos+len - c.pos -c.len + 
!chunk_min_size));
+        extend_chunk c (maxi !chunk_min_size (pos ++ len -- c.pos -- c.len ++ 
!chunk_min_size));
         iter c
       end
     else
-    if c.pos + c.len <= pos then
+    if c.pos ++ c.len <= pos then
       match c.next with
       | None -> 
          lprintf "Invalid access in file pos %Ld is after last chunk\n" pos;
          assert false
       | Some c -> iter c
     else
-    if c.pos + !chunk_min_size < pos then 
+    if c.pos ++ !chunk_min_size < pos then 
       begin
         split_chunk c pos;
         iter c     
       end
     else
-    if c.pos + c.len > pos + (maxi len !chunk_min_size) + !chunk_min_size then
+    if c.pos ++ c.len > pos ++ (maxi len !chunk_min_size) ++ !chunk_min_size 
then
       begin
-        split_chunk c (pos+(maxi len !chunk_min_size)+!chunk_min_size);
+        split_chunk c (pos ++ (maxi len !chunk_min_size) ++ !chunk_min_size);
         iter c
       end
     else 
@@ -114,6 +111,3 @@
   while t.chunks.next <> None do
     extend_chunk c t.size
   done;
-  
-
-