xmppftw/xmpp-rs
Watch
1
0
Fork
You've already forked xmpp-rs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

jingle_message, muc, presence, version: Always use the check_no_attributes macro.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2018-05-12 17:59:04 +02:00
commit e0438f9b88
5 changed files with 9 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/presence.rs
View file

@ -268,22 +268,16 @@ impl TryFrom<Element> for Presence {
if show.is_some() {
return Err(Error::ParseError("More than one show element in a presence."));
}
check_no_attributes!(elem, "show");
for _ in elem.children() {
return Err(Error::ParseError("Unknown child in show element."));
}
for _ in elem.attrs() {
return Err(Error::ParseError("Unknown attribute in show element."));
}
show = Some(Show::from_str(elem.text().as_ref())?);
} else if elem.is("status", ns::DEFAULT_NS) {
check_no_unknown_attributes!(elem, "status", ["xml:lang"]);
for _ in elem.children() {
return Err(Error::ParseError("Unknown child in status element."));
}
for (attr, _) in elem.attrs() {
if attr != "xml:lang" {
return Err(Error::ParseError("Unknown attribute in status element."));
}
}
let lang = get_attr!(elem, "xml:lang", default);
if presence.statuses.insert(lang, elem.text()).is_some() {
return Err(Error::ParseError("Status element present twice for the same xml:lang."));
@ -292,12 +286,10 @@ impl TryFrom<Element> for Presence {
if priority.is_some() {
return Err(Error::ParseError("More than one priority element in a presence."));
}
check_no_attributes!(elem, "status");
for _ in elem.children() {
return Err(Error::ParseError("Unknown child in priority element."));
}
for _ in elem.attrs() {
return Err(Error::ParseError("Unknown attribute in priority element."));
}
priority = Some(Priority::from_str(elem.text().as_ref())?);
} else {
presence.payloads.push(elem.clone());