diff options
author | Micael Karlberg <[email protected]> | 2013-05-28 17:23:06 +0200 |
---|---|---|
committer | Micael Karlberg <[email protected]> | 2013-05-28 17:23:06 +0200 |
commit | a6c76247fa67e86c12773e2d997c66c9f794b002 (patch) | |
tree | 152b2eb5983ae14bf4947a997428a1ebf36e6f1c /lib/snmp/src/app/snmp_app.erl | |
parent | 1fadb8a6744b282659cecba754b9678ef9761d8c (diff) | |
parent | 8f541e4959d4f58480beac053cc76613cd208837 (diff) | |
download | otp-a6c76247fa67e86c12773e2d997c66c9f794b002.tar.gz otp-a6c76247fa67e86c12773e2d997c66c9f794b002.tar.bz2 otp-a6c76247fa67e86c12773e2d997c66c9f794b002.zip |
Merge branch 'bmk/snmp/agent/mib_storage_behaviour/OTP-11107' into bmk/snmp/snmp424_integration/r16
Conflicts:
lib/snmp/doc/src/notes.xml
Diffstat (limited to 'lib/snmp/src/app/snmp_app.erl')
-rw-r--r-- | lib/snmp/src/app/snmp_app.erl | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/snmp/src/app/snmp_app.erl b/lib/snmp/src/app/snmp_app.erl index deb42cc373..0cfbb22a5a 100644 --- a/lib/snmp/src/app/snmp_app.erl +++ b/lib/snmp/src/app/snmp_app.erl @@ -62,17 +62,17 @@ entities([], []) -> ?d("entities -> converted config: ~n~p", [Conf]), [{agent, Conf}] end; -entities([], E) -> +entities([], Acc) -> ?d("entities -> done", []), - lists:reverse(E); -entities([ET|ETs], E) -> + lists:reverse(Acc); +entities([Ent|Ents], Acc) -> ?d("entities -> entry with" - "~n ET: ~p", [ET]), - case application:get_env(snmp, ET) of + "~n Ent: ~p", [Ent]), + case application:get_env(snmp, Ent) of {ok, Conf} -> - entities(ETs, [{ET, Conf}|E]); + entities(Ents, [{Ent, Conf}|Acc]); _ -> - entities(ETs, E) + entities(Ents, Acc) end. start_entities(_Type, []) -> |