aboutsummaryrefslogtreecommitdiffstats
path: root/lib/snmp/src/agent/snmpa_mib_lib.erl
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2012-01-25 15:17:03 +0100
committerMicael Karlberg <[email protected]>2012-01-25 15:17:03 +0100
commit8d8d0a6529874345f3bb69349f573a75a73ea373 (patch)
tree4968c9941f15d3562a74b8138ec7e8e9d3daadcc /lib/snmp/src/agent/snmpa_mib_lib.erl
parenta8af5a6bae97ddd7bfc2bcff2e701fa37f47640c (diff)
parentb55c3d29a3d9efce2ce6548963809fc3b7ab8729 (diff)
downloadotp-8d8d0a6529874345f3bb69349f573a75a73ea373.tar.gz
otp-8d8d0a6529874345f3bb69349f573a75a73ea373.tar.bz2
otp-8d8d0a6529874345f3bb69349f573a75a73ea373.zip
Merge branch 'maint-r14' into bmk/snmp/snmp4216_integration/r15
Conflicts: lib/snmp/doc/src/notes.xml lib/snmp/doc/src/notes_history.xml
Diffstat (limited to 'lib/snmp/src/agent/snmpa_mib_lib.erl')
-rw-r--r--lib/snmp/src/agent/snmpa_mib_lib.erl20
1 files changed, 10 insertions, 10 deletions
diff --git a/lib/snmp/src/agent/snmpa_mib_lib.erl b/lib/snmp/src/agent/snmpa_mib_lib.erl
index 078e681945..3c94cc8095 100644
--- a/lib/snmp/src/agent/snmpa_mib_lib.erl
+++ b/lib/snmp/src/agent/snmpa_mib_lib.erl
@@ -61,23 +61,23 @@ table_del_row({Tab, Db} = TabDb, Key) ->
get_table(NameDb, FOI) ->
(catch get_table(NameDb, FOI, [], [])).
-get_table(NameDb, FOI, Oid, Acc) ->
- case table_next(NameDb, Oid) of
+get_table(NameDb, FOI, Key, Acc) ->
+ case table_next(NameDb, Key) of
endOfTable ->
?vdebug("end of table",[]),
{ok, lists:reverse(Acc)};
- Oid ->
+ Key ->
%% Crap, circular ref
- ?vinfo("cyclic reference: ~w -> ~w", [Oid,Oid]),
- throw({error, {cyclic_db_reference, Oid, Acc}});
- NextOid ->
- ?vtrace("get row for oid ~w", [NextOid]),
- case table_get_row(NameDb, NextOid, FOI) of
+ ?vinfo("cyclic reference: ~w -> ~w", [Key, Key]),
+ throw({error, {cyclic_db_reference, Key, Acc}});
+ NextKey ->
+ ?vtrace("get row for key ~w", [NextKey]),
+ case table_get_row(NameDb, NextKey, FOI) of
undefined ->
- throw({error, {invalid_rowindex, NextOid, Acc}});
+ throw({error, {invalid_rowindex, NextKey, Acc}});
Row ->
?vtrace("row: ~w", [Row]),
- get_table(NameDb, FOI, NextOid, [{NextOid, Row}|Acc])
+ get_table(NameDb, FOI, NextKey, [{NextKey, Row}|Acc])
end
end.