diff options
| author | Patrik Nyblom <[email protected]> | 2012-02-07 16:05:14 +0100 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2012-02-07 16:05:14 +0100 |
| commit | e9e34e8bd838ef99ed3bd0e88ff490614cbe78a1 (patch) | |
| tree | aa20fea8c921b3460f8868ce905a4e2243d34dac /lib/kernel/src | |
| parent | 8853793b0edd01947829840f90c91a1e2468cc36 (diff) | |
| parent | a02909a11a33880b486135b396aabfd3060b8d8d (diff) | |
| download | otp-e9e34e8bd838ef99ed3bd0e88ff490614cbe78a1.tar.gz otp-e9e34e8bd838ef99ed3bd0e88ff490614cbe78a1.tar.bz2 otp-e9e34e8bd838ef99ed3bd0e88ff490614cbe78a1.zip | |
Merge branch 'pan/bif_specs/OTP-9684'
* pan/bif_specs/OTP-9684:
Correct docs, comments and dialyzer tests
Reintroduce sensitive BIFs in erl_bif_types
Correct dializer errors in erlang.erl and others
Make erlang doc use specs from erlang.erl
erlang.erl with specs for all (but one) bif
Diffstat (limited to 'lib/kernel/src')
| -rw-r--r-- | lib/kernel/src/disk_log_1.erl | 2 | ||||
| -rw-r--r-- | lib/kernel/src/error_handler.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/kernel/src/disk_log_1.erl b/lib/kernel/src/disk_log_1.erl index 266df84a03..0cb1ed579a 100644 --- a/lib/kernel/src/disk_log_1.erl +++ b/lib/kernel/src/disk_log_1.erl @@ -1495,7 +1495,7 @@ fwrite_close2(Fd, FileName, B) -> pwrite_close2(Fd, FileName, Position, B) -> case file:pwrite(Fd, Position, B) of ok -> ok; - Error -> file_error(FileName, {error, Error}) + {error,Error} -> file_error(FileName, {error, Error}) end. position2(Fd, FileName, Pos) -> diff --git a/lib/kernel/src/error_handler.erl b/lib/kernel/src/error_handler.erl index a67b11a888..f8bc5f499c 100644 --- a/lib/kernel/src/error_handler.erl +++ b/lib/kernel/src/error_handler.erl @@ -90,7 +90,7 @@ int() -> int. crash(Fun, Args) -> crash({Fun,Args,[]}). --spec crash(atom(), atom(), arity()) -> no_return(). +-spec crash(atom(), atom(), arity() | [term()]) -> no_return(). crash(M, F, A) -> crash({M,F,A,[]}). |