]> granicus.if.org Git - ejabberd/commitdiff
Remove try/catch
authorMaxim Ignatenko <gelraen.ua@gmail.com>
Tue, 20 Sep 2011 17:06:29 +0000 (20:06 +0300)
committerMaxim Ignatenko <gelraen.ua@gmail.com>
Mon, 26 Sep 2011 08:16:29 +0000 (11:16 +0300)
src/mod_muc/mod_muc_room.erl

index f7375f5a4b6db673b6c8ac9ca9d9f06f5855ff5e..bd26b74d0979eef896c2d54940b6db839a700363 100644 (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) ->