diff options
| author | Björn Gustavsson <[email protected]> | 2013-02-21 14:01:02 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2013-05-31 14:52:13 +0200 |
| commit | a0340855b3d92869ade4c48886685ff75fe17c8c (patch) | |
| tree | 8f6098885f66e69861943b3855388b75bb5079f4 | |
| parent | c4565ebd3af11ea8a7a010470b01317b5a4fc230 (diff) | |
| download | otp-a0340855b3d92869ade4c48886685ff75fe17c8c.tar.gz otp-a0340855b3d92869ade4c48886685ff75fe17c8c.tar.bz2 otp-a0340855b3d92869ade4c48886685ff75fe17c8c.zip | |
asn1ct_name: Remove broken active/1
active/1 always returned 'true' (curr(Var) can never return 'nil',
except if Var =:= 'nil'). Therefore, we can eliminate its use and
remove it.
| -rw-r--r-- | lib/asn1/src/asn1ct_gen_per.erl | 7 | ||||
| -rw-r--r-- | lib/asn1/src/asn1ct_gen_per_rt2ct.erl | 7 | ||||
| -rw-r--r-- | lib/asn1/src/asn1ct_name.erl | 7 |
3 files changed, 2 insertions, 19 deletions
diff --git a/lib/asn1/src/asn1ct_gen_per.erl b/lib/asn1/src/asn1ct_gen_per.erl index fac233532b..2fc970cad9 100644 --- a/lib/asn1/src/asn1ct_gen_per.erl +++ b/lib/asn1/src/asn1ct_gen_per.erl @@ -115,12 +115,7 @@ gen_encode_user(Erules,D) when is_record(D,typedef) -> gen_encode_prim(Erules,D,DoTag) -> - Value = case asn1ct_name:active(val) of - true -> - asn1ct_gen:mk_var(asn1ct_name:curr(val)); - false -> - "Val" - end, + Value = asn1ct_gen:mk_var(asn1ct_name:curr(val)), gen_encode_prim(Erules,D,DoTag,Value). gen_encode_prim(Erules,D,DoTag,Value) when is_record(D,type) -> diff --git a/lib/asn1/src/asn1ct_gen_per_rt2ct.erl b/lib/asn1/src/asn1ct_gen_per_rt2ct.erl index 81d8cdcae6..83f8feaf94 100644 --- a/lib/asn1/src/asn1ct_gen_per_rt2ct.erl +++ b/lib/asn1/src/asn1ct_gen_per_rt2ct.erl @@ -105,12 +105,7 @@ gen_encode_user(Erules,D) when is_record(D,typedef) -> gen_encode_prim(Erules,D,DoTag) -> - Value = case asn1ct_name:active(val) of - true -> - asn1ct_gen:mk_var(asn1ct_name:curr(val)); - false -> - "Val" - end, + Value = asn1ct_gen:mk_var(asn1ct_name:curr(val)), gen_encode_prim(Erules,D,DoTag,Value). diff --git a/lib/asn1/src/asn1ct_name.erl b/lib/asn1/src/asn1ct_name.erl index 4674048a13..c9709d352f 100644 --- a/lib/asn1/src/asn1ct_name.erl +++ b/lib/asn1/src/asn1ct_name.erl @@ -23,7 +23,6 @@ -export([start/0, curr/1, clear/0, - active/1, prev/1, next/1, all/1, @@ -62,12 +61,6 @@ name_server_loop({Ref, Parent} = Monitor,Vars) -> exit(Reason) end. -active(V) -> - case curr(V) of - nil -> false; - _ -> true - end. - req(Req) -> Pid = get(?MODULE), Ref = monitor(process, Pid), |