From 97a22b12f32aa48cfb4d904c5adf2db707490ab5 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Tue, 20 Sep 2011 19:38:51 +0000 Subject: [PATCH] Monotone-Parent: d4d8cd09603e421c6484fb4c83e461c0f987a5ab Monotone-Revision: 466d889076df3a6549014c16a439e973a134a6f6 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2011-09-20T19:38:51 Monotone-Branch: ca.inverse.sogo --- OpenChange/MAPIStoreObject.h | 2 ++ OpenChange/MAPIStoreObject.m | 17 +++++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/OpenChange/MAPIStoreObject.h b/OpenChange/MAPIStoreObject.h index 455ac1a76..9920b664e 100644 --- a/OpenChange/MAPIStoreObject.h +++ b/OpenChange/MAPIStoreObject.h @@ -28,6 +28,7 @@ #import @class NSCalendarDate; +@class NSData; @class NSString; @class NSMutableArray; @class NSMutableDictionary; @@ -100,6 +101,7 @@ inMemCtx: (TALLOC_CTX *) localMemCtx; /* helper getters */ +- (NSData *) getReplicaKeyFromGlobCnt: (uint64_t) objectCnt; - (int) getReplicaKey: (void **) data fromGlobCnt: (uint64_t) objectCnt inMemCtx: (TALLOC_CTX *) memCtx; diff --git a/OpenChange/MAPIStoreObject.m b/OpenChange/MAPIStoreObject.m index 2be8f1a72..d9f6e2820 100644 --- a/OpenChange/MAPIStoreObject.m +++ b/OpenChange/MAPIStoreObject.m @@ -277,9 +277,7 @@ static Class NSExceptionK, MAPIStoreFolderK; } /* helper getters */ -- (int) getReplicaKey: (void **) data - fromGlobCnt: (uint64_t) objectCnt - inMemCtx: (TALLOC_CTX *) memCtx +- (NSData *) getReplicaKeyFromGlobCnt: (uint64_t) objectCnt { struct mapistore_connection_info *connInfo; NSMutableData *replicaKey; @@ -297,9 +295,16 @@ static Class NSExceptionK, MAPIStoreFolderK; replicaKey = [NSMutableData dataWithCapacity: 22]; [replicaKey appendBytes: &connInfo->replica_guid length: sizeof (struct GUID)]; - [replicaKey appendBytes: buffer - length: 6]; - *data = [replicaKey asBinaryInMemCtx: memCtx]; + [replicaKey appendBytes: buffer length: 6]; + + return replicaKey; +} + +- (int) getReplicaKey: (void **) data + fromGlobCnt: (uint64_t) objectCnt + inMemCtx: (TALLOC_CTX *) memCtx +{ + *data = [[self getReplicaKeyFromGlobCnt: objectCnt] asBinaryInMemCtx: memCtx]; return MAPISTORE_SUCCESS; }