diff --git a/ActiveSync/iCalAlarm+ActiveSync.m b/ActiveSync/iCalAlarm+ActiveSync.m
index 33e6dbb73..62a3ad146 100644
--- a/ActiveSync/iCalAlarm+ActiveSync.m
+++ b/ActiveSync/iCalAlarm+ActiveSync.m
@@ -58,7 +58,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// don't send negative reminder - not supported
if (delta > 0)
- [s appendFormat: @"%d", delta];
+ [s appendFormat: @"%d", (int)delta];
}
return s;
diff --git a/ActiveSync/iCalEvent+ActiveSync.m b/ActiveSync/iCalEvent+ActiveSync.m
index 2156b1eac..af8cdf21c 100644
--- a/ActiveSync/iCalEvent+ActiveSync.m
+++ b/ActiveSync/iCalEvent+ActiveSync.m
@@ -285,7 +285,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
{
[s appendString: @""];
[s appendFormat: @"%d", 1];
- [s appendFormat: @"%d", [o length]];
+ [s appendFormat: @"%d", (int)[o length]];
[s appendFormat: @"%@", o];
[s appendString: @""];
}
diff --git a/ActiveSync/iCalRecurrenceRule+ActiveSync.m b/ActiveSync/iCalRecurrenceRule+ActiveSync.m
index a9060fe27..225bbd90a 100644
--- a/ActiveSync/iCalRecurrenceRule+ActiveSync.m
+++ b/ActiveSync/iCalRecurrenceRule+ActiveSync.m
@@ -140,7 +140,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// Simple reccurrence rule of type "Monthly"
type = 2;
[s appendFormat: @"%d",
- [[[self parent] startDate] dayOfMonth]];
+ (int)[[[self parent] startDate] dayOfMonth]];
}
}
else if ([self frequency] == iCalRecurrenceFrequenceYearly)
diff --git a/ActiveSync/iCalToDo+ActiveSync.m b/ActiveSync/iCalToDo+ActiveSync.m
index e9417752c..94e0f9756 100644
--- a/ActiveSync/iCalToDo+ActiveSync.m
+++ b/ActiveSync/iCalToDo+ActiveSync.m
@@ -140,7 +140,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
{
[s appendString: @""];
[s appendFormat: @"%d", 1];
- [s appendFormat: @"%d", [o length]];
+ [s appendFormat: @"%d", (int)[o length]];
[s appendFormat: @"%@", o];
[s appendString: @""];
}
diff --git a/Main/SOGo+DAV.m b/Main/SOGo+DAV.m
index 256abdba9..994e742e6 100644
--- a/Main/SOGo+DAV.m
+++ b/Main/SOGo+DAV.m
@@ -267,7 +267,7 @@
NSObject *list;
NSObject *valueNode;
NSArray *elements;
- NSString *property, *match;
+ NSString *property=nil, *match=nil;
list = [searchElement getElementsByTagName: @"prop"];
if ([list length])
diff --git a/SOPE/GDLContentStore/GCSChannelManager.m b/SOPE/GDLContentStore/GCSChannelManager.m
index d04d70446..360901e97 100644
--- a/SOPE/GDLContentStore/GCSChannelManager.m
+++ b/SOPE/GDLContentStore/GCSChannelManager.m
@@ -500,7 +500,7 @@ static NSTimeInterval ChannelCollectionTimer = 5 * 60;
ms = [NSMutableString stringWithCapacity: 256];
[ms appendFormat: @"<0x%p[%@]: ", self, NSStringFromClass ([self class])];
- [ms appendFormat: @" #adaptors=%d", [urlToAdaptor count]];
+ [ms appendFormat: @" #adaptors=%d", (int)[urlToAdaptor count]];
[ms appendString: @">"];
return ms;
diff --git a/SOPE/NGCards/CardElement.m b/SOPE/NGCards/CardElement.m
index 00d7c7b35..ce410e1bc 100644
--- a/SOPE/NGCards/CardElement.m
+++ b/SOPE/NGCards/CardElement.m
@@ -414,7 +414,7 @@
if (group)
[str appendFormat: @"%@ (group: %@)\n", tag, group];
else
- [str appendFormat: @"%@\n", tag, group];
+ [str appendFormat: @"%@\n", tag];
[str appendString: [self versitString]];
diff --git a/SOPE/NGCards/CardGroup.m b/SOPE/NGCards/CardGroup.m
index b3c21e9d9..301cfb2b8 100644
--- a/SOPE/NGCards/CardGroup.m
+++ b/SOPE/NGCards/CardGroup.m
@@ -409,7 +409,7 @@ static NGCardsSaxHandler *sax = nil;
max = [children count];
if (max > 0)
{
- [str appendFormat: @"\n %d children: {\n", [children count]];
+ [str appendFormat: @"\n %d children: {\n", (int)[children count]];
for (count = 0; count < max; count++)
[str appendFormat: @" %@\n",
[[children objectAtIndex: count] description]];
diff --git a/SOPE/NGCards/NSCalendarDate+NGCards.m b/SOPE/NGCards/NSCalendarDate+NGCards.m
index b34471695..f70a12f42 100644
--- a/SOPE/NGCards/NSCalendarDate+NGCards.m
+++ b/SOPE/NGCards/NSCalendarDate+NGCards.m
@@ -32,16 +32,16 @@
- (NSString *) iCalFormattedDateTimeString
{
return [NSString stringWithFormat: @"%.4d%.2d%.2dT%.2d%.2d%.2d",
- [self yearOfCommonEra], [self monthOfYear],
- [self dayOfMonth], [self hourOfDay],
- [self minuteOfHour], [self secondOfMinute]];
+ (int)[self yearOfCommonEra], (int)[self monthOfYear],
+ (int)[self dayOfMonth], (int)[self hourOfDay],
+ (int)[self minuteOfHour], (int)[self secondOfMinute]];
}
- (NSString *) iCalFormattedDateString
{
return [NSString stringWithFormat: @"%.4d%.2d%.2d",
- [self yearOfCommonEra], [self monthOfYear],
- [self dayOfMonth]];
+ (int)[self yearOfCommonEra], (int)[self monthOfYear],
+ (int)[self dayOfMonth]];
}
@end
diff --git a/SOPE/NGCards/iCalMonthlyRecurrenceCalculator.m b/SOPE/NGCards/iCalMonthlyRecurrenceCalculator.m
index 3b6577ee8..0694cc6c2 100644
--- a/SOPE/NGCards/iCalMonthlyRecurrenceCalculator.m
+++ b/SOPE/NGCards/iCalMonthlyRecurrenceCalculator.m
@@ -348,7 +348,7 @@ static inline unsigned iCalDoWForNSDoW (int dow)
if ([byDayMask occursOnDay: currentWeekDay])
{
if ([bySetPos containsObject:
- [NSString stringWithFormat: @"%d", currentPos]])
+ [NSString stringWithFormat: @"%d", (int)currentPos]])
monthDays[monthDay+1] = YES;
currentPos++;
}
@@ -362,7 +362,7 @@ static inline unsigned iCalDoWForNSDoW (int dow)
if ([byDayMask occursOnDay: currentWeekDay])
{
if ([bySetPos containsObject:
- [NSString stringWithFormat: @"%d", currentPos]])
+ [NSString stringWithFormat: @"%d", (int)currentPos]])
monthDays[monthDay] = YES;
currentPos--;
}
diff --git a/SOPE/NGCards/iCalRecurrenceRule.m b/SOPE/NGCards/iCalRecurrenceRule.m
index 5e99429e7..6ec05fadc 100644
--- a/SOPE/NGCards/iCalRecurrenceRule.m
+++ b/SOPE/NGCards/iCalRecurrenceRule.m
@@ -309,10 +309,10 @@ NSString *iCalWeekDayString[] = { @"SU", @"MO", @"TU", @"WE", @"TH", @"FR",
else if ([frequency isEqualToString:@"SECONDLY"])
freq = iCalRecurrenceFrequenceSecondly;
else
- freq = NSNotFound;
+ freq = (iCalRecurrenceFrequency) NSNotFound;
}
else
- freq = NSNotFound;
+ freq = (iCalRecurrenceFrequency) NSNotFound;
return freq;
}
diff --git a/SOPE/NGCards/iCalTrigger.m b/SOPE/NGCards/iCalTrigger.m
index 4a5c79dc3..d40c518b5 100644
--- a/SOPE/NGCards/iCalTrigger.m
+++ b/SOPE/NGCards/iCalTrigger.m
@@ -57,7 +57,7 @@
- (NSDictionary *) asDictionary
{
NSDictionary *data;
- NSString *duration, *relation, *reference, *quantity, *unit;
+ NSString *duration, *relation, *reference, *quantity=@"", *unit=@"";
NSUInteger i;
unichar c;
diff --git a/SOPE/NGCards/versitCardsSaxDriver/VSSaxDriver.m b/SOPE/NGCards/versitCardsSaxDriver/VSSaxDriver.m
index d9b906c8e..0e56a2d51 100644
--- a/SOPE/NGCards/versitCardsSaxDriver/VSSaxDriver.m
+++ b/SOPE/NGCards/versitCardsSaxDriver/VSSaxDriver.m
@@ -1045,7 +1045,7 @@ static NSCharacterSet *whitespaceCharSet = nil;
if (debugOn)
{
NSLog(@"%s: trying to decode data (0x%p,len=%d) ...",
- __PRETTY_FUNCTION__, _data, [_data length]);
+ __PRETTY_FUNCTION__, _data, (int)[_data length]);
}
if ((len = [_data length]) == 0)
@@ -1164,7 +1164,7 @@ static NSCharacterSet *whitespaceCharSet = nil;
if (debugOn)
{
NSLog(@"%s: trying to parse string (0x%p,len=%d) ...",
- __PRETTY_FUNCTION__, _source, [_source length]);
+ __PRETTY_FUNCTION__, _source, (int)[_source length]);
}
if (!_sysId) _sysId = @"";
[self _parseString: _source];
diff --git a/SoObjects/Appointments/MSExchangeFreeBusy.m b/SoObjects/Appointments/MSExchangeFreeBusy.m
index 57ae29e5d..de55e534f 100644
--- a/SoObjects/Appointments/MSExchangeFreeBusy.m
+++ b/SoObjects/Appointments/MSExchangeFreeBusy.m
@@ -344,7 +344,7 @@ size_t curl_body_function_freebusy(void *ptr, size_t size, size_t nmemb, void *i
NSMutableString *s;
s = [NSMutableString stringWithCapacity: 64];
- [s appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])];
+ [s appendFormat:@"<0x%08X[%@]:", (unsigned int)self, NSStringFromClass([self class])];
if (freeBusyViewType)
[s appendFormat:@" freeBusyViewType='%@'", freeBusyViewType];
if (mergedFreeBusy)
diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index 59acf97b4..9b465655f 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -84,7 +84,7 @@
#import "SOGoAppointmentFolders.h"
#import "SOGoFreeBusyObject.h"
#import "SOGoTaskObject.h"
-#import "SOGoWebAppointmentFolder.h";
+#import "SOGoWebAppointmentFolder.h"
#import "SOGoAppointmentFolder.h"
@@ -2337,7 +2337,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
request = [context request];
if (!([request isIPhone] || [request isICal4]))
{
- gdRT = [self groupDavResourceType];
+ gdRT = (NSArray *) [self groupDavResourceType];
gdVEventCol = [NSArray arrayWithObjects: [gdRT objectAtIndex: 0],
XMLNS_GROUPDAV, nil];
[colType addObject: gdVEventCol];
diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m
index e807b6bee..74dcac2d7 100644
--- a/SoObjects/Appointments/SOGoAppointmentObject.m
+++ b/SoObjects/Appointments/SOGoAppointmentObject.m
@@ -1992,7 +1992,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
if ([container resourceNameForEventUID: eventUID])
{
return [NSException exceptionWithHTTPStatus: 403
- reason: [NSString stringWithFormat: @"Event UID already in use. (%s)", eventUID]];
+ reason: [NSString stringWithFormat: @"Event UID already in use. (%@)", eventUID]];
}
//
diff --git a/SoObjects/Appointments/SOGoCalendarComponent.m b/SoObjects/Appointments/SOGoCalendarComponent.m
index ce600715b..d2a98d867 100644
--- a/SoObjects/Appointments/SOGoCalendarComponent.m
+++ b/SoObjects/Appointments/SOGoCalendarComponent.m
@@ -171,7 +171,7 @@
- (Class *) parsingClass
{
- return [iCalCalendar class];
+ return (Class *)[iCalCalendar class];
}
- (NSString *) davContentType
diff --git a/SoObjects/Appointments/iCalAlarm+SOGo.m b/SoObjects/Appointments/iCalAlarm+SOGo.m
index cb1cc57c0..4f98fc5eb 100644
--- a/SoObjects/Appointments/iCalAlarm+SOGo.m
+++ b/SoObjects/Appointments/iCalAlarm+SOGo.m
@@ -102,9 +102,9 @@
}
if ([reminderReference caseInsensitiveCompare: @"BEFORE"] == NSOrderedSame)
- aValue = [NSString stringWithString: @"-P"];
+ aValue = (NSString *) @"-P";
else
- aValue = [NSString stringWithString: @"P"];
+ aValue = (NSString *) @"P";
if ([reminderUnit caseInsensitiveCompare: @"MINUTES"] == NSOrderedSame ||
[reminderUnit caseInsensitiveCompare: @"HOURS"] == NSOrderedSame)
diff --git a/SoObjects/Appointments/iCalEvent+SOGo.m b/SoObjects/Appointments/iCalEvent+SOGo.m
index 75ce514f5..93f47aedf 100644
--- a/SoObjects/Appointments/iCalEvent+SOGo.m
+++ b/SoObjects/Appointments/iCalEvent+SOGo.m
@@ -267,7 +267,7 @@
- (NSTimeInterval) occurenceInterval
{
- return [[self endDate] timeIntervalSinceDate: [self startDate]];
+ return (NSTimeInterval) [[self endDate] timeIntervalSinceDate: [self startDate]];
}
/**
diff --git a/SoObjects/Appointments/iCalRepeatableEntityObject+SOGo.m b/SoObjects/Appointments/iCalRepeatableEntityObject+SOGo.m
index 79f56e0be..6fef789e5 100644
--- a/SoObjects/Appointments/iCalRepeatableEntityObject+SOGo.m
+++ b/SoObjects/Appointments/iCalRepeatableEntityObject+SOGo.m
@@ -162,7 +162,7 @@
rule = [iCalRecurrenceRule new];
[rule setInterval: @"1"];
- frequency = NSNotFound;
+ frequency = (int)NSNotFound;
o = [repeat objectForKey: @"frequency"];
if ([o isKindOfClass: [NSString class]])
{
diff --git a/SoObjects/Appointments/iCalToDo+SOGo.m b/SoObjects/Appointments/iCalToDo+SOGo.m
index dd7a38363..585f26fe0 100644
--- a/SoObjects/Appointments/iCalToDo+SOGo.m
+++ b/SoObjects/Appointments/iCalToDo+SOGo.m
@@ -214,7 +214,7 @@
{
percent = [o intValue];
if (percent >= 0 && percent <= 100)
- [self setPercentComplete: [NSString stringWithFormat: @"%i", percent]];
+ [self setPercentComplete: [NSString stringWithFormat: @"%i", (int)percent]];
}
else
[self setPercentComplete: @""];
diff --git a/SoObjects/Contacts/NGVCard+SOGo.m b/SoObjects/Contacts/NGVCard+SOGo.m
index 19c5d9084..72c580d2d 100644
--- a/SoObjects/Contacts/NGVCard+SOGo.m
+++ b/SoObjects/Contacts/NGVCard+SOGo.m
@@ -327,7 +327,7 @@ convention:
if (year && month && day)
[self setBday: [NSString stringWithFormat: @"%.4d-%.2d-%.2d",
- year, month, day]];
+ (int)year, (int)month, (int)day]];
else
[self setBday: @""];
@@ -644,11 +644,11 @@ convention:
birthDay = [[self bday] asCalendarDate];
if (birthDay)
{
- stringValue = [NSString stringWithFormat: @"%.4d", [birthDay yearOfCommonEra]];
+ stringValue = [NSString stringWithFormat: @"%.4d", (int)[birthDay yearOfCommonEra]];
[self _setValue: @"birthyear" to: stringValue inLDIFRecord: ldifRecord];
- stringValue = [NSString stringWithFormat: @"%.2d", [birthDay monthOfYear]];
+ stringValue = [NSString stringWithFormat: @"%.2d", (int)[birthDay monthOfYear]];
[self _setValue: @"birthmonth" to: stringValue inLDIFRecord: ldifRecord];
- stringValue = [NSString stringWithFormat: @"%.2d", [birthDay dayOfMonth]];
+ stringValue = [NSString stringWithFormat: @"%.2d", (int)[birthDay dayOfMonth]];
[self _setValue: @"birthday" to: stringValue inLDIFRecord: ldifRecord];
}
[self _setValue: @"description" to: [self note] inLDIFRecord: ldifRecord];
diff --git a/SoObjects/Contacts/SOGoContactEntryPhoto.m b/SoObjects/Contacts/SOGoContactEntryPhoto.m
index 0cbf83cf6..6ae248e08 100644
--- a/SoObjects/Contacts/SOGoContactEntryPhoto.m
+++ b/SoObjects/Contacts/SOGoContactEntryPhoto.m
@@ -59,7 +59,7 @@
[response setHeader: [self davContentType] forKey: @"content-type"];
[response setHeader: [NSString stringWithFormat:@" %d",
- [data length]]
+ (int)[data length]]
forKey: @"content-length"];
[response setContent: data];
}
diff --git a/SoObjects/Contacts/SOGoContactFolders.m b/SoObjects/Contacts/SOGoContactFolders.m
index b0428f7f4..e7984b172 100644
--- a/SoObjects/Contacts/SOGoContactFolders.m
+++ b/SoObjects/Contacts/SOGoContactFolders.m
@@ -268,9 +268,9 @@ Class SOGoContactSourceFolderK;
SOGoUser *currentUser;
id source;
- if ([sourceID isEqualToString: @"personal"])
- result = [NSException exceptionWithHTTPStatus: 403
- reason: (@"folder '%@' cannot be deleted", sourceID)];
+ if ([sourceID isEqualToString: @"personal"]){
+ result = [NSException exceptionWithHTTPStatus: 403 reason: [NSString stringWithFormat: (@"folder '%@' cannot be deleted"), sourceID]];
+ }
else
{
result = nil;
diff --git a/SoObjects/Contacts/SOGoContactGCSEntry.m b/SoObjects/Contacts/SOGoContactGCSEntry.m
index 4b5d5bd21..dfaa66426 100644
--- a/SoObjects/Contacts/SOGoContactGCSEntry.m
+++ b/SoObjects/Contacts/SOGoContactGCSEntry.m
@@ -50,7 +50,7 @@
- (Class *) parsingClass
{
- return [NGVCard class];
+ return (Class *)[NGVCard class];
}
/* content */
diff --git a/SoObjects/Contacts/SOGoContactGCSList.m b/SoObjects/Contacts/SOGoContactGCSList.m
index 61e68bf85..ad1b3277b 100644
--- a/SoObjects/Contacts/SOGoContactGCSList.m
+++ b/SoObjects/Contacts/SOGoContactGCSList.m
@@ -45,7 +45,7 @@
- (Class *) parsingClass
{
- return [NGVList class];
+ return (Class *)[NGVList class];
}
diff --git a/SoObjects/Contacts/SOGoContactSourceFolder.m b/SoObjects/Contacts/SOGoContactSourceFolder.m
index a52ec20b9..f245f1362 100644
--- a/SoObjects/Contacts/SOGoContactSourceFolder.m
+++ b/SoObjects/Contacts/SOGoContactSourceFolder.m
@@ -94,7 +94,7 @@
{
if (![newDisplayName length])
newDisplayName = newName;
- ASSIGN (displayName, newDisplayName);
+ ASSIGN (displayName, [newDisplayName mutableCopy]);
}
return self;
diff --git a/SoObjects/Mailer/NSString+Mail.m b/SoObjects/Mailer/NSString+Mail.m
index 1efdcb62f..f0e19046a 100644
--- a/SoObjects/Mailer/NSString+Mail.m
+++ b/SoObjects/Mailer/NSString+Mail.m
@@ -533,7 +533,7 @@
messageID = [NSMutableString string];
[messageID appendFormat: @"<%@", [SOGoObject globallyUniqueObjectId]];
pGUID = [[NSProcessInfo processInfo] globallyUniqueString];
- [messageID appendFormat: @"@%u>", [pGUID hash]];
+ [messageID appendFormat: @"@%u>", (unsigned int)[pGUID hash]];
return [messageID lowercaseString];
}
diff --git a/SoObjects/Mailer/SOGoMailBodyPart.m b/SoObjects/Mailer/SOGoMailBodyPart.m
index 2fb075f4c..71d2dd385 100644
--- a/SoObjects/Mailer/SOGoMailBodyPart.m
+++ b/SoObjects/Mailer/SOGoMailBodyPart.m
@@ -396,7 +396,7 @@ static BOOL debugOn = NO;
mimeType = @"application/octet-stream";
[response setHeader: mimeType forKey: @"content-type"];
- [response setHeader: [NSString stringWithFormat:@"%d", [data length]]
+ [response setHeader: [NSString stringWithFormat:@"%d", (int)[data length]]
forKey: @"content-length"];
if (asAttachment)
diff --git a/SoObjects/Mailer/SOGoMailFolder.m b/SoObjects/Mailer/SOGoMailFolder.m
index cf64c2e01..2fe050107 100644
--- a/SoObjects/Mailer/SOGoMailFolder.m
+++ b/SoObjects/Mailer/SOGoMailFolder.m
@@ -1674,7 +1674,7 @@ _compareFetchResultsByMODSEQ (id entry1, id entry2, void *data)
sortOrderings = [NSMutableArray array];
- if ([self _sortElementIsAscending: sortElement])
+ if ([self _sortElementIsAscending: (NGDOMNodeWithChildren *)sortElement])
sortOrderingOrder = EOCompareAscending;
else
sortOrderingOrder = EOCompareDescending;
diff --git a/SoObjects/Mailer/SOGoMailForward.m b/SoObjects/Mailer/SOGoMailForward.m
index 3450539d5..eab520cb8 100644
--- a/SoObjects/Mailer/SOGoMailForward.m
+++ b/SoObjects/Mailer/SOGoMailForward.m
@@ -73,10 +73,10 @@
- (NSString *) newLine
{
- NSString *rc = [NSString stringWithString: @" "];
+ NSString *rc = @" ";
if (htmlComposition)
- rc = [NSString stringWithString: @"
"];
+ rc = @"
";
return rc;
}
diff --git a/SoObjects/Mailer/SOGoMailLabel.m b/SoObjects/Mailer/SOGoMailLabel.m
index 1c66786f6..93dd59fd8 100644
--- a/SoObjects/Mailer/SOGoMailLabel.m
+++ b/SoObjects/Mailer/SOGoMailLabel.m
@@ -74,7 +74,7 @@
int i;
allLabels = [NSMutableArray array];
- allKeys = [[theDefaults allKeys] sortedArrayUsingSelector: @selector (caseInsensitiveCompare:)];
+ allKeys = [[[theDefaults allKeys] sortedArrayUsingSelector: @selector (caseInsensitiveCompare:)] mutableCopy];
for (i = 0; i < [allKeys count]; i++)
{
diff --git a/SoObjects/Mailer/SOGoMailObject.m b/SoObjects/Mailer/SOGoMailObject.m
index 7e695bcc2..1d44ddaa0 100644
--- a/SoObjects/Mailer/SOGoMailObject.m
+++ b/SoObjects/Mailer/SOGoMailObject.m
@@ -779,9 +779,14 @@ static BOOL debugSoParts = NO;
[mimeType hasPrefix: @"audio/"] ||
[mimeType hasPrefix: @"image/"] ||
[mimeType hasPrefix: @"video/"])
+ {
filename = [NSString stringWithFormat: @"unknown_%@", path];
- else if ([mimeType isEqualToString: @"message/rfc822"])
- filename = [NSString stringWithFormat: @"email_%@.eml", path];
+ }
+ else
+ {
+ if ([mimeType isEqualToString: @"message/rfc822"])
+ filename = [NSString stringWithFormat: @"email_%@.eml", path];
+ }
}
if (filename)
@@ -825,13 +830,13 @@ static BOOL debugSoParts = NO;
{
currentPart = [subparts objectAtIndex: i-1];
if (path)
- newPath = [NSString stringWithFormat: @"%@.%d", path, i];
+ newPath = [NSString stringWithFormat: @"%@.%d", path, (int)i];
else
- newPath = [NSString stringWithFormat: @"%d", i];
+ newPath = [NSString stringWithFormat: @"%d", (int)i];
[self _fetchFileAttachmentKeysInPart: currentPart
intoArray: keys
withPath: newPath
- andPrefix: [NSString stringWithFormat: @"%@/%i", prefix, i]];
+ andPrefix: [NSString stringWithFormat: @"%@/%i", prefix, (int)i]];
}
}
else
diff --git a/SoObjects/SOGo/BSONCodec.m b/SoObjects/SOGo/BSONCodec.m
index ce4c01e24..0e68f966c 100644
--- a/SoObjects/SOGo/BSONCodec.m
+++ b/SoObjects/SOGo/BSONCodec.m
@@ -310,7 +310,7 @@ static NSDictionary *BSONTypes()
case 'q': return 0x12;
default:
- [NSException raise: NSInvalidArgumentException format: @"%@::%s - invalid encoding type '%c'", [self class], _cmd, encoding];
+ [NSException raise: NSInvalidArgumentException format: @"%@::%@ - invalid encoding type '%c'", [self class], NSStringFromSelector(_cmd), encoding];
}
return 0;
}
@@ -385,7 +385,7 @@ static NSDictionary *BSONTypes()
}
- [NSException raise: NSInvalidArgumentException format: @"%@::%s - invalid encoding type '%c'", [self class], _cmd, encoding];
+ [NSException raise: NSInvalidArgumentException format: @"%@::%@ - invalid encoding type '%c'", [self class], NSStringFromSelector(_cmd), encoding];
return nil;
}
diff --git a/SoObjects/SOGo/LDAPSource.m b/SoObjects/SOGo/LDAPSource.m
index d537c6aec..55115efdd 100644
--- a/SoObjects/SOGo/LDAPSource.m
+++ b/SoObjects/SOGo/LDAPSource.m
@@ -1703,7 +1703,7 @@ _makeLDAPChanges (NGLdapConnection *ldapConnection,
hostname: hostname
port: [NSString stringWithFormat: @"%d", port]
encryption: encryption
- bindAsCurrentUser: NO];
+ bindAsCurrentUser: [NSString stringWithFormat: @"%d", NO]];
[ab setBaseDN: [entry dn]
IDField: @"cn"
CNField: @"displayName"
diff --git a/SoObjects/SOGo/NSCalendarDate+SOGo.m b/SoObjects/SOGo/NSCalendarDate+SOGo.m
index 2d496a2cc..6511e48d6 100644
--- a/SoObjects/SOGo/NSCalendarDate+SOGo.m
+++ b/SoObjects/SOGo/NSCalendarDate+SOGo.m
@@ -90,9 +90,9 @@ static NSString *rfc822Months[] = {@"", @"Jan", @"Feb", @"Mar", @"Apr",
NSString *str;
str = [NSString stringWithFormat: @"%.4d%.2d%.2d",
- [self yearOfCommonEra],
- [self monthOfYear],
- [self dayOfMonth]];
+ (int)[self yearOfCommonEra],
+ (int)[self monthOfYear],
+ (int)[self dayOfMonth]];
return str;
}
@@ -109,9 +109,9 @@ static NSString *rfc822Months[] = {@"", @"Jan", @"Feb", @"Mar", @"Apr",
return
[NSString stringWithFormat: @"%@, %.2d %@ %d %.2d:%.2d:%.2d %+.4d",
- rfc822Days[[self dayOfWeek]], [self dayOfMonth],
- rfc822Months[[self monthOfYear]], [self yearOfCommonEra],
- [self hourOfDay], [self minuteOfHour], [self secondOfMinute],
+ rfc822Days[[self dayOfWeek]], (int)[self dayOfMonth],
+ rfc822Months[[self monthOfYear]], (int)[self yearOfCommonEra],
+ (int)[self hourOfDay], (int)[self minuteOfHour], (int)[self secondOfMinute],
timeZoneShift];
}
diff --git a/SoObjects/SOGo/NSDictionary+DAV.m b/SoObjects/SOGo/NSDictionary+DAV.m
index 722e20511..a2d52e71e 100644
--- a/SoObjects/SOGo/NSDictionary+DAV.m
+++ b/SoObjects/SOGo/NSDictionary+DAV.m
@@ -46,7 +46,7 @@
{
NSString *newTag;
- newTag = [NSString stringWithFormat: @"n%d", [namespaces count]];
+ newTag = [NSString stringWithFormat: @"n%d", (int)[namespaces count]];
[namespaces setObject: newTag forKey: newNS];
return newTag;
diff --git a/SoObjects/SOGo/NSString+Utilities.m b/SoObjects/SOGo/NSString+Utilities.m
index 3895cd923..6dbcb9689 100644
--- a/SoObjects/SOGo/NSString+Utilities.m
+++ b/SoObjects/SOGo/NSString+Utilities.m
@@ -309,7 +309,7 @@ static int cssEscapingCount;
c == 0xD ||
(c >= 0x20 && c <= 0xD7FF) ||
(c >= 0xE000 && c <= 0xFFFD) ||
- (c >= 0x10000 && c <= 0x10FFFF))
+ (c >= (unichar)0x10000 && c <= (unichar)0x10FFFF))
{
*(start+j) = c;
j++;
diff --git a/SoObjects/SOGo/SOGoCacheGCSObject.m b/SoObjects/SOGo/SOGoCacheGCSObject.m
index 7956ecefd..ed2d33f52 100644
--- a/SoObjects/SOGo/SOGoCacheGCSObject.m
+++ b/SoObjects/SOGo/SOGoCacheGCSObject.m
@@ -87,7 +87,7 @@ static EOAttribute *textColumn = nil;
{
tableUrl = nil;
initialized = NO;
- objectType = -1;
+ objectType = (SOGoCacheObjectType) -1;
deleted = NO;
version = 0;
}
@@ -394,7 +394,7 @@ static EOAttribute *textColumn = nil;
@"SELECT * FROM %@ WHERE c_path = %@",
tableName, pathValue];
if (startVersion > -1)
- [sql appendFormat: @" AND c_version > %d", startVersion];
+ [sql appendFormat: @" AND c_version > %d", (int)startVersion];
/* execution */
records = [self performSQLQuery: sql];
@@ -422,18 +422,16 @@ static EOAttribute *textColumn = nil;
tableName = [self tableName];
adaptor = [self tableChannelAdaptor];
- pathValue = [adaptor formatValue: [NSString stringWithFormat: @"/%@", deviceId]
- forAttribute: textColumn];
/* query */
sql = [NSMutableString stringWithFormat:
@"SELECT * FROM %@ WHERE c_type = %d AND c_deleted <> 1", tableName, objectType];
if (startVersion > -1)
- [sql appendFormat: @" AND c_version > %d", startVersion];
+ [sql appendFormat: @" AND c_version > %d", (int)startVersion];
if (deviceId) {
- pathValue = [adaptor formatValue: [NSString stringWithFormat: @"/%@%", deviceId]
+ pathValue = [adaptor formatValue: [NSString stringWithFormat: @"/%@", deviceId]
forAttribute: textColumn];
[sql appendFormat: @" AND c_path like %@", pathValue];
}
@@ -557,7 +555,7 @@ static EOAttribute *textColumn = nil;
lastModifiedValue = (NSInteger) [lastModified timeIntervalSince1970];
- if (objectType == -1)
+ if (objectType == (SOGoCacheObjectType) -1)
[NSException raise: @"SOGoCacheIOException"
format: @"object type has not been set for object '%@'",
self];
@@ -587,7 +585,7 @@ static EOAttribute *textColumn = nil;
@")"),
tableName,
pathValue, parentPathValue, objectType,
- creationDateValue, lastModifiedValue,
+ (int)creationDateValue, (int)lastModifiedValue,
propsValue];
isNew = NO;
}
@@ -601,7 +599,7 @@ static EOAttribute *textColumn = nil;
@" c_version = %d, c_content = %@"
@" WHERE c_path = %@"),
tableName,
- lastModifiedValue, deletedValue, version, propsValue,
+ (int)lastModifiedValue, (int)deletedValue, (int)version, propsValue,
pathValue];
}
diff --git a/SoObjects/SOGo/SOGoContentObject.m b/SoObjects/SOGo/SOGoContentObject.m
index 088fe522e..2092deacc 100644
--- a/SoObjects/SOGo/SOGoContentObject.m
+++ b/SoObjects/SOGo/SOGoContentObject.m
@@ -94,7 +94,7 @@
{
[self subclassResponsibility: _cmd];
- return nil;
+ return (Class *) nil;
}
- (void) _setRecord: (NSDictionary *) objectRecord
@@ -254,6 +254,9 @@
- (NSException *) moveToFolder: (SOGoGCSFolder *) newFolder
{
[self subclassResponsibility: _cmd];
+
+ // TODO: Add exception handling code and return it
+ return (NSException *) nil;
}
- (NSException *) delete
@@ -345,7 +348,7 @@
/* attempt a save */
- error = [self saveComponent: [[self parsingClass] parseSingleFromSource: [rq contentAsString]]
+ error = [self saveComponent: [(id)[self parsingClass] parseSingleFromSource: [rq contentAsString]]
baseVersion: baseVersion];
if (error)
response = (WOResponse *) error;
@@ -410,7 +413,7 @@
else
length = 0;
- return [NSString stringWithFormat: @"%u", length];
+ return [NSString stringWithFormat: @"%u", (unsigned int)length];
}
- (NSException *) davMoveToTargetObject: (id) _target
diff --git a/SoObjects/SOGo/SOGoFolder.m b/SoObjects/SOGo/SOGoFolder.m
index b089c258a..219d7d1ce 100644
--- a/SoObjects/SOGo/SOGoFolder.m
+++ b/SoObjects/SOGo/SOGoFolder.m
@@ -107,7 +107,7 @@
- (void) setDisplayName: (NSString *) newDisplayName
{
- ASSIGN (displayName, newDisplayName);
+ ASSIGN (displayName, [newDisplayName mutableCopy]);
}
- (NSString *) displayName
diff --git a/SoObjects/SOGo/SOGoGCSFolder.m b/SoObjects/SOGo/SOGoGCSFolder.m
index 703030fd7..3acb64b30 100644
--- a/SoObjects/SOGo/SOGoGCSFolder.m
+++ b/SoObjects/SOGo/SOGoGCSFolder.m
@@ -376,12 +376,12 @@ static NSArray *childRecordFields = nil;
if (!displayName)
{
if (activeUserIsOwner)
- displayName = [self _displayNameFromOwner];
+ displayName = [[self _displayNameFromOwner] mutableCopy];
else
{
- displayName = [self _displayNameFromSubscriber];
+ displayName = [[self _displayNameFromSubscriber] mutableCopy];
if (!displayName)
- displayName = [self _displayNameFromOwner];
+ displayName = [[self _displayNameFromOwner] mutableCopy];
}
[displayName retain];
}
@@ -829,7 +829,7 @@ static NSArray *childRecordFields = nil;
{
currentID = [ids objectAtIndex: count];
names = [[currentID componentsSeparatedByString: @"/"] objectEnumerator];
- deleteObject = self;
+ deleteObject = (SOGoContentObject *)self;
while ((currentName = [names nextObject]))
{
deleteObject = [deleteObject lookupName: currentName
diff --git a/SoObjects/SOGo/SOGoGroup.m b/SoObjects/SOGo/SOGoGroup.m
index cacdd7770..c72095fb6 100644
--- a/SoObjects/SOGo/SOGoGroup.m
+++ b/SoObjects/SOGo/SOGoGroup.m
@@ -135,7 +135,7 @@
{
NSArray *allSources;
NGLdapEntry *entry;
- NSObject *source;
+ NSObject *source;
id o;
NSEnumerator *gclasses;
NSString *gclass;
@@ -154,7 +154,7 @@
for (i = 0; i < [allSources count]; i++)
{
- source = [[SOGoUserManager sharedUserManager] sourceWithID: [allSources objectAtIndex: i]];
+ source = (NSObject *) [[SOGoUserManager sharedUserManager] sourceWithID: [allSources objectAtIndex: i]];
// Our different sources might not all implements groups support
if ([source respondsToSelector: theSelector])
diff --git a/SoObjects/SOGo/SOGoObject.m b/SoObjects/SOGo/SOGoObject.m
index 3f3afcb9b..c54c0b76c 100644
--- a/SoObjects/SOGo/SOGoObject.m
+++ b/SoObjects/SOGo/SOGoObject.m
@@ -1066,7 +1066,7 @@
[_ms appendFormat:@" name=%@", nameInContainer];
if (container)
[_ms appendFormat:@" container=0x%08X/%@",
- container, [container valueForKey:@"nameInContainer"]];
+ (unsigned int)container, [container valueForKey:@"nameInContainer"]];
}
- (NSString *) description
@@ -1074,7 +1074,7 @@
NSMutableString *ms;
ms = [NSMutableString stringWithCapacity:64];
- [ms appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])];
+ [ms appendFormat:@"<0x%08X[%@]:", (unsigned int) self, NSStringFromClass([self class])];
[self appendAttributesToDescription:ms];
[ms appendString:@">"];
@@ -1084,7 +1084,7 @@
- (NSString *) loggingPrefix
{
return [NSString stringWithFormat:@"<0x%08X[%@]:%@>",
- self, NSStringFromClass([self class]),
+ (unsigned int) self, NSStringFromClass([self class]),
[self nameInContainer]];
}
diff --git a/Tests/Unit/SOGoTest.m b/Tests/Unit/SOGoTest.m
index ddee98f30..48dafb17c 100644
--- a/Tests/Unit/SOGoTest.m
+++ b/Tests/Unit/SOGoTest.m
@@ -245,10 +245,10 @@ NSString *_stringForCharacterAtIndex(NSUInteger index, NSString *str, NSUInteger
sc2 = _stringForCharacterAtIndex(i, str2, length2);
if ([sc1 isEqualToString: sc2])
- finalSTR = [finalSTR stringByAppendingFormat: @"%u |%@|\n", i, sc1];
+ finalSTR = [finalSTR stringByAppendingFormat: @"%lu |%@|\n", i, sc1];
else
{
- finalSTR = [finalSTR stringByAppendingFormat: @"%u |%@|%@|<--\n", i, sc1, sc2];
+ finalSTR = [finalSTR stringByAppendingFormat: @"%lu |%@|%@|<--\n", i, sc1, sc2];
differencesFound = YES;
}
}
diff --git a/Tests/Unit/TestNGMailAddressParser.m b/Tests/Unit/TestNGMailAddressParser.m
index 9801d509f..e5118e464 100644
--- a/Tests/Unit/TestNGMailAddressParser.m
+++ b/Tests/Unit/TestNGMailAddressParser.m
@@ -37,8 +37,8 @@
@"", // email between brackets
@"\"\" ", // doubled
// @"\"johndown@inverse.ca\" ", // with and without br.
- @"Àñinéoblabla ", // accented full name
- @"Àñinéoblabla Bla Blé ", // accented and multiword
+ @"=?utf-8?q?=C3=80=C3=B1in=C3=A9oblabla?= ", // accented full name
+ @"=?utf-8?q?=C3=80=C3=B1in=C3=A9oblabla_Bla_Bl=C3=A9?= ", // accented and multiword
@"John Down \"Bla Bla\" ", // partly quoted
@"John Down ", // full name + email
@"John, Down ", // full name with comma + email
@@ -123,8 +123,6 @@
testWithMessage([result isEqualToString: currentExp], error);
}
- currentRaw++;
- currentExp++;
}
}
@end
diff --git a/Tests/Unit/TestNGMimeAddressHeaderFieldGenerator.m b/Tests/Unit/TestNGMimeAddressHeaderFieldGenerator.m
index 3a5fe5fdf..ef34ae149 100644
--- a/Tests/Unit/TestNGMimeAddressHeaderFieldGenerator.m
+++ b/Tests/Unit/TestNGMimeAddressHeaderFieldGenerator.m
@@ -39,8 +39,8 @@
@"", // email between brackets
@"\"\" ", // doubled
@"\"wolfgang@inverse.ca\" ", // with and without br.
- @"Àñinéoblabla ", // accented full name
- @"Àñinéoblabla Bla Blé ", // accented and multiword
+ @"=?utf-8?q?=C3=80=C3=B1in=C3=A9oblabla?= ", // accented full name
+ @"=?utf-8?q?=C3=80=C3=B1in=C3=A9oblabla_Bla_Bl=C3=A9?= ", // accented and multiword
@"Wolfgang Sourdeau \"Bla Bla\" ", // partly quoted
@"Wolfgang Sourdeau ", // full name + email
nil };
@@ -50,8 +50,7 @@
@"\"\" ", // doubled
@"\"wolfgang@inverse.ca\" ", // with and without br.
@"=?utf-8?q?=C3=80=C3=B1in=C3=A9oblabla?= ", // accented full name
- @"=?utf-8?q?=C3=80=C3=B1in=C3=A9oblabla_Bla_Bl=C3=A9?= ", // accented
- // and multiword
+ @"=?utf-8?q?=C3=80=C3=B1in=C3=A9oblabla_Bla_Bl=C3=A9?= ", // accented and multiword
/* NOTE: the following are wrong but tolerated for now */
@"Wolfgang Sourdeau \"Bla Bla\" ", // partly quoted
diff --git a/Tests/Unit/TestNGMimeMessageGenerator.m b/Tests/Unit/TestNGMimeMessageGenerator.m
index 51b4e4745..f440bda97 100644
--- a/Tests/Unit/TestNGMimeMessageGenerator.m
+++ b/Tests/Unit/TestNGMimeMessageGenerator.m
@@ -117,7 +117,7 @@
NSString *diff = [self stringFromDiffBetween: [NSString stringWithString: resultString]
and: [NSString stringWithString: expected]];
NSString *testErrorMsg = [NSString
- stringWithFormat: @">> For %@ header received:\n%@[END]\n>> instead of:\n%@[END]\n>> for:\n%@\n>> diff:\n%@\n>> lengthReceived: %u lengthExpected: %u",
+ stringWithFormat: @">> For %@ header received:\n%@[END]\n>> instead of:\n%@[END]\n>> for:\n%@\n>> diff:\n%@\n>> lengthReceived: %lu lengthExpected: %lu",
header,
resultString,
expected,
diff --git a/Tests/Unit/TestVersit.m b/Tests/Unit/TestVersit.m
index 92ddf02bb..e09dce49f 100644
--- a/Tests/Unit/TestVersit.m
+++ b/Tests/Unit/TestVersit.m
@@ -34,6 +34,10 @@
- (void) test_rendering
{
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wobjc-string-compare"
+
CardElement *element;
CardVersitRenderer *renderer;
NSString *result;
@@ -137,10 +141,17 @@
testEquals(result, @"ELEM:NONEMPTY=coucou\r\n");
/** tests about parameters handling could be nice */
+
+#pragma clang diagnostic pop
+
}
- (void) test_parsing
{
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wobjc-string-compare"
+
CardGroup *group;
CardElement *element;
NSString *versit;
@@ -201,6 +212,9 @@
element = [group firstChildWithTag: @"element"];
testEquals([element flattenedValueAtIndex: 0 forKey: @""], @"value");
testEquals([element value: 0 ofAttribute: @"param1"], @"paramvalue1, with comma");
+
+#pragma clang diagnostic pop
+
}
@end
diff --git a/Tests/Unit/TestiCalRecurrenceCalculator.m b/Tests/Unit/TestiCalRecurrenceCalculator.m
index dcd9529d9..ae1d34f3d 100644
--- a/Tests/Unit/TestiCalRecurrenceCalculator.m
+++ b/Tests/Unit/TestiCalRecurrenceCalculator.m
@@ -107,7 +107,7 @@
[currentOccurrence descriptionWithCalendarFormat: dateFormat]];
testWithMessage([currentOccurrence isDateOnSameDay: [[occurrences objectAtIndex: j] startDate]], error);
}
- error = [NSString stringWithFormat: @"Unexpected number of occurrences for recurrence rule %@ (found %i, expected %i)",
+ error = [NSString stringWithFormat: @"Unexpected number of occurrences for recurrence rule %@ (found %ld, expected %ld)",
[currentRule objectAtIndex: 1],
[occurrences count],
[currentRule count] - 2];
@@ -211,7 +211,7 @@
[currentOccurrence descriptionWithCalendarFormat: dateFormat]];
testWithMessage([currentOccurrence isDateOnSameDay: [[occurrences objectAtIndex: j] startDate]], error);
}
- error = [NSString stringWithFormat: @"Unexpected number of occurrences for recurrence rule %@ (found %i, expected %i)",
+ error = [NSString stringWithFormat: @"Unexpected number of occurrences for recurrence rule %@ (found %ld, expected %ld)",
[currentRule objectAtIndex: 1],
[occurrences count],
[currentRule count] - 2];
@@ -376,7 +376,7 @@
[currentOccurrence descriptionWithCalendarFormat: dateFormat]];
testWithMessage([currentOccurrence isDateOnSameDay: [[occurrences objectAtIndex: j] startDate]], error);
}
- error = [NSString stringWithFormat: @"Unexpected number of occurrences for recurrence rule %@ (found %i, expected %i)",
+ error = [NSString stringWithFormat: @"Unexpected number of occurrences for recurrence rule %@ (found %ld, expected %ld)",
[currentRule objectAtIndex: 1],
[occurrences count],
[currentRule count] - 2];
diff --git a/Tests/Unit/TestiCalTimeZonePeriod.m b/Tests/Unit/TestiCalTimeZonePeriod.m
index 02325e9bc..b6eb1b1b7 100644
--- a/Tests/Unit/TestiCalTimeZonePeriod.m
+++ b/Tests/Unit/TestiCalTimeZonePeriod.m
@@ -80,8 +80,8 @@
testWithMessage ((NSInteger) [testDate timeIntervalSince1970]
== occurrenceSeconds[count],
([NSString stringWithFormat:
- @"test %d: seconds do not match:"
- @" delta = %d", count, delta]));
+ @"test %ld: seconds do not match:"
+ @" delta = %ld", count, delta]));
}
}
diff --git a/Tools/SOGoEAlarmsNotifier.m b/Tools/SOGoEAlarmsNotifier.m
index ad8cc8f7a..382e25675 100644
--- a/Tools/SOGoEAlarmsNotifier.m
+++ b/Tools/SOGoEAlarmsNotifier.m
@@ -81,8 +81,8 @@
timestamp = (int) [[NSDate date] timeIntervalSince1970];
pGUID = [[NSProcessInfo processInfo] globallyUniqueString];
- messageID = [NSString stringWithFormat: @"<%0X-%0X-%0X-%0X@%u>",
- pid, timestamp, sequence, random(), [pGUID hash]];
+ messageID = [NSString stringWithFormat: @"<%0X-%0X-%0X-%0X@%lu>",
+ pid, timestamp, sequence, (unsigned int)random(), [pGUID hash]];
return [messageID lowercaseString];
}
diff --git a/Tools/SOGoSockDOperation.m b/Tools/SOGoSockDOperation.m
index c3604b865..56cae6b35 100644
--- a/Tools/SOGoSockDOperation.m
+++ b/Tools/SOGoSockDOperation.m
@@ -145,7 +145,7 @@ Class SOGoContactSourceFolderKlass = Nil;
[self _appendEntry: [resultEntries objectAtIndex: count]
toResult: result];
- [result appendFormat: @"RESULT\ncode: %", resultCode];
+ [result appendFormat: @"RESULT\ncode: %d", resultCode];
[responseSocket
safeWriteData: [result dataUsingEncoding: NSASCIIStringEncoding]];
}
diff --git a/Tools/SOGoToolCreateFolder.m b/Tools/SOGoToolCreateFolder.m
index 423ec7266..2eba46e8b 100644
--- a/Tools/SOGoToolCreateFolder.m
+++ b/Tools/SOGoToolCreateFolder.m
@@ -97,7 +97,7 @@
rc = [self createFolder: folder withFM: fm];
if (!rc)
{
- NSLog (@"Create directory failed at path %s", folder);
+ NSLog (@"Create directory failed at path %@", folder);
return NO;
}
diff --git a/Tools/SOGoToolExpireUserSessions.m b/Tools/SOGoToolExpireUserSessions.m
index 98d40470e..dbe78d6d9 100644
--- a/Tools/SOGoToolExpireUserSessions.m
+++ b/Tools/SOGoToolExpireUserSessions.m
@@ -143,7 +143,7 @@
else
{
if (verbose)
- NSLog(@"No session to remove", sessionsToDelete);
+ NSLog(@"No session to remove");
}
[cm releaseChannel: channel];
diff --git a/Tools/SOGoToolManageEAS.m b/Tools/SOGoToolManageEAS.m
index 0e01da733..115f49eb6 100644
--- a/Tools/SOGoToolManageEAS.m
+++ b/Tools/SOGoToolManageEAS.m
@@ -227,7 +227,7 @@ typedef enum
NSMutableString *sql;
- sql = [NSMutableString stringWithFormat: @"DELETE FROM %@" @" WHERE c_path like '/%@%'", [oc tableName], deviceId];
+ sql = [NSMutableString stringWithFormat: @"DELETE FROM %@ WHERE c_path like '/%@'", [oc tableName], deviceId];
[oc performBatchSQLQueries: [NSArray arrayWithObject: sql]];
rc = YES;
diff --git a/Tools/SOGoToolRemoveDoubles.m b/Tools/SOGoToolRemoveDoubles.m
index c26254a6a..4d6a36115 100644
--- a/Tools/SOGoToolRemoveDoubles.m
+++ b/Tools/SOGoToolRemoveDoubles.m
@@ -175,7 +175,7 @@
now = [NSCalendarDate date];
delSql = [NSString stringWithFormat: @"UPDATE %@"
- @" SET c_deleted = 1, c_lastmodified = %d,"
+ @" SET c_deleted = 1, c_lastmodified = %lu,"
@" c_content = ''"
@" WHERE c_name = '%@'",
tableName,
diff --git a/Tools/SOGoToolRenameUser.m b/Tools/SOGoToolRenameUser.m
index 937424d76..cf260134e 100644
--- a/Tools/SOGoToolRenameUser.m
+++ b/Tools/SOGoToolRenameUser.m
@@ -148,7 +148,7 @@
if (sqlError)
{
[ac rollbackTransaction];
- NSLog([sqlError reason]);
+ NSLog(@"%@", [sqlError reason]);
}
else
rc = [ac commitTransaction];
@@ -201,7 +201,7 @@
if (sqlError)
{
[ac rollbackTransaction];
- NSLog([sqlError reason]);
+ NSLog(@"%@", [sqlError reason]);
}
else
rc = [ac commitTransaction];
diff --git a/Tools/SOGoToolUserPreferences.m b/Tools/SOGoToolUserPreferences.m
index 4f981cb4f..8d144fcb7 100644
--- a/Tools/SOGoToolUserPreferences.m
+++ b/Tools/SOGoToolUserPreferences.m
@@ -115,7 +115,7 @@ typedef enum
[theKey caseInsensitiveCompare: @"Vacation"] == NSOrderedSame)
{
/* credentials file handling */
- NSString *credsFilename, *authname, *authpwd;
+ NSString *credsFilename=nil, *authname=nil, *authpwd=nil;
SOGoCredentialsFile *cf;
credsFilename = [[NSUserDefaults standardUserDefaults] stringForKey: @"p"];
diff --git a/Tools/sogo-tool.m b/Tools/sogo-tool.m
index bc4755416..85c87d528 100644
--- a/Tools/sogo-tool.m
+++ b/Tools/sogo-tool.m
@@ -149,7 +149,7 @@
command, [currentTool objectAtIndex: 1]];
}
- NSLog (helpString);
+ NSLog (@"%@", helpString);
}
- (void) registerTools
diff --git a/UI/Common/UIxToolbar.m b/UI/Common/UIxToolbar.m
index b5b925e17..e3ce52a20 100644
--- a/UI/Common/UIxToolbar.m
+++ b/UI/Common/UIxToolbar.m
@@ -167,7 +167,7 @@
[self errorWithFormat:
@"not toolbar configuration found on SoObject: %@ (%@)",
[self clientObject], [[self clientObject] soClass]];
- toolbarConfig = [[NSNull null] retain];
+ toolbarConfig = (NSArray *)[[NSNull null] retain];
return nil;
}
diff --git a/UI/Contacts/UIxContactActions.m b/UI/Contacts/UIxContactActions.m
index b1d9e1269..9706e402c 100644
--- a/UI/Contacts/UIxContactActions.m
+++ b/UI/Contacts/UIxContactActions.m
@@ -141,7 +141,7 @@
content = [NSMutableString string];
response = [context response];
- [content appendFormat: [[self clientObject] contentAsString]];
+ [content appendFormat: @"%@", [[self clientObject] contentAsString]];
[response setHeader: @"text/plain; charset=utf-8"
forKey: @"content-type"];
[response appendContentString: content];
diff --git a/UI/Contacts/UIxContactFolderActions.m b/UI/Contacts/UIxContactFolderActions.m
index 017bd0049..ff934773e 100644
--- a/UI/Contacts/UIxContactFolderActions.m
+++ b/UI/Contacts/UIxContactFolderActions.m
@@ -81,9 +81,9 @@
inContext: [self context]
acquire: NO];
if ([currentChild respondsToSelector: @selector (vCard)])
- [content appendFormat: [[currentChild ldifRecord] ldifRecordAsString]];
+ [content appendFormat: @"%@", [[currentChild ldifRecord] ldifRecordAsString]];
else if ([currentChild respondsToSelector: @selector (vList)])
- [content appendFormat: [[currentChild vList] ldifString]];
+ [content appendFormat: @"%@", [[currentChild vList] ldifString]];
[content appendString: @"\n"];
}
diff --git a/UI/Contacts/UIxContactView.m b/UI/Contacts/UIxContactView.m
index eb77e7ded..e2d634746 100644
--- a/UI/Contacts/UIxContactView.m
+++ b/UI/Contacts/UIxContactView.m
@@ -384,7 +384,7 @@
data = [NSMutableString string];
[data appendString: postalCode];
if ([postalCode length] > 0 && [country length] > 0)
- [data appendFormat: @", ", country];
+ [data appendFormat: @", "];
[data appendString: country];
return [self _cardStringWithLabel: nil value: data];
diff --git a/UI/MailPartViewers/UIxMailPartHTMLViewer.m b/UI/MailPartViewers/UIxMailPartHTMLViewer.m
index f1ead5ffd..9f156d218 100644
--- a/UI/MailPartViewers/UIxMailPartHTMLViewer.m
+++ b/UI/MailPartViewers/UIxMailPartHTMLViewer.m
@@ -551,9 +551,9 @@ static NSData* _sanitizeContent(NSData *theData)
else
skipAttribute = YES;
}
- else if ([name isEqualToString: @"background"] ||
+ else if (([name isEqualToString: @"background"] ||
([name isEqualToString: @"data"]
- || [name isEqualToString: @"classid"])
+ || [name isEqualToString: @"classid"]))
&& [lowerName isEqualToString: @"object"])
{
value = [_attributes valueAtIndex: count];
@@ -741,7 +741,7 @@ static NSData* _sanitizeContent(NSData *theData)
/* SaxLexicalHandler */
- (void) comment: (unichar *) _chars
- length: (NSUInteger) _len
+ length: (int) _len
{
showWhoWeAre();
if (inStyle)
@@ -807,7 +807,7 @@ static NSData* _sanitizeContent(NSData *theData)
}
[dump appendFormat: @"--- end ---\n"];
- NSLog(dump);
+ NSLog(@"%@", dump);
[dump release];
}
diff --git a/UI/MailPartViewers/UIxMailPartMessageViewer.m b/UI/MailPartViewers/UIxMailPartMessageViewer.m
index 67052555d..dfb5bb3eb 100644
--- a/UI/MailPartViewers/UIxMailPartMessageViewer.m
+++ b/UI/MailPartViewers/UIxMailPartMessageViewer.m
@@ -228,7 +228,7 @@
info = [parts objectAtIndex: i];
viewer = [[[self context] mailRenderingContext] viewerForBodyInfo: info];
[viewer setBodyInfo: info];
- [viewer setPartPath: [[self contentPartPath] arrayByAddingObject: [NSString stringWithFormat: @"%d", i+1]]];
+ [viewer setPartPath: [[self contentPartPath] arrayByAddingObject: [NSString stringWithFormat: @"%d", (int)i+1]]];
[renderedParts addObject: [viewer renderedPart]];
}
}
diff --git a/UI/MailPartViewers/UIxMailPartMixedViewer.h b/UI/MailPartViewers/UIxMailPartMixedViewer.h
index 3c49cd64c..a450bbd8f 100644
--- a/UI/MailPartViewers/UIxMailPartMixedViewer.h
+++ b/UI/MailPartViewers/UIxMailPartMixedViewer.h
@@ -33,7 +33,7 @@
- (void) setChildInfo: (id) _info;
- (id) childInfo;
-- (void) setChildIndex: (unsigned int) _index;
+- (void) setChildIndex: (NSUInteger) _index;
- (id) childPartPath;
diff --git a/UI/MailPartViewers/UIxMailPartMixedViewer.m b/UI/MailPartViewers/UIxMailPartMixedViewer.m
index 577de6e4b..5bd0073d3 100644
--- a/UI/MailPartViewers/UIxMailPartMixedViewer.m
+++ b/UI/MailPartViewers/UIxMailPartMixedViewer.m
@@ -61,7 +61,7 @@
return [NSString stringWithFormat: @"%u",
(unsigned int) ([self childIndex] + 1)];
char buf[8];
- sprintf(buf, "%d", [self childIndex] + 1);
+ sprintf(buf, "%d", (int)[self childIndex] + 1);
return [NSString stringWithCString:buf];
}
diff --git a/UI/MailPartViewers/UIxMailPartViewer.m b/UI/MailPartViewers/UIxMailPartViewer.m
index 8721e47ef..ec8d1897d 100644
--- a/UI/MailPartViewers/UIxMailPartViewer.m
+++ b/UI/MailPartViewers/UIxMailPartViewer.m
@@ -287,7 +287,7 @@
if ([filename length])
// We replace any slash by a dash since Apache won't allow encoded slashes by default.
// See http://httpd.apache.org/docs/2.2/mod/core.html#allowencodedslashes
- filename = [filename stringByReplacingString: @"/" withString: @"-"];
+ filename = [[filename stringByReplacingString: @"/" withString: @"-"] mutableCopy];
else
[filename appendFormat: @"%@-%@",
[self labelForKey: @"Untitled"],
diff --git a/UI/MailerUI/UIxMailFolderActions.m b/UI/MailerUI/UIxMailFolderActions.m
index cf1f4be3a..e3edf3873 100644
--- a/UI/MailerUI/UIxMailFolderActions.m
+++ b/UI/MailerUI/UIxMailFolderActions.m
@@ -451,7 +451,7 @@
NSMutableDictionary *moduleSettings, *threadsCollapsed;
NSMutableArray *mailboxThreadsCollapsed;
NSString *destinationFolder;
- SOGoUserSettings *us;
+ SOGoUserSettings *us=nil;
WOResponse *response;
NSDictionary *data;
SOGoMailFolder *co;
diff --git a/UI/MailerUI/UIxMailMainFrame.m b/UI/MailerUI/UIxMailMainFrame.m
index 23fe5ca10..848b2e57c 100644
--- a/UI/MailerUI/UIxMailMainFrame.m
+++ b/UI/MailerUI/UIxMailMainFrame.m
@@ -620,7 +620,7 @@
- (NSString *) columnsDisplayCount
{
- return [NSString stringWithFormat: @"%d", [[self columnsDisplayOrder] count]];
+ return [NSString stringWithFormat: @"%d", (int)[[self columnsDisplayOrder] count]];
}
- (void) setCurrentColumn: (NSDictionary *) newCurrentColumn
diff --git a/UI/MailerUI/UIxMailView.m b/UI/MailerUI/UIxMailView.m
index ba297b53c..47347969e 100644
--- a/UI/MailerUI/UIxMailView.m
+++ b/UI/MailerUI/UIxMailView.m
@@ -57,6 +57,7 @@
#import
#import // cyclic
#import
+#import
#import "WOContext+UIxMailer.h"
#import "UIxMailFormatter.h"
@@ -229,7 +230,7 @@ static NSString *mailETag = nil;
- (id ) defaultAction
{
- id response;
+ WOResponse *response;
NSString *s;
NSMutableDictionary *data;
NSArray *addresses;
diff --git a/UI/MainUI/SOGoMicrosoftActiveSyncActions.m b/UI/MainUI/SOGoMicrosoftActiveSyncActions.m
index c487d5cce..a6c4e3152 100644
--- a/UI/MainUI/SOGoMicrosoftActiveSyncActions.m
+++ b/UI/MainUI/SOGoMicrosoftActiveSyncActions.m
@@ -47,7 +47,7 @@
id dispatcher;
Class clazz;
- request = [context request];
+ request = (WORequest *)[context request];
response = [self responseWithStatus: 200];
bundle = [NSBundle bundleForClass: NSClassFromString(@"ActiveSyncProduct")];
diff --git a/UI/MainUI/SOGoUserHomePage.m b/UI/MainUI/SOGoUserHomePage.m
index d8e956cca..99dd80a91 100644
--- a/UI/MainUI/SOGoUserHomePage.m
+++ b/UI/MainUI/SOGoUserHomePage.m
@@ -193,7 +193,7 @@
timeZone: [currentStartDate timeZone]];
// Increment counters for quarters of first hour
- hourKey = [NSString stringWithFormat: @"%u", [currentDate hourOfDay]];
+ hourKey = [NSString stringWithFormat: @"%u", (unsigned int)[currentDate hourOfDay]];
hourData = [dayData objectForKey: hourKey];
if (!hourData)
{
@@ -224,7 +224,7 @@
while ([currentDate compare: currentEndDate] == NSOrderedAscending &&
[currentEndDate timeIntervalSinceDate: currentDate] >= 3600) // 1 hour
{
- hourKey = [NSString stringWithFormat: @"%u", [currentDate hourOfDay]];
+ hourKey = [NSString stringWithFormat: @"%u", (unsigned int)[currentDate hourOfDay]];
hourData = [dayData objectForKey: hourKey];
if (!hourData)
{
@@ -251,7 +251,7 @@
// Increment counters for quarters of last hour
if ([currentEndDate timeIntervalSinceDate: currentDate] > 0)
{
- hourKey = [NSString stringWithFormat: @"%u", [currentDate hourOfDay]];
+ hourKey = [NSString stringWithFormat: @"%u", (unsigned int)[currentDate hourOfDay]];
hourData = [dayData objectForKey: hourKey];
if (!hourData)
{
diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m
index cbe536eab..9a4adf36c 100644
--- a/UI/PreferencesUI/UIxPreferences.m
+++ b/UI/PreferencesUI/UIxPreferences.m
@@ -1471,15 +1471,15 @@ static NSArray *reminderValues = nil;
// if ([account updateFilters])
// // If Sieve is not enabled, the SOGoSieveManager will immediatly return a positive answer
// // See [SOGoSieveManager updateFiltersForAccount:withUsername:andPassword:]
-// results = [self responseWithStatus: 200
+// results = (id )[self responseWithStatus: 200
// andJSONRepresentation: [NSDictionary dictionaryWithObjectsAndKeys: [NSNumber numberWithBool:hasChanged], @"hasChanged", nil]];
// else
-// results = [self responseWithStatus: 502
+// results = (id )[self responseWithStatus: 502
// andJSONRepresentation: [NSDictionary dictionaryWithObjectsAndKeys: @"Connection error", @"textStatus", nil]];
// }
// else
-// results = [self responseWithStatus: 503
+// results = (id )[self responseWithStatus: 503
// andJSONRepresentation: [NSDictionary dictionaryWithObjectsAndKeys: @"Service temporarily unavailable", @"textStatus", nil]];
// }
// else
@@ -2167,12 +2167,12 @@ static NSArray *reminderValues = nil;
if (![account updateFilters])
{
- results = [self responseWithStatus: 502
+ results = (id ) [self responseWithStatus: 502
andJSONRepresentation: [NSDictionary dictionaryWithObjectsAndKeys: @"Connection error", @"textStatus", nil]];
}
}
else
- results = [self responseWithStatus: 503
+ results = (id ) [self responseWithStatus: 503
andJSONRepresentation: [NSDictionary dictionaryWithObjectsAndKeys: @"Service temporarily unavailable", @"textStatus", nil]];
}
}
@@ -2184,7 +2184,7 @@ static NSArray *reminderValues = nil;
}
if (!results)
- results = [self responseWithStatus: 200];
+ results = (id ) [self responseWithStatus: 200];
return results;
}
diff --git a/UI/SOGoUI/SOGoAptFormatter.m b/UI/SOGoUI/SOGoAptFormatter.m
index dbd49401d..163606d42 100644
--- a/UI/SOGoUI/SOGoAptFormatter.m
+++ b/UI/SOGoUI/SOGoAptFormatter.m
@@ -155,14 +155,14 @@
*/
[_buf appendFormat:@"%02i:%02i",
- [_date hourOfDay],
- [_date minuteOfHour]];
+ (int)[_date hourOfDay],
+ (int)[_date minuteOfHour]];
if (_refDate && ![_date isDateOnSameDay:_refDate]) {
[_buf appendFormat:@" (%02i-%02i",
- [_date monthOfYear],
- [_date dayOfMonth]];
+ (int)[_date monthOfYear],
+ (int)[_date dayOfMonth]];
if ([_date yearOfCommonEra] != [_refDate yearOfCommonEra])
- [_buf appendFormat:@"-%04i", [_date yearOfCommonEra]];
+ [_buf appendFormat:@"-%04i", (int)[_date yearOfCommonEra]];
[_buf appendString:@")"];
}
}
diff --git a/UI/Scheduler/UIxCalDateSelector.m b/UI/Scheduler/UIxCalDateSelector.m
index 2b2559fe3..a9bb518f3 100644
--- a/UI/Scheduler/UIxCalDateSelector.m
+++ b/UI/Scheduler/UIxCalDateSelector.m
@@ -117,7 +117,7 @@
date = [self startDate];
- return [NSString stringWithFormat: @"%.2d", [date monthOfYear]];
+ return [NSString stringWithFormat: @"%.2d", (int)[date monthOfYear]];
}
- (NSString *) headerMonthString
@@ -136,7 +136,7 @@
date = [self startDate];
- return [NSString stringWithFormat: @"%d", [date yearOfCommonEra]];
+ return [NSString stringWithFormat: @"%d", (int)[date yearOfCommonEra]];
}
- (NSString *) localizedDayOfWeekName
diff --git a/UI/Scheduler/UIxCalDayTable.h b/UI/Scheduler/UIxCalDayTable.h
index 1e63c5574..ceaed3b56 100644
--- a/UI/Scheduler/UIxCalDayTable.h
+++ b/UI/Scheduler/UIxCalDayTable.h
@@ -39,7 +39,8 @@
NSArray *weekDays;
NSString *currentView, *timeFormat, *currentTableHour;
NSCalendarDate *startDate, *currentTableDay;
- NSMutableArray *daysToDisplay, *calendarsToDisplay, *currentCalendar, *hoursToDisplay;
+ NSMutableArray *daysToDisplay, *calendarsToDisplay, *hoursToDisplay;
+ NSMutableDictionary *currentCalendar;
unsigned int numberOfDays;
}
@@ -55,7 +56,7 @@
- (NSArray *) calendarsToDisplay;
- (void) setCurrentTableDay: (NSCalendarDate *) aTableDay;
- (NSCalendarDate *) currentTableDay;
-- (NSMutableArray *) currentCalendar;
+- (NSMutableDictionary *) currentCalendar;
@end
diff --git a/UI/Scheduler/UIxCalDayTable.m b/UI/Scheduler/UIxCalDayTable.m
index 737b51959..c20ed1838 100644
--- a/UI/Scheduler/UIxCalDayTable.m
+++ b/UI/Scheduler/UIxCalDayTable.m
@@ -193,7 +193,7 @@
NSMutableDictionary *calendar;
unsigned int count, foldersCount;
NSString *folderName, *fDisplayName;
- NSNumber *isActive;
+ BOOL isActive;
co = [self clientObject];
folders = [co subFolders];
@@ -202,8 +202,8 @@
for (count = 0; count < foldersCount; count++)
{
folder = [folders objectAtIndex: count];
- isActive = [NSNumber numberWithBool: [folder isActive]];
- if ([isActive intValue] != 0) {
+ isActive = [folder isActive];
+ if (isActive != NO) {
calendar = [NSMutableDictionary dictionary];
folderName = [folder nameInContainer];
fDisplayName = [folder displayName];
@@ -216,7 +216,7 @@
[calendar setObject: fDisplayName forKey: @"displayName"];
[calendar setObject: folderName forKey: @"folder"];
[calendar setObject: [folder calendarColor] forKey: @"color"];
- [calendar setObject: isActive forKey: @"active"];
+ [calendar setObject: [NSNumber numberWithBool:isActive] forKey: @"active"];
[calendar setObject: [folder ownerInContext: context]
forKey: @"owner"];
[calendarsToDisplay addObject: calendar];
@@ -237,12 +237,12 @@
return currentTableDay;
}
-- (void) setCurrentCalendar: (NSMutableArray *) aCalendar
+- (void) setCurrentCalendar: (NSMutableDictionary *) aCalendar
{
ASSIGN(currentCalendar, aCalendar);
}
-- (NSMutableArray *) currentCalendar
+- (NSMutableDictionary *) currentCalendar
{
return currentCalendar;
}
diff --git a/UI/Scheduler/UIxCalDayView.m b/UI/Scheduler/UIxCalDayView.m
index 8dca83462..8f2644370 100644
--- a/UI/Scheduler/UIxCalDayView.m
+++ b/UI/Scheduler/UIxCalDayView.m
@@ -164,7 +164,7 @@
date = [self selectedDate];
hmString = [NSString stringWithFormat:@"%.2d%.2d",
- [date hourOfDay], [date minuteOfHour]];
+ (int)[date hourOfDay], (int)[date minuteOfHour]];
qp = [[self queryParameters] mutableCopy];
[self setSelectedDateQueryParameter:date inDictionary:qp];
[qp setObject: hmString forKey:@"hm"];
diff --git a/UI/Scheduler/UIxCalListingActions.m b/UI/Scheduler/UIxCalListingActions.m
index d45dc8c8f..9e6a5bf81 100644
--- a/UI/Scheduler/UIxCalListingActions.m
+++ b/UI/Scheduler/UIxCalListingActions.m
@@ -367,7 +367,7 @@ static NSArray *tasksFields = nil;
NSString *owner, *role, *calendarName, *iCalString, *recurrenceTime;
NSRange match;
iCalCalendar *calendar;
- iCalObject *master;
+ iCalEntityObject *master;
SOGoAppointmentFolder *currentFolder;
SOGoAppointmentFolders *clientObject;
SOGoUser *ownerUser;
@@ -400,11 +400,11 @@ static NSArray *tasksFields = nil;
else if ([criteria isEqualToString:@"entireContent"])
{
// First search : Through the quick table inside the location, category and title columns
- quickInfos = [currentFolder fetchCoreInfosFrom: startDate
+ quickInfos = [[currentFolder fetchCoreInfosFrom: startDate
to: endDate
title: value
component: component
- additionalFilters: criteria];
+ additionalFilters: criteria] mutableCopy];
// Save the c_name in another array to compare with
if ([quickInfos count] > 0)
@@ -416,10 +416,10 @@ static NSArray *tasksFields = nil;
}
// Second research : Every objects except for those already in the quickInfos array
- allInfos = [currentFolder fetchCoreInfosFrom: startDate
+ allInfos = [[currentFolder fetchCoreInfosFrom: startDate
to: endDate
title: nil
- component: component];
+ component: component] mutableCopy];
if (quickInfosFlag == YES)
{
for (i = ([allInfos count] - 1); i >= 0 ; i--) {
@@ -433,7 +433,7 @@ static NSArray *tasksFields = nil;
{
iCalString = [[allInfos objectAtIndex:i] objectForKey:@"c_content"];
calendar = [iCalCalendar parseSingleFromSource: iCalString];
- master = [calendar firstChildWithTag:component];
+ master = (iCalEntityObject *)[calendar firstChildWithTag:component];
if (master) {
if ([[master comment] length] > 0)
{
@@ -1314,7 +1314,7 @@ _computeBlocksPosition (NSArray *blocks)
if ([currentView isEqualToString: @"multicolumndayview"])
{
- calendars = [self _selectedCalendars];
+ calendars = [[self _selectedCalendars] mutableCopy];
eventsByCalendars = [NSMutableArray arrayWithCapacity:[calendars count]];
for (i = 0; i < [calendars count]; i++) // For each calendar
{
diff --git a/UI/Scheduler/UIxCalMonthView.m b/UI/Scheduler/UIxCalMonthView.m
index 6ae274a45..0e0832c22 100644
--- a/UI/Scheduler/UIxCalMonthView.m
+++ b/UI/Scheduler/UIxCalMonthView.m
@@ -271,7 +271,7 @@
[classes appendFormat: @"day weekOf%d week%dof%d day%d",
numberOfWeeks,
- [weeksToDisplay indexOfObject: currentWeek],
+ (int)[weeksToDisplay indexOfObject: currentWeek],
numberOfWeeks, dayOfWeek];
if (realDayOfWeek == 0 || realDayOfWeek == 6)
[classes appendString: @" weekEndDay"];
diff --git a/UI/Scheduler/UIxCalViewPrint.m b/UI/Scheduler/UIxCalViewPrint.m
index 813e2e2ad..c49fd8a18 100644
--- a/UI/Scheduler/UIxCalViewPrint.m
+++ b/UI/Scheduler/UIxCalViewPrint.m
@@ -49,6 +49,7 @@ static NSArray *layoutItems = nil;
- (void) dealloc
{
[item release];
+ [super dealloc];
}
- (void) setItem: (NSString *) newItem
@@ -68,7 +69,7 @@ static NSArray *layoutItems = nil;
- (NSString *) itemPrintLayoutText
{
- return [self labelForKey: [NSString stringWithFormat: item]];
+ return [self labelForKey: [NSString stringWithFormat: @"%@", item]];
}
//
diff --git a/UI/Scheduler/UIxComponentEditor.m b/UI/Scheduler/UIxComponentEditor.m
index a8e67b593..8da53b366 100644
--- a/UI/Scheduler/UIxComponentEditor.m
+++ b/UI/Scheduler/UIxComponentEditor.m
@@ -896,7 +896,7 @@ static NSArray *reminderValues = nil;
content = [NSMutableString string];
response = [context response];
- [content appendFormat: [[self clientObject] contentAsString]];
+ [content appendFormat: @"%@", [[self clientObject] contentAsString]];
[response setHeader: @"text/plain; charset=utf-8"
forKey: @"content-type"];
[response appendContentString: content];
diff --git a/UI/Scheduler/UIxRecurrenceEditor.m b/UI/Scheduler/UIxRecurrenceEditor.m
index f423fbbe5..7184277e8 100644
--- a/UI/Scheduler/UIxRecurrenceEditor.m
+++ b/UI/Scheduler/UIxRecurrenceEditor.m
@@ -158,7 +158,7 @@
[shortWeekDaysList retain];
}
- id = [NSString stringWithFormat: @"weekDay%i", [shortWeekDaysList indexOfObject: item]];
+ id = [NSString stringWithFormat: @"weekDay%i", (int)[shortWeekDaysList indexOfObject: item]];
return id;
}