From: Badlop <badlop@process-one.net>
Date: Fri, 27 Mar 2015 14:55:57 +0000 (+0100)
Subject: Try to fix more Dialyzer warnings
X-Git-Tag: 15.04~70
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=176114d28eca29d7b25ffd11b5f73a599a4460e4;p=ejabberd

Try to fix more Dialyzer warnings
---

diff --git a/src/ejabberd_auth.erl b/src/ejabberd_auth.erl
index 34d4a52b2..4f4b59d3b 100644
--- 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 91b4faf54..85d24a7d5 100644
--- 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 9e48e0b7a..277dfa445 100644
--- 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",