LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

struct UI8Array_r replaces struct I8Array_r

maint-2.0.2
Wolfgang Sourdeau 2012-10-05 09:59:45 -04:00
parent eca09c87cc
commit 671ce26a48
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenChange/MAPIStoreFolder.h
View File

@ -128,7 +128,7 @@
isMove: (BOOL) isMove isMove: (BOOL) isMove
isRecursive: (BOOL) isRecursive; isRecursive: (BOOL) isRecursive;
- (int) getDeletedFMIDs: (struct I8Array_r **) fmidsPtr - (int) getDeletedFMIDs: (struct UI8Array_r **) fmidsPtr
andCN: (uint64_t *) cnPtr andCN: (uint64_t *) cnPtr
fromChangeNumber: (uint64_t) changeNum fromChangeNumber: (uint64_t) changeNum
inTableType: (enum mapistore_table_type) tableType inTableType: (enum mapistore_table_type) tableType
@ -142,7 +142,7 @@
- (int) modifyPermissions: (struct PermissionData *) permissions - (int) modifyPermissions: (struct PermissionData *) permissions
withCount: (uint16_t) pcount withCount: (uint16_t) pcount
andFlags: (int8_t) flags; andFlags: (int8_t) flags;
- (enum mapistore_error) preloadMessageBodies: (const struct I8Array_r *) mids; - (enum mapistore_error) preloadMessageBodies: (const struct UI8Array_r *) mids;
/* helpers */ /* helpers */
- (uint64_t) idForObjectWithKey: (NSString *) childKey; - (uint64_t) idForObjectWithKey: (NSString *) childKey;

12
OpenChange/MAPIStoreFolder.m
View File

@ -1016,7 +1016,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
} }
} }
- (int) getDeletedFMIDs: (struct I8Array_r **) fmidsPtr - (int) getDeletedFMIDs: (struct UI8Array_r **) fmidsPtr
andCN: (uint64_t *) cnPtr andCN: (uint64_t *) cnPtr
fromChangeNumber: (uint64_t) changeNum fromChangeNumber: (uint64_t) changeNum
inTableType: (enum mapistore_table_type) tableType inTableType: (enum mapistore_table_type) tableType
@ -1028,7 +1028,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
NSNumber *cnNbr; NSNumber *cnNbr;
NSUInteger count, max; NSUInteger count, max;
MAPIStoreMapping *mapping; MAPIStoreMapping *mapping;
struct I8Array_r *fmids; struct UI8Array_r *fmids;
uint64_t fmid; uint64_t fmid;
keys = [self getDeletedKeysFromChangeNumber: changeNum andCN: &cnNbr keys = [self getDeletedKeysFromChangeNumber: changeNum andCN: &cnNbr
@ -1039,9 +1039,9 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
max = [keys count]; max = [keys count];
fmids = talloc_zero (memCtx, struct I8Array_r); fmids = talloc_zero (memCtx, struct UI8Array_r);
fmids->cValues = 0; fmids->cValues = 0;
fmids->lpi8 = talloc_array (fmids, int64_t, max); fmids->lpui8 = talloc_array (fmids, uint64_t, max);
*fmidsPtr = fmids; *fmidsPtr = fmids;
if (max > 0) if (max > 0)
*cnPtr = [cnNbr unsignedLongLongValue]; *cnPtr = [cnNbr unsignedLongLongValue];
@ -1061,7 +1061,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
"never existed" in the OpenChange "never existed" in the OpenChange
databases */ databases */
{ {
fmids->lpi8[fmids->cValues] = fmid; fmids->lpui8[fmids->cValues] = fmid;
fmids->cValues++; fmids->cValues++;
} }
} }
@ -1751,7 +1751,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
return MAPISTORE_SUCCESS; return MAPISTORE_SUCCESS;
} }
- (enum mapistore_error) preloadMessageBodies: (const struct I8Array_r *) mids - (enum mapistore_error) preloadMessageBodies: (const struct UI8Array_r *) mids
{ {
return MAPISTORE_SUCCESS; return MAPISTORE_SUCCESS;
} }

4
OpenChange/MAPIStoreSOGo.m
View File

