64bit fixes

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

diff --git a/sope-mime/NGMail/NGMBoxReader.h b/sope-mime/NGMail/NGMBoxReader.h
index 6c0ee54474b1124245ee3e72f8e7dc3dfdb2901a..b16397ba996184dab3da93b73f340626d52ddf9c 100644 (file)
--- a/sope-mime/NGMail/NGMBoxReader.h
+++ b/sope-mime/NGMail/NGMBoxReader.h
@@ -1,5 +1,6 @@
 /*
-  Copyright (C) 2000-2005 SKYRIX Software AG
+  Copyright (C) 2000-2006 SKYRIX Software AG
+  Copyright (C) 2006      Helge Hess
 
   This file is part of SOPE.
 
@@ -37,7 +38,7 @@
   NSString *separator;
   BOOL     isEndOfStream;
 
-  IMP readByte;
+  int (*readByte)(id, SEL);
 }
 
 + (id)readerForMBox:(NSString *)_path;

diff --git a/sope-mime/NGMail/NGMBoxReader.m b/sope-mime/NGMail/NGMBoxReader.m
index 9ac60c8ad8402503d897186db673334dc34f5484..7c34986a481c3f802e7dc5ba14adf51761e60ef4 100644 (file)
--- a/sope-mime/NGMail/NGMBoxReader.m
+++ b/sope-mime/NGMail/NGMBoxReader.m
@@ -1,5 +1,6 @@
 /*
-  Copyright (C) 2000-2005 SKYRIX Software AG
+  Copyright (C) 2000-2006 SKYRIX Software AG
+  Copyright (C) 2006      Helge Hess
 
   This file is part of SOPE.
 
@@ -64,7 +65,8 @@ __appendByte(NGMBoxReader *self, NSMutableData *_data, IMP _readBytes, int _c);
 
     self->readByte =
       [self->source respondsToSelector:@selector(methodForSelector:)]
-      ? [(NSObject *)self->source methodForSelector:@selector(readByte)]
+      ? (int(*)(id, SEL))[(NSObject *)self->source
+                                     methodForSelector:@selector(readByte)]
       : NULL;
   }
   return self;
@@ -224,7 +226,7 @@ __appendByte(NGMBoxReader *self, NSMutableData *_data, IMP _readBytes, int _c);
 
 - (NSString *)description {
   return [NSString stringWithFormat:@"<%@[0x%p] source=%@ endOfStream=%@",
-                     NSStringFromClass([self class]), (unsigned)self,
+                     NSStringFromClass([self class]), self,
                      self->source, self->isEndOfStream ? @"YES" : @"NO"];
 }
 
@@ -233,7 +235,7 @@ __appendByte(NGMBoxReader *self, NSMutableData *_data, IMP _readBytes, int _c);
 
 static inline int __readByte(NGMBoxReader *self) {
   return (self->readByte)
-    ? (int)self->readByte(self->source, @selector(readByte))
+    ? self->readByte(self->source, @selector(readByte))
     : [self->source readByte];
 }
 
@@ -243,4 +245,4 @@ static inline void __appendByte(NGMBoxReader *self, NSMutableData *_data,
   _readBytes(_data, @selector(appendBytes:length:), &c, 1);
 }
 
-@end
+@end /* NGMBoxReader */

diff --git a/sope-mime/NGMail/NGMailAddressParser.m b/sope-mime/NGMail/NGMailAddressParser.m
index 80968ddabc8aa3de755b213f15a82f86c3be1342..20d111056039ad09207820530ade472f039f211f 100644 (file)
--- a/sope-mime/NGMail/NGMailAddressParser.m
+++ b/sope-mime/NGMail/NGMailAddressParser.m
@@ -1001,8 +1001,7 @@ static inline id parseDomainLiteral(NGMailAddressParser *self, BOOL _guessMode)
 
 - (NSString *)description {
   return [StrClass stringWithFormat:@"<%@[0x%p]>",
-                     NSStringFromClass([self class]),
-                     (unsigned)self];
+                     NSStringFromClass([self class]), self];
 }
 
 @end /* NGMailAddressParser */

