summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@lshift.net>2009-12-03 15:41:42 +0000
committerMatthew Sackman <matthew@lshift.net>2009-12-03 15:41:42 +0000
commit77f9e0f3ad3583962a42c9617764ed26a7227d60 (patch)
tree4e4c618165c0a2d2d0239620336a1abd2926079a
parentf26991818879ac44c62c856d9f01e7d1ff3f07b7 (diff)
parentdb1a21035bbdd9d417ecd2ac3c50bf1a709eee3a (diff)
downloadrabbitmq-server-git-77f9e0f3ad3583962a42c9617764ed26a7227d60.tar.gz
merge heads
-rw-r--r--src/file_handle_cache.erl14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/file_handle_cache.erl b/src/file_handle_cache.erl
index 6007e554c5..e8d7cf6e85 100644
--- a/src/file_handle_cache.erl
+++ b/src/file_handle_cache.erl
@@ -119,8 +119,7 @@
-export([open/3, close/1, read/2, append/2, sync/1, position/2, truncate/1,
last_sync_offset/1, current_virtual_offset/1, current_raw_offset/1,
- flush/1, copy/3, set_maximum_since_use/1, delete/1,
- clear/1]).
+ flush/1, copy/3, set_maximum_since_use/1, delete/1, clear/1]).
-export([start_link/0, init/1, handle_call/3, handle_cast/2, handle_info/2,
terminate/2, code_change/3]).
@@ -382,14 +381,15 @@ clear(Ref) ->
fun ([#handle { at_eof = true, write_buffer_size = 0, offset = 0 }]) ->
ok;
([Handle = #handle { write_buffer_size = Size, offset = Offset }]) ->
- Handle1 =
- Handle #handle { write_buffer = [], write_buffer_size = 0,
- offset = Offset - Size },
+ Handle1 = Handle #handle { write_buffer = [],
+ write_buffer_size = 0,
+ offset = Offset - Size },
case maybe_seek(bof, Handle1) of
{{ok, 0}, Handle2 = #handle { hdl = Hdl }} ->
case file:truncate(Hdl) of
- ok -> {ok, [Handle2 #handle { at_eof = true,
- trusted_offset = 0 }]};
+ ok -> {ok, [Handle2 #handle {
+ at_eof = true,
+ trusted_offset = 0 }]};
Error -> {Error, [Handle2]}
end;
Error ->