@ -697,7 +697,7 @@ sogo_folder_copy_folder(void *folder_object, void *target_folder_object,
static enum mapistore_error static enum mapistore_error
sogo_folder_get_deleted_fmids(void *folder_object, TALLOC_CTX *mem_ctx, sogo_folder_get_deleted_fmids(void *folder_object, TALLOC_CTX *mem_ctx,
enum mapistore_table_type table_type, uint64_t change_num, enum mapistore_table_type table_type, uint64_t change_num,
struct I8Array_r **fmidsp, uint64_t *cnp) struct UI8Array_r **fmidsp, uint64_t *cnp)
{ {
struct MAPIStoreTallocWrapper *wrapper; struct MAPIStoreTallocWrapper *wrapper;
NSAutoreleasePool *pool; NSAutoreleasePool *pool;
@ -797,7 +797,7 @@ sogo_folder_modify_permissions(void *folder_object, uint8_t flags,
} }
static enum mapistore_error static enum mapistore_error
sogo_folder_preload_message_bodies(void *folder_object, const struct I8Array_r *mids) sogo_folder_preload_message_bodies(void *folder_object, const struct UI8Array_r *mids)
{ {
struct MAPIStoreTallocWrapper *wrapper; struct MAPIStoreTallocWrapper *wrapper;
NSAutoreleasePool *pool; NSAutoreleasePool *pool;

2
OpenChange/MAPIStoreTypes.m
View File

@ -222,7 +222,7 @@ NSObjectFromSPropValue (const struct SPropValue *value)
result = [NSArray arrayFromMVLong: &value->value.MVl]; result = [NSArray arrayFromMVLong: &value->value.MVl];
break; break;
case PT_MV_I8: case PT_MV_I8:
result = [NSArray arrayFromMVI8: &value->value.MVi8]; result = [NSArray arrayFromMVUI8: &value->value.MVui8];
break; break;
case PT_MV_STRING8: case PT_MV_STRING8:
result = [NSArray arrayFromMVString: &value->value.MVszA]; result = [NSArray arrayFromMVString: &value->value.MVszA];

2
OpenChange/NSArray+MAPIStore.h
View File

@ -37,7 +37,7 @@
+ (id) arrayFromMVShort: (const struct ShortArray_r *) mvShort; + (id) arrayFromMVShort: (const struct ShortArray_r *) mvShort;
+ (id) arrayFromMVLong: (const struct LongArray_r *) mvLong; + (id) arrayFromMVLong: (const struct LongArray_r *) mvLong;
- (struct LongArray_r *) asMVLongInMemCtx: (void *) memCtx; - (struct LongArray_r *) asMVLongInMemCtx: (void *) memCtx;
+ (id) arrayFromMVI8: (const struct I8Array_r *) mvI8; + (id) arrayFromMVUI8: (const struct UI8Array_r *) mvI8;
+ (id) arrayFromMVString: (const struct StringArray_r *) mvString; + (id) arrayFromMVString: (const struct StringArray_r *) mvString;
+ (id) arrayFromMVUnicode: (const struct StringArrayW_r *) mvUnicode; + (id) arrayFromMVUnicode: (const struct StringArrayW_r *) mvUnicode;
- (struct StringArrayW_r *) asMVUnicodeInMemCtx: (void *) memCtx; - (struct StringArrayW_r *) asMVUnicodeInMemCtx: (void *) memCtx;

8
OpenChange/NSArray+MAPIStore.m
View File

@ -170,16 +170,16 @@
return list; return list;
} }
+ (id) arrayFromMVI8: (const struct I8Array_r *) mvI8 + (id) arrayFromMVUI8: (const struct UI8Array_r *) mvUI8
{ {
NSUInteger count; NSUInteger count;
NSNumber *subObject; NSNumber *subObject;
NSMutableArray *mvResult; NSMutableArray *mvResult;
mvResult = [NSMutableArray arrayWithCapacity: mvI8->cValues]; mvResult = [NSMutableArray arrayWithCapacity: mvUI8->cValues];
for (count = 0; count < mvI8->cValues; count++) for (count = 0; count < mvUI8->cValues; count++)
{ {
subObject = [NSNumber numberWithLongLong: mvI8->lpi8[count]]; subObject = [NSNumber numberWithLongLong: mvUI8->lpui8[count]];
[mvResult addObject: subObject]; [mvResult addObject: subObject];
} }