diff --git a/sope-mime/NGMail/NGPop3Client.m b/sope-mime/NGMail/NGPop3Client.m
index 1890355fcd38cc6448bb0bfa8adc78802614b200..f4900092be56dc9c436075f85ae006b37a8f378f 100644 (file)
--- a/sope-mime/NGMail/NGPop3Client.m
+++ b/sope-mime/NGMail/NGPop3Client.m
@@ -617,11 +617,11 @@
     return nil;
 }
 
-// description
+/* description */
 
 - (NSString *)description {
   return [NSString stringWithFormat:@"<POP3Client[0x%p]: socket=%@>",
-                     (unsigned)self, [self socket]];
+                     self, [self socket]];
 }
 
-@end
+@end /* NGPop3Client */

diff --git a/sope-mime/NGMail/NGPop3Support.m b/sope-mime/NGMail/NGPop3Support.m
index 4cb9d4d82475f52ac7ca1d4e3cbb3fec8b65aec8..9e918c8587a643b6b6ede89b3ca8fa05688b1093 100644 (file)
--- a/sope-mime/NGMail/NGPop3Support.m
+++ b/sope-mime/NGMail/NGPop3Support.m
@@ -58,7 +58,7 @@
 
 - (NSString *)description {
   return [NSString stringWithFormat:@"<Pop3Reply[0x%p]: positive=%s line=%@>",
-                     (unsigned)self,
+                     self,
                      [self isPositive] ? "YES" : "NO",
                      [self line]];
 }
@@ -107,7 +107,7 @@
 
 - (NSString *)description {
   return [NSString stringWithFormat:@"<Pop3MsgInfo[0x%p]: number=%i size=%i>",
-                     (unsigned)self, [self messageNumber], [self size]];
+                     self, [self messageNumber], [self size]];
 }
 
 @end /* NGPop3Response */

diff --git a/sope-mime/NGMail/NGSmtpClient.m b/sope-mime/NGMail/NGSmtpClient.m
index 80f364b50a45b1b876baba40cafc272680a47fb5..d7f23357f9a07a8a300a0fbe649fbec34efce2f3 100644 (file)
--- a/sope-mime/NGMail/NGSmtpClient.m
+++ b/sope-mime/NGMail/NGSmtpClient.m
@@ -459,11 +459,11 @@
   return NO;
 }
 
-// description
+/* description */
 
 - (NSString *)description {
   return [NSString stringWithFormat:@"<SMTP-Client[0x%p]: socket=%@>",
-                     (unsigned)self, [self socket]];
+                     self, [self socket]];
 }
 
-@end
+@end /* NGSmtpClient */

diff --git a/sope-mime/NGMime/NGMimeContentLengthHeaderFieldParser.m b/sope-mime/NGMime/NGMimeContentLengthHeaderFieldParser.m
index eaf85e82f42ebb92aa1b42e1870c4cff496281cc..3afee94e72c3e25efb50a4fc0adb48819298789d 100644 (file)
--- a/sope-mime/NGMime/NGMimeContentLengthHeaderFieldParser.m
+++ b/sope-mime/NGMime/NGMimeContentLengthHeaderFieldParser.m
@@ -48,12 +48,12 @@
   }
 }
 
-// description
+/* description */
 
 - (NSString *)description {
   return [NSString stringWithFormat:
                      @"<MimeContentLengthHeaderFieldParser: object=0x%p>",
-                     (unsigned)self];
+                     self];
 }
 
 @end /* NGMimeContentLengthHeaderFieldParser */

diff --git a/sope-mime/NGMime/NGMimeContentTypeHeaderFieldParser.m b/sope-mime/NGMime/NGMimeContentTypeHeaderFieldParser.m
index 79112db3ea5acaa9e2825745836ab7fde7d74b32..74bb6bd2d3a2caea06f6f295dd0ff87ac5c9a1fb 100644 (file)
--- a/sope-mime/NGMime/NGMimeContentTypeHeaderFieldParser.m
+++ b/sope-mime/NGMime/NGMimeContentTypeHeaderFieldParser.m
@@ -75,12 +75,12 @@ static BOOL MimeLogEnabled     = NO;
   return [NGMimeType mimeType:typeString];
 }
 
