From 1bc316b6a515f9ba7774a5906ad003e68bd40246 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= Date: Mon, 13 Aug 2012 23:55:14 +0200 Subject: [PATCH] Don't export the load function, it gets called automatically --- geef | 1 - src/geef.erl | 24 ++++++++++++------------ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/geef b/geef index 92133ba..c188741 100755 --- a/geef +++ b/geef @@ -3,7 +3,6 @@ %%! debug verbose -noshell -pa ebin main([Command|_Args]) -> - geef:start(), case Command of "h2r" -> [Object|_Rest] = _Args, diff --git a/src/geef.erl b/src/geef.erl index 58325d8..4bb8bc7 100644 --- a/src/geef.erl +++ b/src/geef.erl @@ -1,16 +1,6 @@ -module(geef). --export([start/0, hex_to_raw/1, object_exists/2, repository/1, repository_path/1]). --on_load(start/0). - -start() -> - case code:priv_dir(geef) of - {error, bad_name} -> - SoName = filename:join("priv", geef); - Dir -> - SoName = filename:join(Dir, geef) - end, - io:format("Hey There: ~s~n", [SoName]), - erlang:load_nif(SoName, 0). +-export([hex_to_raw/1, object_exists/2, repository/1, repository_path/1]). +-on_load(load_enif/0). hex_to_raw(_Val) -> nif_error(?LINE). @@ -33,3 +23,13 @@ repository(Path) -> nif_error(Line) -> exit({nif_not_loaded,module,?MODULE,line,Line}). + +load_enif() -> + case code:priv_dir(geef) of + {error, bad_name} -> + SoName = filename:join("priv", geef); + Dir -> + SoName = filename:join(Dir, geef) + end, + io:format("Hey There: ~s~n", [SoName]), + erlang:load_nif(SoName, 0).