diff options
| author | Siri Hansen <[email protected]> | 2014-07-10 14:21:59 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2014-07-10 14:21:59 +0200 |
| commit | 11bb83d08db64fec91021b4c77b23a365bbbc8ce (patch) | |
| tree | ea96b9454a7fbf0eceb5baef5f5a14f9e5b02977 /lib/stdlib/src | |
| parent | cfb2acc734e7173b66c09ed3dd33bc35ae6ffdc8 (diff) | |
| parent | bbf3e70e806b796611d14d4660372072dce8bffb (diff) | |
| download | otp-11bb83d08db64fec91021b4c77b23a365bbbc8ce.tar.gz otp-11bb83d08db64fec91021b4c77b23a365bbbc8ce.tar.bz2 otp-11bb83d08db64fec91021b4c77b23a365bbbc8ce.zip | |
Merge branch 'siri/sys-FormFunc-spec/OTP-11800' into maint
* siri/sys-FormFunc-spec/OTP-11800:
Fix spec of format function in sys
Diffstat (limited to 'lib/stdlib/src')
| -rw-r--r-- | lib/stdlib/src/sys.erl | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/stdlib/src/sys.erl b/lib/stdlib/src/sys.erl index e25cc25f57..d3ba09ce82 100644 --- a/lib/stdlib/src/sys.erl +++ b/lib/stdlib/src/sys.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2013. All Rights Reserved. +%% Copyright Ericsson AB 1996-2014. 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 @@ -46,7 +46,7 @@ {N :: non_neg_integer(), [{Event :: system_event(), FuncState :: _, - FormFunc :: dbg_fun()}]}} + FormFunc :: format_fun()}]}} | {'statistics', {file:date_time(), {'reductions', non_neg_integer()}, MessagesIn :: non_neg_integer(), @@ -57,6 +57,10 @@ Event :: system_event(), ProcState :: _) -> 'done' | (NewFuncState :: _)). +-type format_fun() :: fun((Device :: io:device() | file:io_device(), + Event :: system_event(), + Extra :: term()) -> any()). + %%----------------------------------------------------------------- %% System messages %%----------------------------------------------------------------- @@ -346,7 +350,7 @@ handle_system_msg(SysState, Msg, From, Parent, Mod, Debug, Misc, Hib) -> %%----------------------------------------------------------------- -spec handle_debug(Debug, FormFunc, Extra, Event) -> [dbg_opt()] when Debug :: [dbg_opt()], - FormFunc :: dbg_fun(), + FormFunc :: format_fun(), Extra :: term(), Event :: system_event(). handle_debug([{trace, true} | T], FormFunc, State, Event) -> |