Chapril/xmpp.chapril.org-ejabberd
24
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-06-06 21:37:17 +02:00
Code Releases Activity

remove compilation warnings

Browse Source
This commit is contained in:
Christophe Romain 2014-05-05 18:16:48 +02:00
parent 4bdf1bc7a6
commit a6244275b7
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mod_pubsub.erl
View File

@ -1169,7 +1169,7 @@ disco_items(Host, Node, From) ->
caps_update(#jid{luser = U, lserver = S, lresource = R}, #jid{lserver = Host} = JID, _Features) caps_update(#jid{luser = U, lserver = S, lresource = R}, #jid{lserver = Host} = JID, _Features)
when Host =/= S -> when Host =/= S ->
presence(Host, {presence, U, S, [R], JID}); presence(Host, {presence, U, S, [R], JID});
caps_update(From, To, _Feature) -> caps_update(_From, _To, _Feature) ->
ok. ok.
presence_probe(#jid{luser = U, lserver = S, lresource = R} = JID, JID, Pid) -> presence_probe(#jid{luser = U, lserver = S, lresource = R} = JID, JID, Pid) ->
@ -1179,7 +1179,7 @@ presence_probe(#jid{luser = U, lserver = S}, #jid{luser = U, lserver = S}, _Pid)
%% ignore presence_probe from my other ressources %% ignore presence_probe from my other ressources
%% to not get duplicated last items %% to not get duplicated last items
ok; ok;
presence_probe(#jid{luser = U, lserver = S, lresource = R} = From, #jid{lserver = Host} = JID, _Pid) -> presence_probe(#jid{luser = U, lserver = S, lresource = R}, #jid{lserver = Host} = JID, _Pid) ->
presence(Host, {presence, U, S, [R], JID}). presence(Host, {presence, U, S, [R], JID}).
presence(ServerHost, Presence) -> presence(ServerHost, Presence) ->
@ -1620,7 +1620,7 @@ command_disco_info(_Host, ?NS_PUBSUB_GET_PENDING,
node_disco_info(Host, Node, From) -> node_disco_info(Host, Node, From) ->
node_disco_info(Host, Node, From, true, true). node_disco_info(Host, Node, From, true, true).
node_disco_info(Host, Node, From, Identity, Features) -> node_disco_info(Host, Node, From, _Identity, _Features) ->
% Action = % Action =
% fun(#pubsub_node{type = Type, id = NodeId}) -> % fun(#pubsub_node{type = Type, id = NodeId}) ->
% I = case Identity of % I = case Identity of

9
src/mod_pubsub_odbc.erl
View File

@ -820,7 +820,7 @@ disco_items(Host, Node, From) ->
caps_update(#jid{luser = U, lserver = S, lresource = R}, #jid{lserver = Host} = JID, _Features) caps_update(#jid{luser = U, lserver = S, lresource = R}, #jid{lserver = Host} = JID, _Features)
when Host =/= S -> when Host =/= S ->
presence(Host, {presence, U, S, [R], JID}); presence(Host, {presence, U, S, [R], JID});
caps_update(From, To, _Feature) -> caps_update(_From, _To, _Feature) ->
ok. ok.
presence_probe(#jid{luser = U, lserver = S, lresource = R} = JID, JID, Pid) -> presence_probe(#jid{luser = U, lserver = S, lresource = R} = JID, JID, Pid) ->
@ -830,7 +830,7 @@ presence_probe(#jid{luser = U, lserver = S}, #jid{luser = U, lserver = S}, _Pid)
%% ignore presence_probe from my other ressources %% ignore presence_probe from my other ressources
%% to not get duplicated last items %% to not get duplicated last items
ok; ok;
presence_probe(#jid{luser = U, lserver = S, lresource = R} = From, #jid{lserver = Host} = JID, _Pid) -> presence_probe(#jid{luser = U, lserver = S, lresource = R}, #jid{lserver = Host} = JID, _Pid) ->
presence(Host, {presence, U, S, [R], JID}). presence(Host, {presence, U, S, [R], JID}).
presence(ServerHost, Presence) -> presence(ServerHost, Presence) ->
@ -1272,7 +1272,7 @@ command_disco_info(_Host, ?NS_PUBSUB_GET_PENDING,
node_disco_info(Host, Node, From) -> node_disco_info(Host, Node, From) ->
node_disco_info(Host, Node, From, true, true). node_disco_info(Host, Node, From, true, true).
node_disco_info(Host, Node, From, Identity, Features) -> node_disco_info(Host, Node, From, _Identity, _Features) ->
% Action = % Action =
% fun(#pubsub_node{type = Type, id = NodeId}) -> % fun(#pubsub_node{type = Type, id = NodeId}) ->
% I = case Identity of % I = case Identity of
@ -3251,8 +3251,7 @@ set_affiliations(Host, Node, From, EntitiesEls) ->
error -> {error, ?ERR_BAD_REQUEST}; error -> {error, ?ERR_BAD_REQUEST};
_ -> _ ->
Action = fun (#pubsub_node{type = Type, Action = fun (#pubsub_node{type = Type,
id = NodeId} = id = NodeId}) ->
N) ->
Owners = node_owners_call(Type, NodeId), Owners = node_owners_call(Type, NodeId),
case lists:member(Owner, Owners) of case lists:member(Owner, Owners) of
true -> true ->