diff options
| author | Maxim Ignatenko <gelraen.ua@gmail.com> | 2011-09-20 20:06:29 +0300 |
|---|---|---|
| committer | Maxim Ignatenko <gelraen.ua@gmail.com> | 2011-09-26 11:16:29 +0300 |
| commit | a91ae03dc639d6c9f20971da8129b14a6c8e1333 (patch) | |
| tree | 2ab7845c2ce3efc8b2cf151253b443613d8b565c | |
| parent | Use pattern matching in check_voice_request_fields/2 and check_voice_approvem... (diff) | |
Remove try/catch
| -rw-r--r-- | src/mod_muc/mod_muc_room.erl | 42 |
1 files changed, 18 insertions, 24 deletions
diff --git a/src/mod_muc/mod_muc_room.erl b/src/mod_muc/mod_muc_room.erl index f7375f5a4..bd26b74d0 100644 --- a/src/mod_muc/mod_muc_room.erl +++ b/src/mod_muc/mod_muc_room.erl @@ -3722,18 +3722,15 @@ get_mucroom_disco_items(StateData) -> % Voice request support is_voice_request({xmlelement, "x", _, _} = Elem) -> - try - case xml:get_tag_attr_s("xmlns", Elem) of - ?NS_XDATA -> - Fields = jlib:parse_xdata_submit(Elem), - lists:foldl( - fun(X,Y) -> - check_voice_request_fields(X,Y) - end, - true, Fields) - end - catch - error: _ -> + case xml:get_tag_attr_s("xmlns", Elem) of + ?NS_XDATA -> + Fields = jlib:parse_xdata_submit(Elem), + lists:foldl( + fun(X,Y) -> + check_voice_request_fields(X,Y) + end, + true, Fields); + _ -> false end; is_voice_request(Els) -> @@ -3795,18 +3792,15 @@ send_voice_request(From, StateData) -> end, Moderators). is_voice_approvement({xmlelement, "x", _, _} = Elem) -> - try - case xml:get_tag_attr_s("xmlns", Elem) of - ?NS_XDATA -> - Fields = jlib:parse_xdata_submit(Elem), - lists:foldl( - fun(X,Y) -> - check_voice_approvement_fields(X,Y) - end, - true, Fields) - end - catch - error: _ -> + case xml:get_tag_attr_s("xmlns", Elem) of + ?NS_XDATA -> + Fields = jlib:parse_xdata_submit(Elem), + lists:foldl( + fun(X,Y) -> + check_voice_approvement_fields(X,Y) + end, + true, Fields); + _ -> false end; is_voice_approvement(Els) -> |