diff options
| author | Björn Gustavsson <[email protected]> | 2010-11-22 12:16:00 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2010-11-22 12:16:00 +0100 |
| commit | 412f67b09a03b590fddca1d4d36ff079a49cc911 (patch) | |
| tree | 86069473724b93b3810035301fed098c15f55d71 /erts/preloaded/src | |
| parent | 2e46e9dc0dbbba67780e08863b8605ffe567ced0 (diff) | |
| parent | ef0fbe01537cd831f9b1fb09e0fd3ed84757183f (diff) | |
| download | otp-412f67b09a03b590fddca1d4d36ff079a49cc911.tar.gz otp-412f67b09a03b590fddca1d4d36ff079a49cc911.tar.bz2 otp-412f67b09a03b590fddca1d4d36ff079a49cc911.zip | |
Merge branch 'ks/init-spec-fixes' into dev
* ks/init-spec-fixes:
init: Fix two erroneous specs
Diffstat (limited to 'erts/preloaded/src')
| -rw-r--r-- | erts/preloaded/src/init.erl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/erts/preloaded/src/init.erl b/erts/preloaded/src/init.erl index 3ab9a1cd6d..24430a3d40 100644 --- a/erts/preloaded/src/init.erl +++ b/erts/preloaded/src/init.erl @@ -72,6 +72,7 @@ script_id = [], loaded = [], subscribed = []}). +-type state() :: #state{}. -define(ON_LOAD_HANDLER, init__boot__on_load_handler). @@ -146,10 +147,10 @@ restart() -> init ! {stop,restart}, ok. -spec reboot() -> 'ok'. reboot() -> init ! {stop,reboot}, ok. --spec stop() -> no_return(). +-spec stop() -> 'ok'. stop() -> init ! {stop,stop}, ok. --spec stop(non_neg_integer() | string()) -> no_return(). +-spec stop(non_neg_integer() | string()) -> 'ok'. stop(Status) -> init ! {stop,{stop,Status}}, ok. -spec boot([binary()]) -> no_return(). @@ -278,7 +279,7 @@ crash(String, List) -> halt(halt_string(String, List)). %% Status is {InternalStatus,ProvidedStatus} --spec boot_loop(pid(), #state{}) -> no_return(). +-spec boot_loop(pid(), state()) -> no_return(). boot_loop(BootPid, State) -> receive {BootPid,loaded,ModLoaded} -> |