diff options
| author | Hans Bolinder <[email protected]> | 2016-02-22 13:24:42 +0100 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2016-02-22 13:24:42 +0100 |
| commit | b8cd565e69ee2affbfeee3a9d924265b9222edb9 (patch) | |
| tree | 404043a232715984296b5550ff8620d15924a910 /lib/mnesia/src/mnesia_bup.erl | |
| parent | 2c370def9ddbc34efb16f5dbe8064350c140183a (diff) | |
| parent | 8c5f8128fc167d67fbd5d63205f35eade4cc741f (diff) | |
| download | otp-b8cd565e69ee2affbfeee3a9d924265b9222edb9.tar.gz otp-b8cd565e69ee2affbfeee3a9d924265b9222edb9.tar.bz2 otp-b8cd565e69ee2affbfeee3a9d924265b9222edb9.zip | |
Merge branch 'maint'
* maint:
Fix a few dialyzer warnings
Diffstat (limited to 'lib/mnesia/src/mnesia_bup.erl')
| -rw-r--r-- | lib/mnesia/src/mnesia_bup.erl | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/mnesia/src/mnesia_bup.erl b/lib/mnesia/src/mnesia_bup.erl index 1f150ae38b..8b1143a352 100644 --- a/lib/mnesia/src/mnesia_bup.erl +++ b/lib/mnesia/src/mnesia_bup.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2011. All Rights Reserved. +%% Copyright Ericsson AB 1996-2016. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -112,7 +112,7 @@ iter(R, Header, Schema, Fun, Acc, BupItems) -> safe_apply(R, write, [_, Items]) when Items =:= [] -> R; safe_apply(R, What, Args) -> - Abort = fun(Re) -> abort_restore(R, What, Args, Re) end, + Abort = abort_restore_fun(R, What, Args), Mod = R#restore.bup_module, try apply(Mod, What, Args) of {ok, Opaque, Items} when What =:= read -> @@ -127,6 +127,10 @@ safe_apply(R, What, Args) -> Abort(Re) end. +-spec abort_restore_fun(_, _, _) -> fun((_) -> no_return()). +abort_restore_fun(R, What, Args) -> + fun(Re) -> abort_restore(R, What, Args, Re) end. + abort_restore(R = #restore{bup_module=Mod}, What, Args, Reason) -> dbg_out("Restore aborted. ~p:~p~p -> ~p~n", [Mod, What, Args, Reason]), |