aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib/src
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2011-11-30 10:39:22 +0100
committerSiri Hansen <[email protected]>2011-11-30 10:39:22 +0100
commit598001378c7328fff3fa7b08cec1741b3b536226 (patch)
tree3bd9f98981080b1f004b61ed751547e467548dbd /lib/stdlib/src
parentc1d51c600ee44c630f997d818e074ca1da7da429 (diff)
parent466b964d3cd5cd599d1f9513f3b1a77156ad6578 (diff)
downloadotp-598001378c7328fff3fa7b08cec1741b3b536226.tar.gz
otp-598001378c7328fff3fa7b08cec1741b3b536226.tar.bz2
otp-598001378c7328fff3fa7b08cec1741b3b536226.zip
Merge branch 'siri/stdlib/dialyzer-log_mf_h/OTP-9754'
* siri/stdlib/dialyzer-log_mf_h/OTP-9754: Fix dialyzer warning about gen_event callback init/1 in log_mf_h
Diffstat (limited to 'lib/stdlib/src')
-rw-r--r--lib/stdlib/src/gen_event.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/stdlib/src/gen_event.erl b/lib/stdlib/src/gen_event.erl
index 9879b76391..3317b30e5c 100644
--- a/lib/stdlib/src/gen_event.erl
+++ b/lib/stdlib/src/gen_event.erl
@@ -70,7 +70,8 @@
-callback init(InitArgs :: term()) ->
{ok, State :: term()} |
- {ok, State :: term(), hibernate}.
+ {ok, State :: term(), hibernate} |
+ {error, Reason :: term()}.
-callback handle_event(Event :: term(), State :: term()) ->
{ok, NewState :: term()} |
{ok, NewState :: term(), hibernate} |