pep/xmpp-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

jingle_ft: Obtain attributes using the get_attr! macro.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2017-05-21 21:02:06 +01:00
parent ca9a250efd
commit e7e4284a0d
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/jingle_ft.rs
View file

@ -138,11 +138,8 @@ impl<'a> TryFrom<&'a Element> for Description {
if range.is_some() { if range.is_some() {
return Err(Error::ParseError("File must not have more than one range.")); return Err(Error::ParseError("File must not have more than one range."));
} }
let offset = file_payload.attr("offset").unwrap_or("0").parse()?; let offset = get_attr!(file_payload, "offset", default);
let length = match file_payload.attr("length") { let length = get_attr!(file_payload, "length", optional);
Some(length) => Some(length.parse()?),
None => None,
};
let mut range_hashes = vec!(); let mut range_hashes = vec!();
for hash_element in file_payload.children() { for hash_element in file_payload.children() {
if !hash_element.is("hash", ns::HASHES) { if !hash_element.is("hash", ns::HASHES) {