Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-26 16:26:24 +01:00
Code Releases Activity

Fix errors detected by Dialyzer

Browse Source
This commit is contained in:
Badlop 2010-10-15 13:11:14 +02:00
parent 864b0ec149
commit d6a69dbca5
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ejabberd_logger_h.erl
View File

@ -162,7 +162,7 @@ write_event(Fd, {Time, {warning_msg, _GL, {Pid, Format, Args}}}) ->
file:write(Fd, io_lib:format(T ++ S, []));
_ ->
F = add_node("ERROR: ~p - ~p~n", Pid),
file:write(Fd, io:format(T ++ F, [Format,Args]))
file:write(Fd, io_lib:format(T ++ F, [Format,Args]))
end;
write_event(_, _) ->
ok.

9
src/ejabberd_piefxis.erl
View File

@ -117,8 +117,8 @@ process_elements(Elements,State) ->
process_element(El=#xmlel{name=user, ns=_XMLNS},
State=#parsing_state{host=Host}) ->
case add_user(El,Host) of
{error, _Other} -> error;
_ -> ok
ok -> ok;
{error, _Other} -> error
end,
State;
@ -163,7 +163,7 @@ add_user(El, Domain) ->
add_user(El, Domain, User, Password).
%% @spec (El::xmlel(), Domain::string(), User::string(), Password::string())
%% -> ok | {atomic, exists} | {error, not_allowed}
%% -> ok | {error, ErrorText::string()}
%% @doc Add a new user to the database.
%% If user already exists, it will be only updated.
add_user(El, Domain, User, Password) ->
@ -185,7 +185,8 @@ add_user(El, Domain, User, Password) ->
end,
El);
{error, Other} ->
?ERROR_MSG("Error adding user ~s@~s: ~p~n", [User, Domain, Other])
?ERROR_MSG("Error adding user ~s@~s: ~p~n", [User, Domain, Other]),
{error, Other}
end.
%% @spec (User::string(), Password::string(), Domain::string())

2
src/ejabberd_s2s_out.erl
View File

@ -859,7 +859,7 @@ terminate(Reason, StateName, StateData) ->
false ->
ok;
Key ->
ejabberd_s2s:remove_connectio
ejabberd_s2s:remove_connection
({StateData#state.myname, StateData#state.server}, self(), Key)
end,
%% bounce queue manage by process and Erlang message queue

8
src/web/ejabberd_web_admin.erl
View File

@ -2539,7 +2539,7 @@ get_node(global, Node, ["update"], Query, Lang) ->
[?XC('h1', ?T("Update ") ++ atom_to_list(Node))] ++
case Res of
ok -> [?XREST("Submitted")];
error -> [?XREST("Bad format")];
{error, ErrorText} -> [?XREST("Error: " ++ ErrorText)];
nothing -> []
end ++
[?XAE('form', [?XMLATTR('action', <<>>), ?XMLATTR('method', <<"post">>)],
@ -2922,9 +2922,11 @@ node_update_parse_query(Node, Query) ->
{ok, _} ->
ok;
{error, Error} ->
?ERROR_MSG("~p~n", [Error]);
?ERROR_MSG("~p~n", [Error]),
{error, io_lib:format("~p", [Error])};
{badrpc, Error} ->
?ERROR_MSG("~p~n", [Error])
?ERROR_MSG("Bad RPC: ~p~n", [Error]),
{error, "Bad RPC: " ++ io_lib:format("~p", [Error])}
end;
_ ->
nothing