Mercurial > prosody-hg
comparison util/xml.lua @ 11200:bf8f2da84007
Merge 0.11->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 05 Nov 2020 22:31:25 +0100 |
| parents | 1d9cd1abc660 |
| children | 2162e86029b6 |
comparison
equal
deleted
inserted
replaced
| 11199:6c7c50a4de32 | 11200:bf8f2da84007 |
|---|---|
| 69 if ok then ok, err, line, col = parser:parse(); end | 69 if ok then ok, err, line, col = parser:parse(); end |
| 70 --parser:close(); | 70 --parser:close(); |
| 71 if ok then | 71 if ok then |
| 72 return stanza.tags[1]; | 72 return stanza.tags[1]; |
| 73 else | 73 else |
| 74 return ok, err.." (line "..line..", col "..col..")"; | 74 return ok, ("%s (line %d, col %d))"):format(err, line, col); |
| 75 end | 75 end |
| 76 end; | 76 end; |
| 77 end)(); | 77 end)(); |
| 78 | 78 |
| 79 return { | 79 return { |
