3 files changed, 18 insertions, 19 deletions
diff --git a/lib/snmp/src/misc/snmp_conf.erl b/lib/snmp/src/misc/snmp_conf.erl
index d73291764d..20b7af0373 100644
--- a/lib/snmp/src/misc/snmp_conf.erl
+++ b/lib/snmp/src/misc/snmp_conf.erl
@@ -164,6 +164,14 @@ no_filter(X) -> X.
 %% An ordering function (A, B) shall return true iff
 %% A is less than or equal to B i.e shall return
 %% false iff A is to be ordered after B.
+
+-spec keyorder(N, A, B, Keys) ->
+                      boolean() when
+      N    :: integer(),
+      A    :: tuple(),
+      B    :: tuple(),
+      Keys :: maybe_improper_list().
+
 keyorder(N, A, B, _) when element(N, A) == element(N, B) ->
     true;
 keyorder(N, A, B, [Key | _])
diff --git a/lib/snmp/src/misc/snmp_config.erl b/lib/snmp/src/misc/snmp_config.erl
index 26e85897f4..3104f2a096 100644
--- a/lib/snmp/src/misc/snmp_config.erl
+++ b/lib/snmp/src/misc/snmp_config.erl
@@ -96,17 +96,15 @@
 	]).
 
 
--export_type([void/0,
-	      order_config_entry_function/0,
+-export_type([
+              order_config_entry_function/0,
 	      check_config_entry_function/0,
-	      write_config_function/0]).
+	      write_config_function/0
+             ]).
 
 
 %%----------------------------------------------------------------------
 
--type void() :: term(). % Any value - ignored
-
-
 %%----------------------------------------------------------------------
 %% Handy SNMP configuration
 %%----------------------------------------------------------------------
@@ -1106,6 +1104,7 @@ verify_sec_type(ST)         -> {error, "invalid security type: " ++ ST}.
 verify_address(A) ->
     verify_address(A, snmpUDPDomain).
 
+-dialyzer({nowarn_function, verify_address/2}). % Future compat
 verify_address(A, snmpUDPDomain = _Domain) ->
     do_verify_address(A, inet);
 verify_address(A, transportDomainUdpIpv4 = _Domain) ->
diff --git a/lib/snmp/src/misc/snmp_log.erl b/lib/snmp/src/misc/snmp_log.erl
index 9ae5c1109b..8a4dfa621b 100644
--- a/lib/snmp/src/misc/snmp_log.erl
+++ b/lib/snmp/src/misc/snmp_log.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2018. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2019. All Rights Reserved.
 %%
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
@@ -342,10 +342,9 @@ validate_loop({Cont, Terms, BadBytes}, Log, Validator, PrevTS, PrevSN) ->
     ?vtrace("validate_loop -> "
 	    "~n   NextTS: ~p"
 	    "~n   NextSN: ~p", [NextTS, NextSN]),
-    validate_loop(disk_log:chunk(Log, Cont), Log, Validator, NextTS, NextSN);
--dialyzer({nowarn_function, validate_loop/5}). % Future compat
-validate_loop(Error, _Log, _Write, _PrevTS, _PrevSN) ->
-    Error.
+    validate_loop(disk_log:chunk(Log, Cont), Log, Validator, NextTS, NextSN).
+%% validate_loop(Error, _Log, _Write, _PrevTS, _PrevSN) ->
+%%     Error.
     
 
 %% -- log ---
@@ -925,14 +924,7 @@ f(TimeStamp, SeqNo,
 	end,
     format_tab(
       "~w ~s - ~s [~s]~s ~w\n~s",
-      [Class, AddrStr, HdrStr, TimeStamp, SeqNo, Vsn, Str]);
-f(TimeStamp, SeqNo, Msg, AddrStr, _Mib) ->
-    io:format("<ERROR> Unexpected data: "
-              "~n   TimeStamp: ~s~s"
-              "~n   Msg:       ~p"
-              "~n   AddrStr:   ~p"
-              "~n", [TimeStamp, SeqNo, Msg, AddrStr]),
-    throw({error, 'invalid-message'}).
+      [Class, AddrStr, HdrStr, TimeStamp, SeqNo, Vsn, Str]).
 
 f(F, A) ->
     lists:flatten(io_lib:format(F, A)).