From 7979b0fee2b6c0e5e198045c7665dd44ea40e3fb Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Mon, 21 Mar 2011 00:41:22 +0000 Subject: [PATCH] Monotone-Parent: e1d77c8035a84435f5745fe6e47f1fb5c978d808 Monotone-Revision: 872b6482fb1a591d12d1baf86c6724907aa743dc Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2011-03-21T00:41:22 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 10 ++++++++++ OpenChange/MAPIStoreCalendarMessageTable.m | 2 +- OpenChange/MAPIStoreContactsMessage.m | 2 +- OpenChange/MAPIStoreContactsMessageTable.m | 2 +- OpenChange/MAPIStoreMailMessage.m | 2 +- OpenChange/MAPIStoreMailMessageTable.m | 2 +- OpenChange/MAPIStoreMessage.m | 2 +- OpenChange/MAPIStoreTasksMessage.m | 2 +- OpenChange/MAPIStoreTasksMessageTable.m | 4 ++-- 9 files changed, 19 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index a0a308319..b4eefb8ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,15 @@ 2011-03-20 Wolfgang Sourdeau + * OpenChange/MAPIStoreCalendarMessageTable.m, + OpenChange/MAPIStoreTasksMessageTable.m, + OpenChange/MAPIStoreContactsMessageTable.m, + OpenChange/MAPIStoreMailMessageTable.m, + OpenChange/MAPIStoreTasksMessage.m, OpenChange/MAPIStoreMessage.m, + OpenChange/MAPIStoreMailMessage.m, + OpenChange/MAPIStoreContactsMessage.m: cast property tags to + uint32_t in switch statements to avoid fatal warnings about + uncovered cases. + * UI/Scheduler/UIxComponentEditor.m (-takeValuesFromRequest:inContext:): added some sanity checks to avoid crashes when alarm data is not properly entered. diff --git a/OpenChange/MAPIStoreCalendarMessageTable.m b/OpenChange/MAPIStoreCalendarMessageTable.m index d7b5490f8..1e0338e95 100644 --- a/OpenChange/MAPIStoreCalendarMessageTable.m +++ b/OpenChange/MAPIStoreCalendarMessageTable.m @@ -44,7 +44,7 @@ id value; value = NSObjectFromMAPISPropValue (&res->lpProp); - switch (res->ulPropTag) + switch ((uint32_t) res->ulPropTag) { case PR_MESSAGE_CLASS_UNICODE: if ([value isEqualToString: @"IPM.Appointment"]) diff --git a/OpenChange/MAPIStoreContactsMessage.m b/OpenChange/MAPIStoreContactsMessage.m index f4b0f1877..013fc2ae4 100644 --- a/OpenChange/MAPIStoreContactsMessage.m +++ b/OpenChange/MAPIStoreContactsMessage.m @@ -82,7 +82,7 @@ enum MAPISTATUS rc; rc = MAPISTORE_SUCCESS; - switch (proptag) + switch ((uint32_t) proptag) { case PR_ICON_INDEX: // TODO /* see http://msdn.microsoft.com/en-us/library/cc815472.aspx */ diff --git a/OpenChange/MAPIStoreContactsMessageTable.m b/OpenChange/MAPIStoreContactsMessageTable.m index a6f3a5ea5..469052aee 100644 --- a/OpenChange/MAPIStoreContactsMessageTable.m +++ b/OpenChange/MAPIStoreContactsMessageTable.m @@ -73,7 +73,7 @@ id value; value = NSObjectFromMAPISPropValue (&res->lpProp); - switch (res->ulPropTag) + switch ((uint32_t) res->ulPropTag) { case PR_MESSAGE_CLASS_UNICODE: if ([value isEqualToString: @"IPM.Contact"]) diff --git a/OpenChange/MAPIStoreMailMessage.m b/OpenChange/MAPIStoreMailMessage.m index c6271a851..68e624b34 100644 --- a/OpenChange/MAPIStoreMailMessage.m +++ b/OpenChange/MAPIStoreMailMessage.m @@ -97,7 +97,7 @@ static Class NSExceptionK; enum MAPISTATUS rc; rc = MAPISTORE_SUCCESS; - switch (propTag) + switch ((uint32_t) propTag) { case PR_ICON_INDEX: /* see http://msdn.microsoft.com/en-us/library/cc815472.aspx */ diff --git a/OpenChange/MAPIStoreMailMessageTable.m b/OpenChange/MAPIStoreMailMessageTable.m index 8e807cfec..81470de9d 100644 --- a/OpenChange/MAPIStoreMailMessageTable.m +++ b/OpenChange/MAPIStoreMailMessageTable.m @@ -93,7 +93,7 @@ static Class NSDataK, NSStringK; id value; value = NSObjectFromMAPISPropValue (&res->lpProp); - switch (res->ulPropTag) + switch ((uint32_t) res->ulPropTag) { case PR_MESSAGE_CLASS_UNICODE: if ([value isEqualToString: @"IPM.Note"]) diff --git a/OpenChange/MAPIStoreMessage.m b/OpenChange/MAPIStoreMessage.m index fec1b98ba..57e7a3950 100644 --- a/OpenChange/MAPIStoreMessage.m +++ b/OpenChange/MAPIStoreMessage.m @@ -135,7 +135,7 @@ NSUInteger length; rc = MAPI_E_SUCCESS; - switch (propTag) + switch ((uint32_t) propTag) { case PR_INST_ID: // TODO: DOUBT /* we return a unique id based on the key */ diff --git a/OpenChange/MAPIStoreTasksMessage.m b/OpenChange/MAPIStoreTasksMessage.m index d774b4915..581ab5c9b 100644 --- a/OpenChange/MAPIStoreTasksMessage.m +++ b/OpenChange/MAPIStoreTasksMessage.m @@ -60,7 +60,7 @@ double doubleValue; rc = MAPI_E_SUCCESS; - switch (propTag) + switch ((uint32_t) propTag) { case PR_ICON_INDEX: // TODO /* see http://msdn.microsoft.com/en-us/library/cc815472.aspx */ diff --git a/OpenChange/MAPIStoreTasksMessageTable.m b/OpenChange/MAPIStoreTasksMessageTable.m index 83ab5a35e..e53edbbe7 100644 --- a/OpenChange/MAPIStoreTasksMessageTable.m +++ b/OpenChange/MAPIStoreTasksMessageTable.m @@ -62,7 +62,7 @@ id value; value = NSObjectFromMAPISPropValue (&res->lpProp); - switch (res->ulPropTag) + switch ((uint32_t) res->ulPropTag) { case PR_MESSAGE_CLASS_UNICODE: if ([value isKindOfClass: [NSString class]] @@ -106,7 +106,7 @@ { MAPIRestrictionState rc; - switch (res->ulPropTag) + switch ((uint32_t) res->ulPropTag) { case PidLidTaskDateCompleted: /* since we don't store the completion date in the quick table, we only