aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2011-02-22 07:37:52 +0000
committerMatthew Wild <mwild1@gmail.com>2011-02-22 07:37:52 +0000
commita9c25722e1ef9f60a211bf3040c22004de456011 (patch)
tree82be2999f934b7fbaf76fe7f5a1a09f8771ec582
parent2a37446dfa25d0f9ce7fca9d09e660c83e32fbb7 (diff)
downloadprosody-a9c25722e1ef9f60a211bf3040c22004de456011.tar.gz
prosody-a9c25722e1ef9f60a211bf3040c22004de456011.zip
util.stanza: Remove childtags and rename matching_tags -> childtags (they are API-compatible)
-rw-r--r--util/stanza.lua27
1 files changed, 9 insertions, 18 deletions
diff --git a/util/stanza.lua b/util/stanza.lua
index bf944115..de83977f 100644
--- a/util/stanza.lua
+++ b/util/stanza.lua
@@ -138,29 +138,20 @@ function stanza_mt:children()
end, self, i;
end
-function stanza_mt:matching_tags(name, xmlns)
+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
- v = tags[i];
- if (not name or v.name == name)
- and (not xmlns or xmlns == v.attr.xmlns) then
- start_i = i+1;
- return v;
- end
+ 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
+ start_i = i+1;
+ return v;
end
- end, tags, i;
-end
-
-function stanza_mt:childtags()
- local i = 0;
- return function (a)
- i = i + 1
- local v = self.tags[i]
- if v then return v; end
- end, self.tags[1], i;
+ end
+ end;
end
function stanza_mt:maptags(callback)