diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-04-03 23:09:59 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-04-03 23:09:59 +0100 |
| commit | 474f0d46466077959d3cff8ed4f51bebdda835db (patch) | |
| tree | 266e3395805b6fcea3d7a01dcda27037d2f09fb9 /util | |
| parent | af3bc714626c4e7b5299ef675bb244e963c1cfaa (diff) | |
| parent | 89e9f18d2ac62feb42a56a87ef0836a886da5d76 (diff) | |
| download | prosody-474f0d46466077959d3cff8ed4f51bebdda835db.tar.gz prosody-474f0d46466077959d3cff8ed4f51bebdda835db.zip | |
Merge 0.7->trunk
Diffstat (limited to 'util')
| -rw-r--r-- | util/uuid.lua | 2 | ||||
| -rw-r--r-- | util/ztact.lua | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/util/uuid.lua b/util/uuid.lua index d46f8665..796c8ee4 100644 --- a/util/uuid.lua +++ b/util/uuid.lua @@ -32,7 +32,7 @@ local function _seed(x) buffer = new_random(buffer..x); end local function get_nibbles(n) - if #buffer < n then seed(uniq_time()); end + if #buffer < n then _seed(uniq_time()); end local r = buffer:sub(0, n); buffer = buffer:sub(n+1); return r; diff --git a/util/ztact.lua b/util/ztact.lua index 35902ba1..2507bf8e 100644 --- a/util/ztact.lua +++ b/util/ztact.lua @@ -114,7 +114,7 @@ function tohex (s) -- - - - - - - - - - - - - - - - - - - - - - - - - tohex function tostring_r (d, indent, tab0) -- - - - - - - - - - - - - tostring_r - tab1 = tab0 or {} + local tab1 = tab0 or {} local rep = string.rep (' ', indent or 0) if type (d) == 'table' then for k,v in pairs (d) do @@ -210,7 +210,7 @@ function enqueue (queue, element) -- - - - - - - - - - - - - - - - - enqueue local function test_queue () - t = {} + local t = {} enqueue (t, 1) enqueue (t, 2) enqueue (t, 3) |