diff options
| author | Björn Gustavsson <[email protected]> | 2014-02-24 11:56:45 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2014-02-24 11:56:45 +0100 |
| commit | e70a2dc2e0fc2ef38a7cdf5bbf13313408003cea (patch) | |
| tree | 124d3d098d88887146a1219179240e4c01bb93db /lib/megaco/src/binary/megaco_binary_encoder_lib.erl | |
| parent | f56c221205f6e74f027dd74c86ba5ae1e504d318 (diff) | |
| parent | 1bdb47b00faff39994a041c6d9a291a2c68143d9 (diff) | |
| download | otp-e70a2dc2e0fc2ef38a7cdf5bbf13313408003cea.tar.gz otp-e70a2dc2e0fc2ef38a7cdf5bbf13313408003cea.tar.bz2 otp-e70a2dc2e0fc2ef38a7cdf5bbf13313408003cea.zip | |
Merge branch 'bjorn/asn1/deprecations/OTP-11731'
* bjorn/asn1/deprecations/OTP-11731:
Remove or de-emphasize references to the deprecated asn1rt module
Deprecate asn1 functions
Diffstat (limited to 'lib/megaco/src/binary/megaco_binary_encoder_lib.erl')
| -rw-r--r-- | lib/megaco/src/binary/megaco_binary_encoder_lib.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/megaco/src/binary/megaco_binary_encoder_lib.erl b/lib/megaco/src/binary/megaco_binary_encoder_lib.erl index 8a4f4e7509..7d82262a59 100644 --- a/lib/megaco/src/binary/megaco_binary_encoder_lib.erl +++ b/lib/megaco/src/binary/megaco_binary_encoder_lib.erl @@ -66,7 +66,7 @@ version_of(_EC, Binary, 3, [AsnModV1, AsnModV2, AsnModV3]) version_of([], _Binary, Err) -> {error, {decode_failed, lists:reverse(Err)}}; version_of([AsnMod|AsnMods], Binary, Errs) when is_atom(AsnMod) -> - case (catch asn1rt:decode(AsnMod, 'MegacoMessage', Binary)) of + case (catch AsnMod:decode('MegacoMessage', Binary)) of {ok, M} -> V = (M#'MegacoMessage'.mess)#'Message'.version, {ok, V}; @@ -82,14 +82,14 @@ version_of([AsnMod|AsnMods], Binary, Errs) when is_atom(AsnMod) -> encode_message([native], MegaMsg, AsnMod, _TransMod, binary) when is_record(MegaMsg, 'MegacoMessage') -> - asn1rt:encode(AsnMod, 'MegacoMessage', MegaMsg); + AsnMod:encode('MegacoMessage', MegaMsg); encode_message(EC, MegaMsg, AsnMod, TransMod, binary) when is_list(EC) andalso is_record(MegaMsg, 'MegacoMessage') -> case (catch TransMod:tr_message(MegaMsg, encode, EC)) of {'EXIT', Reason} -> {error, Reason}; MegaMsg2 -> - asn1rt:encode(AsnMod, 'MegacoMessage', MegaMsg2) + AsnMod:encode('MegacoMessage', MegaMsg2) end; encode_message(EC, MegaMsg, AsnMod, TransMod, io_list) -> case encode_message(EC, MegaMsg, AsnMod, TransMod, binary) of @@ -276,7 +276,7 @@ decode_message_dynamic(_EC, _BadBin, _Mods, _Type) -> decode_message(EC, Bin, AsnMod, TransMod, _) -> - case asn1rt:decode(AsnMod, 'MegacoMessage', Bin) of + case AsnMod:decode('MegacoMessage', Bin) of {ok, MegaMsg} -> case EC of [native] -> |