diff options
| author | Matthew Wild <mwild1@gmail.com> | 2008-10-24 07:36:48 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2008-10-24 07:36:48 +0100 |
| commit | 2d7656d5db5476fd31a41e71e46205cab1bce74f (patch) | |
| tree | f2cb19832a1a1c35d4a42286138b9f80968bc3da /util | |
| parent | d49ea8a12e4440a0df267b575e4925231bda4803 (diff) | |
| parent | 5c90ffdf7e7c7d784ed5f60eed3f8a2666c117f8 (diff) | |
| download | prosody-2d7656d5db5476fd31a41e71e46205cab1bce74f.tar.gz prosody-2d7656d5db5476fd31a41e71e46205cab1bce74f.zip | |
Merging more s2s
Diffstat (limited to 'util')
| -rw-r--r-- | util/logger.lua | 2 | ||||
| -rw-r--r-- | util/stanza.lua | 7 | ||||
| -rw-r--r-- | util/uuid.lua | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/util/logger.lua b/util/logger.lua index 623ceb67..8d983605 100644 --- a/util/logger.lua +++ b/util/logger.lua @@ -6,7 +6,7 @@ local tostring = tostring; module "logger" function init(name) - name = nil; -- While this line is not commented, will automatically fill in file/line number info + --name = nil; -- While this line is not commented, will automatically fill in file/line number info return function (level, message, ...) if not name then local inf = debug.getinfo(3, 'Snl'); diff --git a/util/stanza.lua b/util/stanza.lua index 6bc70ab9..95a19fbd 100644 --- a/util/stanza.lua +++ b/util/stanza.lua @@ -6,8 +6,14 @@ local setmetatable = setmetatable; local pairs = pairs; local ipairs = ipairs; local type = type; +local next = next; +local print = print; local unpack = unpack; local s_gsub = string.gsub; + +local debug = debug; +local log = require "util.logger".init("stanza"); + module "stanza" stanza_mt = {}; @@ -91,7 +97,6 @@ function stanza_mt.__tostring(t) if t.attr then for k, v in pairs(t.attr) do if type(k) == "string" then attr_string = attr_string .. s_format(" %s='%s'", k, tostring(v)); end end end - return s_format("<%s%s>%s</%s>", t.name, attr_string, children_text, t.name); end diff --git a/util/uuid.lua b/util/uuid.lua index 489522aa..e1c02c91 100644 --- a/util/uuid.lua +++ b/util/uuid.lua @@ -2,7 +2,7 @@ local m_random = math.random; module "uuid" -function uuid_generate() +function generate() return m_random(0, 99999999); end |