diff options
| author | Christophe Romain <christophe.romain@process-one.net> | 2014-05-05 18:16:48 +0200 |
|---|---|---|
| committer | Christophe Romain <christophe.romain@process-one.net> | 2014-05-05 18:16:48 +0200 |
| commit | a6244275b74365d2503b84e6f4754918cd6bf8f4 (patch) | |
| tree | f5c5cdb50aa02e8088b1d31615855c5a9dca9582 | |
| parent | avoid sending duplicated events (diff) | |
remove compilation warnings
| -rw-r--r-- | src/mod_pubsub.erl | 6 | ||||
| -rw-r--r-- | src/mod_pubsub_odbc.erl | 9 |
2 files changed, 7 insertions, 8 deletions
diff --git a/src/mod_pubsub.erl b/src/mod_pubsub.erl index d1d75de8f..515f22790 100644 --- a/src/mod_pubsub.erl +++ b/src/mod_pubsub.erl @@ -1169,7 +1169,7 @@ disco_items(Host, Node, From) -> caps_update(#jid{luser = U, lserver = S, lresource = R}, #jid{lserver = Host} = JID, _Features) when Host =/= S -> presence(Host, {presence, U, S, [R], JID}); -caps_update(From, To, _Feature) -> +caps_update(_From, _To, _Feature) -> ok. 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 %% to not get duplicated last items 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(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, true, true). -node_disco_info(Host, Node, From, Identity, Features) -> +node_disco_info(Host, Node, From, _Identity, _Features) -> % Action = % fun(#pubsub_node{type = Type, id = NodeId}) -> % I = case Identity of diff --git a/src/mod_pubsub_odbc.erl b/src/mod_pubsub_odbc.erl index 9e98e740d..dad839fd3 100644 --- a/src/mod_pubsub_odbc.erl +++ b/src/mod_pubsub_odbc.erl @@ -820,7 +820,7 @@ disco_items(Host, Node, From) -> caps_update(#jid{luser = U, lserver = S, lresource = R}, #jid{lserver = Host} = JID, _Features) when Host =/= S -> presence(Host, {presence, U, S, [R], JID}); -caps_update(From, To, _Feature) -> +caps_update(_From, _To, _Feature) -> ok. 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 %% to not get duplicated last items 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(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, true, true). -node_disco_info(Host, Node, From, Identity, Features) -> +node_disco_info(Host, Node, From, _Identity, _Features) -> % Action = % fun(#pubsub_node{type = Type, id = NodeId}) -> % I = case Identity of @@ -3251,8 +3251,7 @@ set_affiliations(Host, Node, From, EntitiesEls) -> error -> {error, ?ERR_BAD_REQUEST}; _ -> Action = fun (#pubsub_node{type = Type, - id = NodeId} = - N) -> + id = NodeId}) -> Owners = node_owners_call(Type, NodeId), case lists:member(Owner, Owners) of true -> |