diff options
author | Siri Hansen <[email protected]> | 2011-11-30 10:39:22 +0100 |
---|---|---|
committer | Siri Hansen <[email protected]> | 2011-11-30 10:39:22 +0100 |
commit | 598001378c7328fff3fa7b08cec1741b3b536226 (patch) | |
tree | 3bd9f98981080b1f004b61ed751547e467548dbd /lib/stdlib/doc | |
parent | c1d51c600ee44c630f997d818e074ca1da7da429 (diff) | |
parent | 466b964d3cd5cd599d1f9513f3b1a77156ad6578 (diff) | |
download | otp-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/doc')
-rw-r--r-- | lib/stdlib/doc/src/gen_event.xml | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/lib/stdlib/doc/src/gen_event.xml b/lib/stdlib/doc/src/gen_event.xml index 24bcb419fe..79a0c8ad89 100644 --- a/lib/stdlib/doc/src/gen_event.xml +++ b/lib/stdlib/doc/src/gen_event.xml @@ -195,12 +195,13 @@ gen_event:stop -----> Module:terminate/2 handlers using the same callback module.</p> <p><c>Args</c> is an arbitrary term which is passed as the argument to <c>Module:init/1</c>.</p> - <p>If <c>Module:init/1</c> returns a correct value, the event - manager adds the event handler and this function returns + <p>If <c>Module:init/1</c> returns a correct value indicating + successful completion, the event manager adds the event + handler and this function returns <c>ok</c>. If <c>Module:init/1</c> fails with <c>Reason</c> or - returns an unexpected value <c>Term</c>, the event handler is + returns <c>{error,Reason}</c>, the event handler is ignored and this function returns <c>{'EXIT',Reason}</c> or - <c>Term</c>, respectively.</p> + <c>{error,Reason}</c>, respectively.</p> </desc> </func> <func> @@ -448,12 +449,13 @@ gen_event:stop -----> Module:terminate/2 </section> <funcs> <func> - <name>Module:init(InitArgs) -> {ok,State} | {ok,State,hibernate}</name> + <name>Module:init(InitArgs) -> {ok,State} | {ok,State,hibernate} | {error,Reason}</name> <fsummary>Initialize an event handler.</fsummary> <type> <v>InitArgs = Args | {Args,Term}</v> <v> Args = Term = term()</v> <v>State = term()</v> + <v>Reason = term()</v> </type> <desc> <p>Whenever a new event handler is added to an event manager, @@ -470,8 +472,9 @@ gen_event:stop -----> Module:terminate/2 the argument provided in the function call/return tuple and <c>Term</c> is the result of terminating the old event handler, see <c>gen_event:swap_handler/3</c>.</p> - <p>The function should return <c>{ok,State}</c> or <c>{ok,State, hibernate}</c> - where <c>State</c> is the initial internal state of the event handler.</p> + <p>If successful, the function should return <c>{ok,State}</c> + or <c>{ok,State,hibernate}</c> where <c>State</c> is the + initial internal state of the event handler.</p> <p>If <c>{ok,State,hibernate}</c> is returned, the event manager will go into hibernation (by calling <seealso marker="proc_lib#hibernate/3">proc_lib:hibernate/3</seealso>), |