ObjFW/ObjXMPP
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix up -[XMPPJID isEqual:] and -[XMPPJID hash]

Browse source
This commit is contained in:
Florian Zeitz 2013-03-03 17:30:58 +01:00
parent 005771ec2e
commit f5f60f7722
1 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/XMPPJID.m
View file

@ -241,8 +241,11 @@
JID = object; JID = object;
if ([_node isEqual: JID->_node] && [_domain isEqual: JID->_domain] && // Node and resource may be nil
[_resource isEqual: JID->_resource]) if ((_node == JID->_node || [_node isEqual: JID->_node]) &&
[_domain isEqual: JID->_domain] &&
(_resource == JID->_resource || [_resource isEqual: JID->_resource])
)
return YES; return YES;
return NO; return NO;
@ -250,6 +253,16 @@
- (uint32_t) hash - (uint32_t) hash
{ {
return [[self fullJID] hash]; uint32_t hash;
OF_HASH_INIT(hash);
OF_HASH_ADD_HASH(hash, [_node hash]);
OF_HASH_ADD_HASH(hash, [_domain hash]);
OF_HASH_ADD_HASH(hash, [_resource hash]);
OF_HASH_FINALIZE(hash);
return hash;
} }
@end @end