fixed gcc 4.0 warnings

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@775 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-ical/NGiCal/ChangeLog b/sope-ical/NGiCal/ChangeLog
index c15b752fd1287f8e931d42aa9f813cbdf2511ee9..6c1fe824b1ad03fac2cab08eeb76ed8d4283e435 100644 (file)
--- a/sope-ical/NGiCal/ChangeLog
+++ b/sope-ical/NGiCal/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-25  Helge Hess  <helge.hess@opengroupware.org>
+
+       * iCalDateHolder.m, iCalDataSource.m: fixed gcc 4.0 warnings (v4.5.51)
+
 2005-03-23  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * v4.5.50

diff --git a/sope-ical/NGiCal/Version b/sope-ical/NGiCal/Version
index a3ca3e852b6ab7033a6343aadcc9c472e70bd2f0..c7038352056248b728bea3eb1ffa9b0053d673e9 100644 (file)
--- a/sope-ical/NGiCal/Version
+++ b/sope-ical/NGiCal/Version
@@ -2,7 +2,7 @@
 
 MAJOR_VERSION=4
 MINOR_VERSION=5
-SUBMINOR_VERSION:=50
+SUBMINOR_VERSION:=51
 
 # v4.5.40 requires NGExtensions v4.5.145
 # v4.5.37 requires NGExtensions v4.5.140

diff --git a/sope-ical/NGiCal/iCalDataSource.m b/sope-ical/NGiCal/iCalDataSource.m
index 92b00f98c34371c9fb9369b7ab9d6db0061538c9..b84c39402b83ad77ca1e68493311a9c3271a6915 100644 (file)
--- a/sope-ical/NGiCal/iCalDataSource.m
+++ b/sope-ical/NGiCal/iCalDataSource.m
@@ -163,13 +163,14 @@ static SaxObjectDecoder *sax = nil;
     NSArray  *calendars;
     unsigned i, count;
     
-    if (![[_cal objectForKey:@"tag"] isEqualToString:@"iCalendar"]) {
+    if (![[(NSDictionary *)_cal objectForKey:@"tag"] 
+          isEqualToString:@"iCalendar"]) {
       [self logWithFormat:
              @"ERROR: calendar (entity=%@) passed in as a dictionary: %@", 
              _cal];
     }
     
-    if ((calendars = [_cal objectForKey:@"subcomponents"]) == nil)
+    if ((calendars=[(NSDictionary *)_cal objectForKey:@"subcomponents"])==nil)
       return nil;
 
     count = [calendars count];

diff --git a/sope-ical/NGiCal/iCalDateHolder.m b/sope-ical/NGiCal/iCalDateHolder.m
index 202bb1e551393ef17e41bb80c7e46f0fc30b59fb..9f12d2e72958f5e06a2c63a8a68503fb5d734acc 100644 (file)
--- a/sope-ical/NGiCal/iCalDateHolder.m
+++ b/sope-ical/NGiCal/iCalDateHolder.m
@@ -122,7 +122,7 @@ static NSTimeZone *gmt = nil;
   if ([s rangeOfString:@"T"].length == 0 && [s length] == 8) {
     /* hm, maybe a date without a time? like an allday event! */
     int year, month, day;
-    unsigned char buf[16];
+    char buf[16];
     [s getCString:&(buf[0])];
     
     buf[9] = '\0';
@@ -136,7 +136,7 @@ static NSTimeZone *gmt = nil;
   }
   else if ([s length] == 15) {
     int year, month, day, hour, minute, second;
-    unsigned char buf[24];
+    char buf[24];
     [s getCString:&(buf[0])];
       
     second = atoi(&(buf[13])); buf[13] = '\0';
@@ -161,16 +161,18 @@ static NSTimeZone *gmt = nil;
 
 /* description */
 
+- (void)appendAttributesToDescription:(NSMutableString *)ms {
+  if (self->tag)    [ms appendFormat:@" %@",  self->tag];
+  if (self->string) [ms appendFormat:@" '%@'",  self->string];
+  if (self->tzid)   [ms appendFormat:@" tz=%@", self->tzid];
+}
+
 - (NSString *)description {
   NSMutableString *ms;
 
   ms = [NSMutableString stringWithCapacity:128];
   [ms appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])];
-  
-  if (self->tag)    [ms appendFormat:@" %@",  self->tag];
-  if (self->string) [ms appendFormat:@" '%@'",  self->string];
-  if (self->tzid)   [ms appendFormat:@" tz=%@", self->tzid];
-  
+  [self appendAttributesToDescription:ms];
   [ms appendString:@">"];
   return ms;
 }