aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorHisham Muhammad <hisham@gobolinux.org>2015-04-08 17:22:44 -0300
committerHisham Muhammad <hisham@gobolinux.org>2015-04-08 17:22:44 -0300
commit3ce554cd17896b15e0df149c1ef43be404b868e0 (patch)
treeeb138b7b7057db0d79879fa551a5aafdaba48612 /src
parent0e3a052699159c22dad93ac4e057067428e9849e (diff)
downloadluarocks-3ce554cd17896b15e0df149c1ef43be404b868e0.tar.gz
luarocks-3ce554cd17896b15e0df149c1ef43be404b868e0.tar.bz2
luarocks-3ce554cd17896b15e0df149c1ef43be404b868e0.zip
Restore comment about second return,
but put it in the right function. https://github.com/keplerproject/luarocks/pull/346#discussion_r28008668
Diffstat (limited to 'src')
-rw-r--r--src/luarocks/persist.lua5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/luarocks/persist.lua b/src/luarocks/persist.lua
index ba3789d1..354b17c3 100644
--- a/src/luarocks/persist.lua
+++ b/src/luarocks/persist.lua
@@ -53,8 +53,9 @@ end
53-- @param filename string: the name of the file. 53-- @param filename string: the name of the file.
54-- @param tbl table or nil: if given, this table is used to store 54-- @param tbl table or nil: if given, this table is used to store
55-- loaded values. 55-- loaded values.
56-- @return table or (nil, string, string): a table with the file's assignments 56-- @return (table, table) or (nil, string, string): a table with the file's assignments
57-- as fields, or nil, an error message and an error code ("open"; couldn't open the file, 57-- as fields and set of undefined globals accessed in file,
58-- or nil, an error message and an error code ("open"; couldn't open the file,
58-- "load"; compile-time error, or "run"; run-time error) 59-- "load"; compile-time error, or "run"; run-time error)
59-- in case of errors. 60-- in case of errors.
60function persist.load_into_table(filename, tbl) 61function persist.load_into_table(filename, tbl)