Try to fix more Dialyzer warnings

diff --git a/src/ejabberd_auth.erl b/src/ejabberd_auth.erl
index 34d4a52b2823c246c1f509ab336f928074c08387..4f4b59d3bdf163f08508fa7507941c4ae7992853 100644 (file)
--- a/src/ejabberd_auth.erl
+++ b/src/ejabberd_auth.erl
@@ -71,7 +71,7 @@
 -callback get_vh_registered_users(binary(), opts()) -> [{binary(), binary()}].
 -callback get_vh_registered_users_number(binary()) -> number().
 -callback get_vh_registered_users_number(binary(), opts()) -> number().
--callback get_password(binary(), binary()) -> false | binary().
+-callback get_password(binary(), binary()) -> false | binary() | {binary(), binary(), binary(), integer()}.
 -callback get_password_s(binary(), binary()) -> binary().    
 
 start() ->
@@ -267,7 +267,7 @@ get_vh_registered_users_number(Server, Opts) ->
                        end,
                        auth_modules(Server))).
 
--spec get_password(binary(), binary()) -> false | binary().
+-spec get_password(binary(), binary()) -> false | binary() | {binary(), binary(), binary(), integer()}.
 
 get_password(User, Server) ->
     lists:foldl(fun (M, false) ->

diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
index 91b4faf54278f14ab2d429473ee2837db2e5610f..85d24a7d513b79857fd3f024b6fb87f79a195da8 100644 (file)
--- a/src/ejabberd_c2s.erl
+++ b/src/ejabberd_c2s.erl
@@ -1737,7 +1737,7 @@ handle_info(system_shutdown, StateName, StateData) ->
          ok
     end,
     {stop, normal, StateData};
-handle_info({route_xmlstreamelement, El}, StateName, StateData) ->
+handle_info({route_xmlstreamelement, El}, _StateName, StateData) ->
     {next_state, NStateName, NStateData, _Timeout} =
        session_established({xmlstreamelement, El}, StateData),
     fsm_next_state(NStateName, NStateData);

diff --git a/src/translate.erl b/src/translate.erl
index 9e48e0b7aa8188dad24e01612c0caba3f5ef3de6..277dfa445a5df53617a446276af9702f5f75b0b1 100644 (file)
--- a/src/translate.erl
+++ b/src/translate.erl
@@ -81,7 +81,7 @@ load_file(Lang, File) ->
             io:setopts(Fd, [{encoding,latin1}]),
             load_file_loop(Fd, 1, File, Lang),
             file:close(Fd);
-        Error ->
+        {error, Error} ->
             ExitText = iolist_to_binary([File, ": ",
                                          file:format_error(Error)]),
             ?ERROR_MSG("Problem loading translation file ~n~s",