diff options
| author | Micael Karlberg <[email protected]> | 2012-01-05 18:35:49 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2012-01-05 18:35:49 +0100 |
| commit | c634c9c5f022c7f8ba91e1ef9d8fede838153f3a (patch) | |
| tree | 01b1a3d5883fe505ce534d9a56ee73389a478a2e /lib/snmp/src/agent | |
| parent | 021d5c2e49e623d4f43c0cc88a097bc99f3564e6 (diff) | |
| parent | 573d208445fe20cf14f21899fc8e10101a5c3dd0 (diff) | |
| download | otp-c634c9c5f022c7f8ba91e1ef9d8fede838153f3a.tar.gz otp-c634c9c5f022c7f8ba91e1ef9d8fede838153f3a.tar.bz2 otp-c634c9c5f022c7f8ba91e1ef9d8fede838153f3a.zip | |
Merge branch 'bmk/snmp/agent/remove_use_of_old_style_fun/r14/OTP-9783' into bmk/snmp/snmp4215_integration/r14
Diffstat (limited to 'lib/snmp/src/agent')
| -rw-r--r-- | lib/snmp/src/agent/snmp_generic_mnesia.erl | 5 | ||||
| -rw-r--r-- | lib/snmp/src/agent/snmpa_local_db.erl | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/snmp/src/agent/snmp_generic_mnesia.erl b/lib/snmp/src/agent/snmp_generic_mnesia.erl index a73aad5b33..ce42af404b 100644 --- a/lib/snmp/src/agent/snmp_generic_mnesia.erl +++ b/lib/snmp/src/agent/snmp_generic_mnesia.erl @@ -121,7 +121,7 @@ table_func(set, RowIndex, Cols, Name) -> fun() -> snmp_generic:table_set_row( {Name, mnesia}, nofunc, - {snmp_generic_mnesia, table_try_make_consistent}, + fun table_try_make_consistent/2, RowIndex, Cols) end) of {atomic, Value} -> @@ -368,7 +368,8 @@ table_set_elements(Name, RowIndex, Cols) -> _ -> false end. table_set_elements(Name, RowIndex, Cols, ConsFunc) -> - #table_info{index_types = Indexes, first_own_index = FirstOwnIndex} = + #table_info{index_types = Indexes, + first_own_index = FirstOwnIndex} = snmp_generic:table_info(Name), AddCol = if FirstOwnIndex == 0 -> 2; diff --git a/lib/snmp/src/agent/snmpa_local_db.erl b/lib/snmp/src/agent/snmpa_local_db.erl index d9d6e633de..df01091d53 100644 --- a/lib/snmp/src/agent/snmpa_local_db.erl +++ b/lib/snmp/src/agent/snmpa_local_db.erl @@ -1110,7 +1110,7 @@ table_func(is_set_ok, RowIndex, Cols, NameDb) -> table_func(set, RowIndex, Cols, NameDb) -> snmp_generic:table_set_row(NameDb, nofunc, - {snmp_generic, table_try_make_consistent}, + fun snmp_generic:table_try_make_consistent/3, RowIndex, Cols); |