From 0275959ca4db104e1749efe7beedfdadf204dfc4 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Tue, 28 May 2013 17:51:43 +0200
Subject: [snmp/agent] Corrected the mib_storage type

---
 lib/snmp/src/agent/snmpa_mib_data.erl | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/lib/snmp/src/agent/snmpa_mib_data.erl b/lib/snmp/src/agent/snmpa_mib_data.erl
index ffacdd5b3a..368c714134 100644
--- a/lib/snmp/src/agent/snmpa_mib_data.erl
+++ b/lib/snmp/src/agent/snmpa_mib_data.erl
@@ -28,28 +28,23 @@
 %% These types should really be defined elsewhere...
 -export_type([
 	      mib_storage/0, 
-	      mib_storage_dir/0, 
-	      mib_storage_action/0, 
-
+	      mib_storage_opt/0, 
+	      mib_storage_module/0, 
+	      mib_storage_options/0, 
 	      mib_view/0, 
 	      mib_view_elem/0, 
 	      mib_view_mask/0, 
 	      mib_view_inclusion/0
 	     ]).
 
--type mib_storage() :: ets | 
-		       {ets, Dir :: mib_storage_dir()} | 
-		       {ets, Dir :: mib_storage_dir(), Action :: mib_storage_action()} | 
-		       dets | 
-		       {dets, Dir :: mib_storage_dir()} | 
-		       {dets, Dir :: mib_storage_dir(), Action :: mib_storage_action()} | 
-		       mnesia | 
-		       {mnesia, Nodes :: [node()]} | 
-		       {mnesia, Nodes :: [node()], 
-			Action :: mib_storage_action()}. 
-
--type mib_storage_dir()    :: default | string().
--type mib_storage_action() :: clear | keep.
+-type mib_storage() :: [mib_storage_opt()].
+-type mib_storage_opt() :: {module,  mib_storage_module()} | 
+                           {options, mib_storage_options()}.
+
+%% Module implementing the snmpa_mib_storage behaviour
+-type mib_storage_module()  :: atom(). 
+%% Options specific to the above module
+-type mib_storage_options() :: list().
 
 -type mib_view()           :: [mib_view_elem()].
 -type mib_view_elem()      :: {SubTree :: snmp:oid(), 
-- 
cgit v1.2.3