aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2013-01-11 16:31:07 +0100
committerMicael Karlberg <[email protected]>2013-01-11 16:31:07 +0100
commit4c8d9df47bd4421e80656189b40cfdcb0f788bb6 (patch)
treec6e504d034b697742817afd429f84f7b1ea9e153 /lib
parent5fe8d409eca048b06ebd35e5e245de516a550240 (diff)
parent188f8b0d7858b1333149d6b1a98ba453d6c98b4d (diff)
downloadotp-4c8d9df47bd4421e80656189b40cfdcb0f788bb6.tar.gz
otp-4c8d9df47bd4421e80656189b40cfdcb0f788bb6.tar.bz2
otp-4c8d9df47bd4421e80656189b40cfdcb0f788bb6.zip
Merge branch 'bmk/snmp/remove_tuple_fun/OTP-10672' into bmk/snmp/snmp423_integration
Conflicts: lib/snmp/doc/src/notes.xml
Diffstat (limited to 'lib')
-rw-r--r--lib/snmp/doc/src/notes.xml7
-rw-r--r--lib/snmp/src/agent/snmpa_agent.erl6
2 files changed, 10 insertions, 3 deletions
diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index ea0495017d..26ada74a23 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -55,6 +55,13 @@
<p>Own Id: OTP-10671</p>
</item>
+ <item>
+ <p>[agent] Remove runtime warning in snmpa_agent because of
+ tuple fun usage. </p>
+ <p>Luca Favatella</p>
+ <p>Own Id: OTP-10672</p>
+ </item>
+
</list>
</section>
diff --git a/lib/snmp/src/agent/snmpa_agent.erl b/lib/snmp/src/agent/snmpa_agent.erl
index 9d30e332f1..57846db13b 100644
--- a/lib/snmp/src/agent/snmpa_agent.erl
+++ b/lib/snmp/src/agent/snmpa_agent.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
@@ -1134,7 +1134,7 @@ handle_call({get, Vars, Context}, _From, S) ->
"~n Vars: ~p"
"~n Context: ~p", [Vars, Context]),
put_pdu_data({undefined, undefined, undefined, undefined, Context}),
- case catch mapfoldl({?MODULE, tr_var}, [], 1, Vars) of
+ case catch mapfoldl(fun ?MODULE:tr_var/2, [], 1, Vars) of
{error, Reason} -> {reply, {error, Reason}, S};
{_, Varbinds} ->
?vdebug("Varbinds: ~p",[Varbinds]),
@@ -1155,7 +1155,7 @@ handle_call({get_next, Vars, Context}, _From, S) ->
"~n Vars: ~p"
"~n Context: ~p",[Vars, Context]),
put_pdu_data({undefined, undefined, undefined, undefined, Context}),
- case catch mapfoldl({?MODULE, tr_var}, [], 1, Vars) of
+ case catch mapfoldl(fun ?MODULE:tr_var/2, [], 1, Vars) of
{error, Reason} -> {reply, {error, Reason}, S};
{_, Varbinds} ->
?vdebug("Varbinds: ~p",[Varbinds]),