File 0455-snmp-Add-proper-version.patch of Package erlang
From 229795aba1d4da773938715f2e5122d4885af826 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Fri, 7 Sep 2018 18:31:16 +0200
Subject: [PATCH 5/5] [snmp] Add proper version
Also fixed case clause.
OTP-15287 (ERIERL-206)
---
lib/snmp/doc/src/notes.xml | 4 ++--
lib/snmp/src/misc/snmp_log.erl | 17 +++++++----------
lib/snmp/vsn.mk | 4 ++--
3 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index f64e0cca97..1607363ad1 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -4,7 +4,7 @@
<chapter>
<header>
<copyright>
- <year>1996</year><year>2016</year>
+ <year>1996</year><year>2018</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
@@ -52,7 +52,7 @@
</list>
</section>
-</section>
+ </section>
<section><title>SNMP 5.2.4</title>
diff --git a/lib/snmp/src/misc/snmp_log.erl b/lib/snmp/src/misc/snmp_log.erl
index ce93b95c8e..5713c14912 100644
--- a/lib/snmp/src/misc/snmp_log.erl
+++ b/lib/snmp/src/misc/snmp_log.erl
@@ -652,8 +652,8 @@ do_log_to_file(Log, TextFile, Mibs, Start, Stop) ->
{Tag, S} when (Tag =:= ok) orelse (Tag =:= error) ->
io:format(Fd, "~s", [S]),
Tag;
- X ->
- X
+ Ignore ->
+ Ignore
end
end,
Res = (catch loop(Log, Write)),
@@ -696,8 +696,8 @@ loop({Cont, Terms}, Log, Write, NumOK, NumERR) ->
loop(disk_log:chunk(Log, Cont), Log, Write,
NumOK+AddedOK, NumERR+AddedERR)
catch
- T:E ->
- {error, {T, E}}
+ C:E ->
+ {error, {C, E, erlang:get_stacktrace()}}
end;
loop({Cont, Terms, BadBytes}, Log, Write, NumOK, NumERR) ->
error_logger:error_msg("Skipping ~w bytes while converting ~p~n~n",
@@ -707,8 +707,8 @@ loop({Cont, Terms, BadBytes}, Log, Write, NumOK, NumERR) ->
loop(disk_log:chunk(Log, Cont), Log, Write,
NumOK+AddedOK, NumERR+AddedERR)
catch
- T:E ->
- {error, {T, E}}
+ C:E ->
+ {error, {C, E, erlang:get_stacktrace()}}
end.
@@ -718,16 +718,13 @@ loop_terms(Terms, Write) ->
loop_terms([], _Write, NumOK, NumERR) ->
{ok, {NumOK, NumERR}};
loop_terms([Term|Terms], Write, NumOK, NumERR) ->
- try Write(Term) of
+ case Write(Term) of
ok ->
loop_terms(Terms, Write, NumOK+1, NumERR);
error ->
loop_terms(Terms, Write, NumOK, NumERR+1);
_ ->
loop_terms(Terms, Write, NumOK, NumERR)
- catch
- T:E ->
- {error, {T, E, erlang:get_stacktrace()}}
end.
--
2.16.4