diff options
| author | Hans Bolinder <[email protected]> | 2012-07-03 13:05:12 +0200 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2012-07-03 13:05:12 +0200 |
| commit | e077fb6fd3de258fa3cd4467fa94ad6b1d974368 (patch) | |
| tree | 97e6688ed384eadffafdb00faa08997ecfce157f /lib/kernel/src | |
| parent | a1129e9c2c67f328de00262ec9e81c177d45d8a3 (diff) | |
| parent | 14f6a66f6410e1665ad39e95158420b0a45634d6 (diff) | |
| download | otp-e077fb6fd3de258fa3cd4467fa94ad6b1d974368.tar.gz otp-e077fb6fd3de258fa3cd4467fa94ad6b1d974368.tar.bz2 otp-e077fb6fd3de258fa3cd4467fa94ad6b1d974368.zip | |
Merge branch 'maint'
* maint:
Correct the type of the disk log header
Diffstat (limited to 'lib/kernel/src')
| -rw-r--r-- | lib/kernel/src/disk_log.erl | 7 | ||||
| -rw-r--r-- | lib/kernel/src/disk_log.hrl | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/lib/kernel/src/disk_log.erl b/lib/kernel/src/disk_log.erl index f5f972c112..5b1efcd395 100644 --- a/lib/kernel/src/disk_log.erl +++ b/lib/kernel/src/disk_log.erl @@ -282,7 +282,8 @@ change_notify(Log, Pid, NewNotify) -> -spec change_header(Log, Header) -> 'ok' | {'error', Reason} when Log :: log(), - Header :: {head, dlog_head_opt()} | {head_func, mfa()}, + Header :: {head, dlog_head_opt()} + | {head_func, MFA :: {atom(), atom(), list()}}, Reason :: no_such_log | nonode | {read_only_mode, Log} | {blocked_log, Log} | {badarg, head}. change_header(Log, NewHead) -> @@ -336,7 +337,9 @@ format_error(Error) -> ok | {blocked, QueueLogRecords :: boolean()}} | {node, Node :: node()} | {distributed, Dist :: local | [node()]} - | {head, Head :: none | {head, term()} | mfa()} + | {head, Head :: none + | {head, term()} + | (MFA :: {atom(), atom(), list()})} | {no_written_items, NoWrittenItems ::non_neg_integer()} | {full, Full :: boolean} | {no_current_bytes, non_neg_integer()} diff --git a/lib/kernel/src/disk_log.hrl b/lib/kernel/src/disk_log.hrl index 259967650f..242a25a7a6 100644 --- a/lib/kernel/src/disk_log.hrl +++ b/lib/kernel/src/disk_log.hrl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2011. All Rights Reserved. +%% Copyright Ericsson AB 1997-2012. 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 @@ -74,7 +74,7 @@ | {distributed, Nodes :: [node()]} | {notify, boolean()} | {head, Head :: dlog_head_opt()} - | {head_func, mfa()} + | {head_func, MFA :: {atom(), atom(), list()}} | {mode, Mode :: dlog_mode()}. -type dlog_options() :: [dlog_option()]. -type dlog_repair() :: 'truncate' | boolean(). |