Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

Remove try/catch

This commit is contained in:
Maxim Ignatenko 2011-09-20 20:06:29 +03:00
parent faed7698c2
commit a91ae03dc6
1 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/mod_muc/mod_muc_room.erl
View File

@ -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) ->