From 9d379a1dae9a6b46a4e11a13ccdcece4f8c60679 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Mon, 18 Jun 2012 16:57:46 +0100 Subject: util.sasl: Make registerMechanism a public function --- util/sasl.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'util') diff --git a/util/sasl.lua b/util/sasl.lua index 17d10b80..afb3861b 100644 --- a/util/sasl.lua +++ b/util/sasl.lua @@ -35,7 +35,7 @@ local mechanisms = {}; local backend_mechanism = {}; -- register a new SASL mechanims -local function registerMechanism(name, backends, f) +function registerMechanism(name, backends, f) assert(type(name) == "string", "Parameter name MUST be a string."); assert(type(backends) == "string" or type(backends) == "table", "Parameter backends MUST be either a string or a table."); assert(type(f) == "function", "Parameter f MUST be a function."); -- cgit v1.2.3 From ae0fdd43a4248bda8d1f3d01ab592dff0412b574 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Thu, 5 Jul 2012 17:58:47 +0200 Subject: util.stanza: Make stanza:childtags() behave like :get_child() --- util/stanza.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'util') diff --git a/util/stanza.lua b/util/stanza.lua index 1449f707..5c430f1d 100644 --- a/util/stanza.lua +++ b/util/stanza.lua @@ -133,14 +133,14 @@ function stanza_mt:children() end function stanza_mt:childtags(name, xmlns) - xmlns = xmlns or self.attr.xmlns; local tags = self.tags; local start_i, max_i = 1, #tags; return function () for i = start_i, max_i do local v = tags[i]; if (not name or v.name == name) - and (not xmlns or xmlns == v.attr.xmlns) then + and ((not xmlns and self.attr.xmlns == v.attr.xmlns) + or v.attr.xmlns == xmlns) then start_i = i+1; return v; end -- cgit v1.2.3 From 538620add408ab838ecd6271ea18f5dafab199a0 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Mon, 25 Jun 2012 00:16:08 +0100 Subject: util.logger: Remove some redundant code --- util/logger.lua | 2 -- 1 file changed, 2 deletions(-) (limited to 'util') diff --git a/util/logger.lua b/util/logger.lua index 4fadb4b9..26206d4d 100644 --- a/util/logger.lua +++ b/util/logger.lua @@ -23,8 +23,6 @@ function init(name) local log_warn = make_logger(name, "warn"); local log_error = make_logger(name, "error"); - --name = nil; -- While this line is not commented, will automatically fill in file/line number info - local namelen = #name; return function (level, message, ...) if level == "debug" then return log_debug(message, ...); -- cgit v1.2.3