stop exposing config records

5 files changed, 15 insertions, 26 deletions

diff --git a/p11p-daemon/src/p11p_app.erl b/p11p-daemon/src/p11p_app.erl
index 3ad778c..5d53ec8 100644
--- a/p11p-daemon/src/p11p_app.erl
+++ b/p11p-daemon/src/p11p_app.erl
@@ -3,8 +3,6 @@
 
 -export([start/2, prep_stop/1, stop/1]).
 
--include("p11p_defs.hrl").
-
 start(_Type, _Args) ->		% Args from 'mod' in application spec.
     lager:notice("p11p version ~s starting", [p11p:version()]),
     {ok, Sup} = p11p_sup:start_link(),
diff --git a/p11p-daemon/src/p11p_config.erl b/p11p-daemon/src/p11p_config.erl
index ed29833..58ea618 100644
--- a/p11p-daemon/src/p11p_config.erl
+++ b/p11p-daemon/src/p11p_config.erl
@@ -12,7 +12,17 @@
          terminate/2, code_change/3]).
 
 %% Records and types.
--include("p11p_defs.hrl").
+-record(p11module, {
+	  name :: string(),
+          path :: string()
+	  }).
+-type p11module() :: #p11module{}.
+
+-record(token, {
+	  name :: string(),
+	  modules = [] :: [p11module()]
+	 }).
+-type token() :: #token{}.
 
 %% Genserver state.
 -record(state, { tokens :: [token()] }).
@@ -25,9 +35,9 @@ start_link() ->
 config() ->
     gen_server:call(?MODULE, config).
 
--spec tokens() -> [token()].
+-spec tokens() -> [string()].
 tokens() ->
-    gen_server:call(?MODULE, tokens).
+    [T#token.name || T <- gen_server:call(?MODULE, tokens)].
 
 -spec modules_for_token(token()) -> [p11module()].
 modules_for_token(Token) ->
diff --git a/p11p-daemon/src/p11p_defs.hrl b/p11p-daemon/src/p11p_defs.hrl
deleted file mode 100644
index 0efa6be..0000000
--- a/p11p-daemon/src/p11p_defs.hrl
+++ /dev/null
@@ -1,12 +0,0 @@
--record(p11module, {
-	  name :: string(),
-          path :: string()		  % FIXME: use some path type?
-	  }).
-
--record(token, {
-	  name :: string(),
-	  modules = [] :: [p11module()]
-	 }).
-
--type token() :: #token{}.
--type p11module() :: #p11module{}.
diff --git a/p11p-daemon/src/p11p_server.erl b/p11p-daemon/src/p11p_server.erl
index faa22be..3ae5e78 100644
--- a/p11p-daemon/src/p11p_server.erl
+++ b/p11p-daemon/src/p11p_server.erl
@@ -12,7 +12,6 @@
          code_change/3]).
 
 %% Records and types.
--include("p11p_defs.hrl").
 -record(state, {
 	  sockpath :: string(),		       % FIXME: filename(3erl)
 	  socket :: gen_tcp:socket()
diff --git a/p11p-daemon/src/p11p_server_sup.erl b/p11p-daemon/src/p11p_server_sup.erl
index 064de05..c73346a 100644
--- a/p11p-daemon/src/p11p_server_sup.erl
+++ b/p11p-daemon/src/p11p_server_sup.erl
@@ -4,13 +4,11 @@
 -export([start_link/0, start_server/1]).
 -export([init/1, cleanup/0]).
 
--include("p11p_defs.hrl").
-
 start_link() ->
     supervisor:start_link({local, ?MODULE}, ?MODULE, []).
 
 init([]) ->
-    ok = start_servers(tokens()),
+    ok = start_servers(p11p_config:tokens()),
     {ok, {{simple_one_for_one, 1, 5},
 	  [{sock_server,
 	    {p11p_server, start_link, []},
@@ -22,7 +20,7 @@ start_server(Args) ->
     Pid.
 
 cleanup() ->
-    cleanup(tokens()).
+    cleanup(p11p_config:tokens()).
 
 %% Private functions.
 start_servers([]) ->
@@ -57,7 +55,3 @@ mkdir_socket_basepath() ->
 -spec socket_path(string(), string()) -> string().
 socket_path(BasePath, Name) ->
     BasePath ++ Name ++ "-" ++ os:getpid().    % FIXME: filename(3erl)
-
--spec tokens() -> [string()].
-tokens() ->
-    [ T#token.name || T <- p11p_config:tokens() ].