projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7ffd93e
)
util.stanza: Trailing whitespace
author
Matthew Wild
<mwild1@gmail.com>
Thu, 21 Jan 2010 13:22:41 +0000
(13:22 +0000)
committer
Matthew Wild
<mwild1@gmail.com>
Thu, 21 Jan 2010 13:22:41 +0000
(13:22 +0000)
util/stanza.lua
patch
|
blob
|
history
diff --git
a/util/stanza.lua
b/util/stanza.lua
index 8d3b7747b39dadb50ff73c98dc5bd250f34e7471..c817f93b96c7db994d71934d742a02f4b143282d 100644
(file)
--- a/
util/stanza.lua
+++ b/
util/stanza.lua
@@
-65,7
+65,7
@@
end
function stanza_mt:text(text)
(self.last_add[#self.last_add] or self):add_direct_child(text);
function stanza_mt:text(text)
(self.last_add[#self.last_add] or self):add_direct_child(text);
- return self;
+ return self;
end
function stanza_mt:up()
end
function stanza_mt:up()
@@
-95,7
+95,7
@@
end
function stanza_mt:get_child(name, xmlns)
for _, child in ipairs(self.tags) do
function stanza_mt:get_child(name, xmlns)
for _, child in ipairs(self.tags) do
- if (not name or child.name == name)
+ if (not name or child.name == name)
and ((not xmlns and self.attr.xmlns == child.attr.xmlns)
or child.attr.xmlns == xmlns) then
and ((not xmlns and self.attr.xmlns == child.attr.xmlns)
or child.attr.xmlns == xmlns) then
@@
-105,13
+105,13
@@
function stanza_mt:get_child(name, xmlns)
end
function stanza_mt:child_with_name(name)
end
function stanza_mt:child_with_name(name)
- for _, child in ipairs(self.tags) do
+ for _, child in ipairs(self.tags) do
if child.name == name then return child; end
end
end
function stanza_mt:child_with_ns(ns)
if child.name == name then return child; end
end
end
function stanza_mt:child_with_ns(ns)
- for _, child in ipairs(self.tags) do
+ for _, child in ipairs(self.tags) do
if child.attr.xmlns == ns then return child; end
end
end
if child.attr.xmlns == ns then return child; end
end
end
@@
-123,7
+123,6
@@
function stanza_mt:children()
local v = a[i]
if v then return v; end
end, self, i;
local v = a[i]
if v then return v; end
end, self, i;
-
end
function stanza_mt:childtags()
local i = 0;
end
function stanza_mt:childtags()
local i = 0;
@@
-132,7
+131,6
@@
function stanza_mt:childtags()
local v = self.tags[i]
if v then return v; end
end, self.tags[1], i;
local v = self.tags[i]
if v then return v; end
end, self.tags[1], i;
-
end
local xml_escape
end
local xml_escape
@@
-317,7
+315,7
@@
if do_pretty_printing then
function stanza_mt.pretty_print(t)
local children_text = "";
for n, child in ipairs(t) do
function stanza_mt.pretty_print(t)
local children_text = "";
for n, child in ipairs(t) do
- if type(child) == "string" then
+ if type(child) == "string" then
children_text = children_text .. xml_escape(child);
else
children_text = children_text .. child:pretty_print();
children_text = children_text .. xml_escape(child);
else
children_text = children_text .. child:pretty_print();