projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 0.10->trunk
[prosody.git]
/
util
/
pluginloader.lua
diff --git
a/util/pluginloader.lua
b/util/pluginloader.lua
index b9b3e207fa685ffbf38dbc4f474567fd7a81f6a8..0d7eafa7a154122d3af7242bac792349963794b6 100644
(file)
--- a/
util/pluginloader.lua
+++ b/
util/pluginloader.lua
@@
-17,9
+17,7
@@
end
local io_open = io.open;
local envload = require "util.envload".envload;
local io_open = io.open;
local envload = require "util.envload".envload;
-module "pluginloader"
-
-function load_file(names)
+local function load_file(names)
local file, err, path;
for i=1,#plugin_dir do
for j=1,#names do
local file, err, path;
for i=1,#plugin_dir do
for j=1,#names do
@@
-35,7
+33,7
@@
function load_file(names)
return file, err;
end
return file, err;
end
-function load_resource(plugin, resource)
+
local
function load_resource(plugin, resource)
resource = resource or "mod_"..plugin..".lua";
local names = {
resource = resource or "mod_"..plugin..".lua";
local names = {
@@
-48,7
+46,7
@@
function load_resource(plugin, resource)
return load_file(names);
end
return load_file(names);
end
-function load_code(plugin, resource, env)
+
local
function load_code(plugin, resource, env)
local content, err = load_resource(plugin, resource);
if not content then return content, err; end
local path = err;
local content, err = load_resource(plugin, resource);
if not content then return content, err; end
local path = err;
@@
-57,4
+55,8
@@
function load_code(plugin, resource, env)
return f, path;
end
return f, path;
end
-return _M;
+return {
+ load_file = load_file;
+ load_resource = load_resource;
+ load_code = load_code;
+};