-// description
+/* description */
 
 - (NSString *)description {
   return [NSString stringWithFormat:
                      @"<MimeContentTypeHeaderFieldParser: object=0x%p>",
-                     (unsigned)self];
+                     self];
 }
 
 @end /* NGMimeContentTypeHeaderFieldParser */

diff --git a/sope-mime/NGMime/NGMimeHeaderFieldParserSet.m b/sope-mime/NGMime/NGMimeHeaderFieldParserSet.m
index 101a11cafc490cfe8cc519ed05407e6e9e051d7c..a32736aa8e38af4c353379c1822a9f84b9fbd946 100644 (file)
--- a/sope-mime/NGMime/NGMimeHeaderFieldParserSet.m
+++ b/sope-mime/NGMime/NGMimeHeaderFieldParserSet.m
@@ -1,5 +1,6 @@
 /*
-  Copyright (C) 2000-2005 SKYRIX Software AG
+  Copyright (C) 2000-2006 SKYRIX Software AG
+  Copyright (C) 2006      Helge Hess
 
   This file is part of SOPE.
 
@@ -96,7 +97,8 @@ static NGMimeHeaderFieldParserSet *rfc822set = nil;
 }
 - (id)initWithDefaultParser:(id<NGMimeHeaderFieldParser>)_parser {
   if ((self = [super init])) {
-    self->fieldNameToParser = [[NSMutableDictionary alloc] initWithCapacity:32];
+    self->fieldNameToParser = 
+      [[NSMutableDictionary alloc] initWithCapacity:32];
     [self setDefaultParser:_parser];
   }
   return self;
@@ -114,7 +116,7 @@ static NGMimeHeaderFieldParserSet *rfc822set = nil;
   [super dealloc];
 }
 
-// accessors
+/* accessors */
 
 - (void)setParser:(id<NGMimeHeaderFieldParser>)_parser
   forField:(NSString *)_name {
@@ -154,20 +156,21 @@ static NGMimeHeaderFieldParserSet *rfc822set = nil;
                                         [self defaultParser]];
   
   keys = [self->fieldNameToParser keyEnumerator];
-  while ((key = [keys nextObject])) {
-    id value = [self->fieldNameToParser objectForKey:key];
+  while ((key = [keys nextObject]) != nil) {
+    id value;
 
+    value = [self->fieldNameToParser objectForKey:key];
     [copy setParser:value forField:key];
   }
   return copy;
 }
 
-// description
+/* description */
 
 - (NSString *)description {
   return [NSString stringWithFormat:
                      @"<HeaderFieldParserSet: id=0x%p map=%@ default=%@>",
-                     (unsigned)self, self->fieldNameToParser,
+                     self, self->fieldNameToParser,
                      [self defaultParser]];
 }
 

diff --git a/sope-mime/NGMime/NGMimeStringHeaderFieldParser.m b/sope-mime/NGMime/NGMimeStringHeaderFieldParser.m
index 7749fbe75f7f266a19d1593208a32c103e103972..c7f4a105e493c1f4575ab9991792a998dbdc12e9 100644 (file)
--- a/sope-mime/NGMime/NGMimeStringHeaderFieldParser.m
+++ b/sope-mime/NGMime/NGMimeStringHeaderFieldParser.m
@@ -1,5 +1,6 @@
 /*
-  Copyright (C) 2000-2005 SKYRIX Software AG
+  Copyright (C) 2000-2006 SKYRIX Software AG
+  Copyright (C) 2006      Helge Hess
 
   This file is part of SOPE.
 
@@ -85,7 +86,7 @@ static BOOL StripLeadingSpaces = NO;
   return [NSString stringWithFormat:
                      @"<MimeStringHeaderFieldParser: id=0x%p"
                      @" removesComments=%s>",
-                     (unsigned)self, self->removeComments ? "YES" : "NO"];
+                     self, self->removeComments ? "YES" : "NO"];
 }
 
 @end /* NGMimeStringHeaderFieldParser */