File 1432-snmp-example-ex2-Corrected-various-dialyzer-issues.patch of Package erlang
From 84da3f725de460f41aefc6dfc0a1020b0275c389 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Tue, 12 Jul 2022 18:46:52 +0200
Subject: [PATCH 2/3] [snmp|example|ex2] Corrected various dialyzer issues
OTP-18180
---
lib/snmp/examples/ex2/snmp_ex2_manager.erl | 13 ++----
.../ex2/snmp_ex2_simple_standard_test.erl | 44 +++++++++----------
2 files changed, 25 insertions(+), 32 deletions(-)
diff --git a/lib/snmp/examples/ex2/snmp_ex2_manager.erl b/lib/snmp/examples/ex2/snmp_ex2_manager.erl
index b3faa54a15..d5e17f8696 100644
--- a/lib/snmp/examples/ex2/snmp_ex2_manager.erl
+++ b/lib/snmp/examples/ex2/snmp_ex2_manager.erl
@@ -133,12 +133,7 @@ write_config(Dir, Conf) ->
end.
start_manager(Opts) ->
- case snmpm:start_link(Opts) of
- ok ->
- ok;
- Error ->
- error({failed_starting_manager, Error})
- end.
+ ok = snmpm:start_link(Opts).
register_user() ->
case snmpm:register_user(?USER, ?USER_MOD, self()) of
@@ -397,16 +392,16 @@ handle_pdu(TargetName, ReqId, SnmpResponse, Server) when is_pid(Server) ->
handle_trap(TargetName, SnmpTrap, Server) when is_pid(Server) ->
report_callback(Server, handle_trap, {TargetName, SnmpTrap}),
- ok.
+ ignore.
handle_inform(TargetName, SnmpInform, Server) when is_pid(Server) ->
report_callback(Server, handle_inform, {TargetName, SnmpInform}),
- ok.
+ ignore.
handle_report(TargetName, SnmpReport, Server) when is_pid(Server) ->
report_callback(Server, handle_inform, {TargetName, SnmpReport}),
- ok.
+ ignore.
handle_invalid_result(In, Out, Server) when is_pid(Server) ->
report_callback(Server, handle_invalid_result, {In, Out}),
diff --git a/lib/snmp/examples/ex2/snmp_ex2_simple_standard_test.erl b/lib/snmp/examples/ex2/snmp_ex2_simple_standard_test.erl
index e8f748c337..7439f36416 100644
--- a/lib/snmp/examples/ex2/snmp_ex2_simple_standard_test.erl
+++ b/lib/snmp/examples/ex2/snmp_ex2_simple_standard_test.erl
@@ -246,34 +246,32 @@ verify_vbs([Vb|T], NameAndTypes, Acc) ->
Acc2 = lists:flatten(io_lib:format("~s~n ~s", [Acc, Val])),
verify_vbs(T, NameAndTypes, Acc2).
-verify_vb(#varbind{oid = Oid, variabletype = Type, value = Val} = Vb,
- NameAndTypes) ->
+verify_vb(#varbind{oid = Oid} = Vb, NameAndTypes) ->
case lists:reverse(Oid) of
[0|RevOid] ->
- case snmp_ex2_manager:oid_to_name(lists:reverse(RevOid)) of
- {ok, Name} ->
- case lists:keysearch(Name, 1, NameAndTypes) of
- {value, {Name, Type}} ->
- Val;
- {value, {Name, WrongType}} ->
- error({wrong_type, {WrongType, Vb}});
- false ->
- error({unexpected_name, {Name, Vb}})
- end;
- {error, Reason} ->
- error({unexpected_oid, {Reason, Vb}})
- end;
+ verify_vb_value(lists:reverse(RevOid), Vb, NameAndTypes);
_ ->
- case lists:keysearch(Oid, 1, NameAndTypes) of
- {value, {Oid, Type}} ->
- Val;
- {value, {Oid, WrongType}} ->
- error({wrong_type, {WrongType, Vb}});
- false ->
- error({unexpected_oid, Vb})
- end
+ verify_vb_value(Oid, Vb, NameAndTypes)
end.
+verify_vb_value(Oid,
+ #varbind{variabletype = Type, value = Val} = Vb,
+ NameAndTypes) ->
+ case snmp_ex2_manager:oid_to_name(Oid) of
+ {ok, Name} ->
+ case lists:keysearch(Name, 1, NameAndTypes) of
+ {value, {Name, Type}} ->
+ Val;
+ {value, {Name, WrongType}} ->
+ error({wrong_type, {WrongType, Vb}});
+ false ->
+ error({unexpected_name, {Name, Vb}})
+ end;
+ {error, Reason} ->
+ error({unexpected_oid, {Reason, Vb}})
+ end.
+
+
std_mib(MibName) ->
j(std_dir(), MibName).
--
2.35.3