Monotone-Parent: 0d1809a8a5fbb980e78d197e8f5c0c634b960a2e

Monotone-Revision: cd4c34d79c62c8b6a1f9ccfb14ea9a79442034c6

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-03-16T20:51:51
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2012-03-16 20:51:51 +00:00
parent 38e085ae8f
commit 3ad93f3257
5 changed files with 30 additions and 34 deletions
+2 -17
View File
@@ -686,21 +686,6 @@ _compareFetchResultsByMODSEQ (id entry1, id entry2, void *data)
[versionsMessage save];
}
- (NSData *) _dataFromChangeKeyGUID: (NSString *) guidString
andCnt: (NSData *) globCnt
{
NSMutableData *changeKey;
struct GUID guid;
changeKey = [NSMutableData dataWithCapacity: 16 + [globCnt length]];
[guidString extractGUID: &guid];
[changeKey appendData: [NSData dataWithGUID: &guid]];
[changeKey appendData: globCnt];
return changeKey;
}
- (NSData *) changeKeyForMessageWithKey: (NSString *) messageKey
{
NSDictionary *messages, *changeKeyDict;
@@ -716,7 +701,7 @@ _compareFetchResultsByMODSEQ (id entry1, id entry2, void *data)
{
guid = [changeKeyDict objectForKey: @"GUID"];
globCnt = [changeKeyDict objectForKey: @"LocalId"];
changeKey = [self _dataFromChangeKeyGUID: guid andCnt: globCnt];
changeKey = [NSData dataWithChangeKeyGUID: guid andCnt: globCnt];
}
return changeKey;
@@ -747,7 +732,7 @@ _compareFetchResultsByMODSEQ (id entry1, id entry2, void *data)
{
guid = [keys objectAtIndex: count];
globCnt = [changeListDict objectForKey: guid];
changeKey = [self _dataFromChangeKeyGUID: guid andCnt: globCnt];
changeKey = [NSData dataWithChangeKeyGUID: guid andCnt: globCnt];
[changeKeys appendUInt8: [changeKey length]];
[changeKeys appendData: changeKey];
}