[snmp] Remove use of the deprecated get_stacktrace function

Removed the use of the deprecated erlang:stacktrace() function.
Instead make use of the 'catch Class:Error:Stacktrace' feature.

OTP-15332

3 files changed, 40 insertions, 45 deletions

diff --git a/lib/snmp/src/manager/snmpm_config.erl b/lib/snmp/src/manager/snmpm_config.erl
index 118cdcd1df..cd9fecd4d4 100644
--- a/lib/snmp/src/manager/snmpm_config.erl
+++ b/lib/snmp/src/manager/snmpm_config.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2004-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.
@@ -479,10 +479,7 @@ agent_info(Domain, Address, Item) when is_atom(Domain) ->
 	NAddress ->
 	    do_agent_info(Domain, NAddress, Item)
     catch
-	_Thrown ->
-	    %% p(?MODULE_STRING":agent_info(~p, ~p, ~p) throwed ~p at.~n"
-	    %%   "    ~p",
-	    %%   [Domain, Address, Item, _Thrown, erlang:get_stacktrace()]),
+	_C:_E:_S ->
 	    {error, not_found}
     end;
 agent_info(Ip, Port, Item) when is_integer(Port) ->
@@ -493,10 +490,7 @@ agent_info(Ip, Port, Item) when is_integer(Port) ->
 	Address ->
 	    do_agent_info(Domain, Address, Item)
     catch
-	_Thrown ->
-	    %% p(?MODULE_STRING":agent_info(~p, ~p, ~p) throwed ~p at.~n"
-	    %%   "    ~p",
-	    %%   [Ip, Port, Item, _Thrown, erlang:get_stacktrace()]),
+	_C:_E:_S ->
 	    {error, not_found}
     end.
 
@@ -1688,9 +1682,10 @@ read_agents_config_file(Dir) ->
     Check = fun check_agent_config/2,
     try read_file(Dir, "agents.conf", Order, Check, [])
     catch
-	throw:Error ->
-	    ?vlog("agent config error: ~p", [Error]),
-	    erlang:raise(throw, Error, erlang:get_stacktrace())
+	throw:E:S ->
+	    ?vlog("agent config error: "
+                  "~n   ~p", [E]),
+	    erlang:raise(throw, E, S)
     end.
 
 check_agent_config(Agent, State) ->
@@ -1935,9 +1930,10 @@ read_users_config_file(Dir) ->
     Check = fun (User, State) -> {check_user_config(User), State} end,
     try read_file(Dir, "users.conf", Order, Check, [])
     catch
-	throw:Error ->
-	    ?vlog("failure reading users config file: ~n   ~p", [Error]),
-	    erlang:raise(throw, Error, erlang:get_stacktrace())
+	throw:E:S ->
+	    ?vlog("failure reading users config file: "
+                  "~n   ~p", [E]),
+	    erlang:raise(throw, E, S)
     end.
 
 check_user_config({Id, Mod, Data}) ->
@@ -2351,10 +2347,11 @@ read_file(Dir, FileName, Order, Check, Default) ->
 read_file(Dir, FileName, Order, Check) ->
     try snmp_conf:read(filename:join(Dir, FileName), Order, Check)
     catch
-	throw:{error, Reason} = Error
+	throw:{error, Reason} = E:S
 	  when element(1, Reason) =:= failed_open ->
-	    error_msg("failed reading config from ~s: ~p", [FileName, Reason]),
-	    erlang:raise(throw, Error, erlang:get_stacktrace())
+	    error_msg("failed reading config from ~s: "
+                      "~n   ~p", [FileName, Reason]),
+	    erlang:raise(throw, E, S)
     end.
 
 %%--------------------------------------------------------------------
diff --git a/lib/snmp/src/manager/snmpm_net_if.erl b/lib/snmp/src/manager/snmpm_net_if.erl
index 29216f9d6a..184f782860 100644
--- a/lib/snmp/src/manager/snmpm_net_if.erl
+++ b/lib/snmp/src/manager/snmpm_net_if.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2004-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.
@@ -182,11 +182,9 @@ worker(Worker, Failer, #state{log = Log} = State) ->
 		      %% Winds up in handle_info {'DOWN', ...}
 		      erlang:exit({net_if_worker, Result})
 	      catch
-		  Class:Reason ->
+		  C:E:S ->
 		      %% Winds up in handle_info {'DOWN', ...}
-		      erlang:exit(
-			{net_if_worker, Failer,
-			 Class, Reason, erlang:get_stacktrace()})
+		      erlang:exit({net_if_worker, Failer, C, E, S})
 	      end
       end,
       [monitor]).
