From 1dbfc183793b4c01357b95e8c3385ea2aec297a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Enrique=20J=2E=20Hern=C3=A1ndez=20Blasco?= Date: Sat, 18 Jul 2015 08:47:55 +0200 Subject: [PATCH] oc: Update to new XID structure definition From ede986f commit from OpenChange repository. --- OpenChange/MAPIStoreGCSFolder.m | 4 ++-- OpenChange/MAPIStoreMailFolder.m | 4 ++-- OpenChange/NSData+MAPIStore.m | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/OpenChange/MAPIStoreGCSFolder.m b/OpenChange/MAPIStoreGCSFolder.m index ce4bb870f..73bb647f5 100644 --- a/OpenChange/MAPIStoreGCSFolder.m +++ b/OpenChange/MAPIStoreGCSFolder.m @@ -270,8 +270,8 @@ static Class NSNumberK; NSMutableDictionary *changeList; xid = [changeKey asXIDInMemCtx: NULL]; - guid = [NSString stringWithGUID: &xid->GUID]; - globCnt = [NSData dataWithBytes: xid->Data length: xid->Size]; + guid = [NSString stringWithGUID: &xid->NameSpaceGuid]; + globCnt = [NSData dataWithBytes: xid->LocalId.data length: xid->LocalId.length]; talloc_free (xid); if (!inChangeListOnly) diff --git a/OpenChange/MAPIStoreMailFolder.m b/OpenChange/MAPIStoreMailFolder.m index d4defea1e..4f66fc2f4 100644 --- a/OpenChange/MAPIStoreMailFolder.m +++ b/OpenChange/MAPIStoreMailFolder.m @@ -526,8 +526,8 @@ _compareFetchResultsByMODSEQ (id entry1, id entry2, void *data) NSMutableDictionary *changeList; xid = [changeKey asXIDInMemCtx: NULL]; - guid = [NSString stringWithGUID: &xid->GUID]; - globCnt = [NSData dataWithBytes: xid->Data length: xid->Size]; + guid = [NSString stringWithGUID: &xid->NameSpaceGuid]; + globCnt = [NSData dataWithBytes: xid->LocalId.data length: xid->LocalId.length]; talloc_free (xid); /* 1. set change key association */ diff --git a/OpenChange/NSData+MAPIStore.m b/OpenChange/NSData+MAPIStore.m index 44b6dcf85..38ef1ccf4 100644 --- a/OpenChange/NSData+MAPIStore.m +++ b/OpenChange/NSData+MAPIStore.m @@ -136,11 +136,11 @@ static void _fillFlatUIDWithGUID (struct FlatUID_r *flatUID, const struct GUID * NSMutableData *xidData; struct FlatUID_r flatUID; - _fillFlatUIDWithGUID (&flatUID, &xid->GUID); + _fillFlatUIDWithGUID (&flatUID, &xid->NameSpaceGuid); - xidData = [NSMutableData dataWithCapacity: 16 + xid->Size]; + xidData = [NSMutableData dataWithCapacity: 16 + xid->LocalId.length]; [xidData appendBytes: flatUID.ab length: 16]; - [xidData appendBytes: xid->Data length: xid->Size]; + [xidData appendBytes: xid->LocalId.data length: xid->LocalId.length]; return xidData; } @@ -156,12 +156,12 @@ static void _fillFlatUIDWithGUID (struct FlatUID_r *flatUID, const struct GUID * { xid = talloc_zero (memCtx, struct XID); - [self _extractGUID: &xid->GUID]; + [self _extractGUID: &xid->NameSpaceGuid]; - xid->Size = max - 16; + xid->LocalId.length = max - 16; bytes = (uint8_t *) [self bytes]; - xid->Data = talloc_memdup (xid, (bytes+16), xid->Size); + xid->LocalId.data = talloc_memdup (xid, (bytes+16), xid->LocalId.length); } else {