Merge branch 'maint-r14' of super:otp into maint-r14

1 files changed, 24 insertions, 11 deletions

diff --git a/lib/kernel/src/wrap_log_reader.erl b/lib/kernel/src/wrap_log_reader.erl
index fabaa07752..c41e0091e4 100644
--- a/lib/kernel/src/wrap_log_reader.erl
+++ b/lib/kernel/src/wrap_log_reader.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1998-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2011. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -41,6 +41,8 @@
 	 first_no :: non_neg_integer() | 'one' % first read file number
 	}).
 
+-opaque continuation() :: #wrap_reader{}.
+
 %%
 %%  Exported functions
 %%
@@ -50,9 +52,11 @@
 %% is not yet reached, we are on the first 'round' of filling the wrap
 %% files.
 
--type open_ret() :: {'ok', #wrap_reader{}} | {'error', tuple()}.
+-type open_ret() :: {'ok', Continuation :: continuation()}
+                  | {'error', Reason :: tuple()}.
 
--spec open(atom() | string()) -> open_ret().
+-spec open(Filename) -> open_ret() when
+      Filename :: string() | atom().
 
 open(File) when is_atom(File) ->
     open(atom_to_list(File));
@@ -77,7 +81,9 @@ open(File) when is_list(File) ->
 	    Error
     end.
 
--spec open(atom() | string(), integer()) -> open_ret().
+-spec open(Filename, N) -> open_ret() when
+      Filename :: string() | atom(),
+      N :: integer().
 
 open(File, FileNo) when is_atom(File), is_integer(FileNo) ->
     open(atom_to_list(File), FileNo);
@@ -100,22 +106,29 @@ open(File, FileNo) when is_list(File), is_integer(FileNo) ->
 	    Error
     end.
 
--spec close(#wrap_reader{}) -> 'ok' | {'error', atom()}.
+-spec close(Continuation) -> 'ok' | {'error', Reason} when
+      Continuation :: continuation(),
+      Reason :: file:posix().
 
 close(#wrap_reader{fd = FD}) ->
     file:close(FD).
 
--type chunk_ret() :: {#wrap_reader{}, [term()]}
-                   | {#wrap_reader{}, [term()], non_neg_integer()}
-                   | {#wrap_reader{}, 'eof'}
-                   | {'error', term()}.
+-type chunk_ret() :: {Continuation2, Terms :: [term()]}
+                   | {Continuation2,
+                      Terms :: [term()],
+                      Badbytes :: non_neg_integer()}
+                   | {Continuation2, 'eof'}
+                   | {'error', Reason :: term()}.
 
--spec chunk(#wrap_reader{}) -> chunk_ret().
+-spec chunk(Continuation) -> chunk_ret() when
+      Continuation :: continuation().
 
 chunk(WR = #wrap_reader{}) ->
     chunk(WR, ?MAX_CHUNK_SIZE, 0).
 
--spec chunk(#wrap_reader{}, 'infinity' | pos_integer()) -> chunk_ret().
+-spec chunk(Continuation, N) -> chunk_ret() when
+      Continuation :: continuation(),
+      N :: infinity | pos_integer().
 
 chunk(WR = #wrap_reader{}, infinity) ->
     chunk(WR, ?MAX_CHUNK_SIZE, 0);