@@ -983,11 +981,10 @@ udp_send(Sock, To, Msg) ->
 	    error_msg("failed sending message to ~p:~p:~n"
 		      "   ~p",[IpAddr, IpPort, Reason])
     catch
-	error:Error ->
-	    error_msg("failed sending message to ~p:~p:~n"
-		      "   error:~p~n"
-		      "   ~p",
-		      [IpAddr, IpPort, Error, erlang:get_stacktrace()])
+	error:E:S ->
+	    error_msg("failed sending message to ~p:~p:"
+		      "~n   ~p"
+		      "~n   ~p", [IpAddr, IpPort, E, S])
     end.
 
 sz(B) when is_binary(B) ->
diff --git a/lib/snmp/src/manager/snmpm_server.erl b/lib/snmp/src/manager/snmpm_server.erl
index c8d7fa1e8b..a6ca2b2b14 100644
--- a/lib/snmp/src/manager/snmpm_server.erl
+++ b/lib/snmp/src/manager/snmpm_server.erl
@@ -1,7 +1,7 @@
 %% 
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2004-2015. All Rights Reserved.
+%% Copyright Ericsson AB 2004-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.
@@ -1755,9 +1755,10 @@ handle_error(_UserId, Mod, Reason, ReqId, Data, _State) ->
 			Mod:handle_error(ReqId, Reason, Data)
 		    end
 		catch
-		    T:E ->
+		    C:E:S ->
 			CallbackArgs = [ReqId, Reason, Data], 
-			handle_invalid_result(handle_error, CallbackArgs, T, E)
+			handle_invalid_result(handle_error, CallbackArgs,
+                                              C, E, S)
 		end
 	end,
     handle_callback(F),
@@ -1948,9 +1949,10 @@ handle_pdu(
 			Mod:handle_pdu(TargetName, ReqId, SnmpResponse, Data)
 		    end
 		catch
-		    T:E ->
+		    C:E:S ->
 			CallbackArgs = [TargetName, ReqId, SnmpResponse, Data], 
-			handle_invalid_result(handle_pdu, CallbackArgs, T, E) 
+			handle_invalid_result(handle_pdu, CallbackArgs,
+                                              C, E, S) 
 		end
 	end,
     handle_callback(F),
@@ -2119,10 +2121,10 @@ do_handle_agent(DefUserId, DefMod,
 		      "<~p,~p>: ~n~w", [Type, Domain, Addr, SnmpInfo])
 	    end;
 	
-	T:E ->
+	C:E:S ->
 	    CallbackArgs =
 		[Domain_or_Ip, Addr_or_Port, Type, SnmpInfo, DefData],
-	    handle_invalid_result(handle_agent, CallbackArgs, T, E)
+	    handle_invalid_result(handle_agent, CallbackArgs, C, E, S)
 	    
     end.
 
@@ -2331,8 +2333,8 @@ do_handle_trap(
 	    handle_invalid_result(handle_trap, CallbackArgs, InvalidResult)
 
     catch
-	T:E ->
-	    handle_invalid_result(handle_trap, CallbackArgs, T, E)
+	C:E:S ->
+	    handle_invalid_result(handle_trap, CallbackArgs, C, E, S)
 
     end.
 
@@ -2523,8 +2525,8 @@ do_handle_inform(
 		reply
 
 	catch
-	    T:E ->
-		handle_invalid_result(handle_inform, CallbackArgs, T, E), 
+	    C:E:S ->
+		handle_invalid_result(handle_inform, CallbackArgs, C, E, S), 
 		reply
 
 	end,
@@ -2837,8 +2839,8 @@ do_handle_report(
 	    reply
 
     catch
-	T:E ->
-	    handle_invalid_result(handle_report, CallbackArgs, T, E),
+	C:E:S ->
+	    handle_invalid_result(handle_report, CallbackArgs, C, E, S),
 	    reply
 
     end.
@@ -2855,15 +2857,14 @@ handle_callback(F) ->
 
     
 
-handle_invalid_result(Func, Args, T, E) ->
-    Stacktrace = ?STACK(), 
+handle_invalid_result(Func, Args, C, E, S) ->
     error_msg("Callback function failed: "
 	      "~n   Function:   ~p"
 	      "~n   Args:       ~p"
-	      "~n   Error Type: ~p"
+	      "~n   Class:      ~p"
 	      "~n   Error:      ~p"
 	      "~n   Stacktrace: ~p", 
-	      [Func, Args, T, E, Stacktrace]). 
+	      [Func, Args, C, E, S]). 
 
 handle_invalid_result(Func, Args, InvalidResult) ->
     error_msg("Callback function returned invalid result: "