diff options
author | Hans Bolinder <[email protected]> | 2013-05-06 12:16:38 +0200 |
---|---|---|
committer | Hans Bolinder <[email protected]> | 2013-05-06 12:16:38 +0200 |
commit | 551d92fead40277f2152a7351ed6ab19b623b16b (patch) | |
tree | 7812afb9446ff1c7a8596a266a1cbd81eacc5f96 /lib/stdlib/src/dets_server.erl | |
parent | 0dc5a00011d1d24b68c9d43ff608415f84c50499 (diff) | |
parent | 2324dec9fb37e301413c74acf1dce8ae3c29fc48 (diff) | |
download | otp-551d92fead40277f2152a7351ed6ab19b623b16b.tar.gz otp-551d92fead40277f2152a7351ed6ab19b623b16b.tar.bz2 otp-551d92fead40277f2152a7351ed6ab19b623b16b.zip |
Merge branch 'hb/unmatched_returns/OTP-10908'
* hb/unmatched_returns/OTP-10908:
Fix unmatched_returns warnings in Kernel
Fix a minor bug in ets:tabfile_info() and ets:file2tab()
Fix unmatched_returns warning in Kernel
Fix unmatched_return warnings in sasl
Fix unmatched_return warnings in kernel
Fix unmatched_return warning in erl_prim_loader
Fix unmatched_return warnings in stdlib
Fix unmatched_returns warnings in STDLIB and Kernel
Diffstat (limited to 'lib/stdlib/src/dets_server.erl')
-rw-r--r-- | lib/stdlib/src/dets_server.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/stdlib/src/dets_server.erl b/lib/stdlib/src/dets_server.erl index 931112088e..268c201047 100644 --- a/lib/stdlib/src/dets_server.erl +++ b/lib/stdlib/src/dets_server.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2001-2009. All Rights Reserved. +%% Copyright Ericsson AB 2001-2013. 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 @@ -241,8 +241,8 @@ ensure_started() -> init() -> set_verbose(verbose_flag()), process_flag(trap_exit, true), - ets:new(?REGISTRY, [set, named_table]), - ets:new(?OWNERS, [set, named_table]), + ?REGISTRY = ets:new(?REGISTRY, [set, named_table]), + ?OWNERS = ets:new(?OWNERS, [set, named_table]), ets:new(?STORE, [duplicate_bag]). verbose_flag() -> @@ -338,7 +338,7 @@ handle_close(State, Req, {FromPid,_Tag}=From, Tab) -> [{Tab, _Counter, Pid}] -> do_unlink(Store, FromPid), true = ets:match_delete(Store, {FromPid, Tab}), - [true = ets:insert(Store, K) || K <- Keep], + true = ets:insert(Store, Keep), ets:update_counter(?REGISTRY, Tab, -1), pending_call(Tab, Pid, make_ref(), From, [], remove_user, State) |