From 44a8a29f4a941d3eacfb4c115717da7ba36f520d Mon Sep 17 00:00:00 2001 From: helge Date: Thu, 17 Nov 2005 16:25:43 +0000 Subject: [PATCH] fixed gstep-base compile warnings git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1178 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-core/EOControl/ChangeLog | 8 ++++++++ sope-core/EOControl/EOKeyValueQualifier.m | 8 ++++---- sope-core/EOControl/Version | 2 +- sope-core/EOControl/common.h | 1 + sope-core/NGExtensions/ChangeLog | 5 +++++ .../NGExtensions/FdExt.subproj/NSCalendarDate+misc.m | 1 + sope-core/NGExtensions/Version | 2 +- sope-ical/NGiCal/ChangeLog | 4 ++++ sope-ical/NGiCal/NGVCardSaxHandler.m | 1 + sope-ical/NGiCal/Version | 2 +- sope-ical/NGiCal/iCalMonthlyRecurrenceCalculator.m | 1 + sope-ical/versitSaxDriver/ChangeLog | 5 +++++ sope-ical/versitSaxDriver/VSSaxDriver.m | 10 +++++----- sope-ical/versitSaxDriver/Version | 2 +- sope-mime/ChangeLog | 4 ++++ sope-mime/NGMail/NGMBoxReader.m | 1 + sope-mime/NGMail/NGMailAddressParser.m | 1 + sope-mime/NGMail/NGMimeMessageGenerator.m | 1 + sope-mime/NGMail/NGMimeMessageParser.m | 1 + sope-mime/NGMime/ChangeLog | 4 ++++ sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m | 1 + .../NGMimeContentDispositionHeaderFieldGenerator.m | 1 + .../NGMime/NGMimeContentTypeHeaderFieldGenerator.m | 1 + sope-mime/NGMime/NGMimeFileData.m | 1 + sope-mime/NGMime/NGMimeJoinedData.m | 3 ++- sope-mime/NGMime/NGMimeMultipartBodyGenerator.m | 1 + sope-mime/NGMime/NGMimeMultipartBodyParser.m | 1 + sope-mime/NGMime/NGMimePartParser.m | 1 + sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m | 1 + sope-mime/NGMime/NGMimeType.m | 1 + sope-mime/NGMime/NGMimeUtilities.m | 1 + sope-mime/Version | 2 +- 32 files changed, 64 insertions(+), 15 deletions(-) diff --git a/sope-core/EOControl/ChangeLog b/sope-core/EOControl/ChangeLog index a64d4515..4d85b6d3 100644 --- a/sope-core/EOControl/ChangeLog +++ b/sope-core/EOControl/ChangeLog @@ -1,3 +1,11 @@ +2005-11-17 Helge Hess + + * v4.5.62 + + * EOKeyValueQualifier.m: fixed some SEL related warnings + + * common.h: properly include string.h + 2005-10-03 Helge Hess * EOKeyValueQualifier.m: improved -description in edge conditions, diff --git a/sope-core/EOControl/EOKeyValueQualifier.m b/sope-core/EOControl/EOKeyValueQualifier.m index 29f67c32..4e97e595 100644 --- a/sope-core/EOControl/EOKeyValueQualifier.m +++ b/sope-core/EOControl/EOKeyValueQualifier.m @@ -47,7 +47,7 @@ static EONull *null = nil; self->value = [_value retain]; self->operator = _selector; - if (_selector == nil) { + if (_selector == NULL) { NSLog(@"WARNING(%s): got no selector for kv qualifier (key=%@)", __PRETTY_FUNCTION__, _key); } @@ -212,7 +212,7 @@ static EONull *null = nil; self->value = [[_coder decodeObject] retain]; [_coder decodeValueOfObjCType:@encode(SEL) at:&(self->operator)]; - if (self->operator == nil) { + if (self->operator == NULL) { NSLog(@"WARNING(%s): decoded no selector for kv qualifier (key=%@)", __PRETTY_FUNCTION__, self->key); } @@ -284,7 +284,7 @@ static EONull *null = nil; self->operator = EOQualifierOperatorEqual; } - if (self->operator == nil) { + if (self->operator == NULL) { NSLog(@"WARNING(%s): decoded no selector for kv qualifier (key=%@)", __PRETTY_FUNCTION__, self->key); self->operator = EOQualifierOperatorEqual; @@ -322,7 +322,7 @@ static EONull *null = nil; if ((tmp = [EOQualifier stringForOperatorSelector:self->operator]) != nil) [s appendString:tmp]; - else if (self->operator != nil) + else if (self->operator != NULL) [s appendString:@"[NO STR OPERATOR]"]; else [s appendString:@"[NO OPERATOR]"]; diff --git a/sope-core/EOControl/Version b/sope-core/EOControl/Version index 9846aa8d..3fea82c7 100644 --- a/sope-core/EOControl/Version +++ b/sope-core/EOControl/Version @@ -1,3 +1,3 @@ # version file -SUBMINOR_VERSION:=61 +SUBMINOR_VERSION:=62 diff --git a/sope-core/EOControl/common.h b/sope-core/EOControl/common.h index cf6bad5b..0339881c 100644 --- a/sope-core/EOControl/common.h +++ b/sope-core/EOControl/common.h @@ -23,6 +23,7 @@ #define __EOControl_COMMON_H__ #include +#include #include #import diff --git a/sope-core/NGExtensions/ChangeLog b/sope-core/NGExtensions/ChangeLog index 8f774e21..1634fed9 100644 --- a/sope-core/NGExtensions/ChangeLog +++ b/sope-core/NGExtensions/ChangeLog @@ -1,3 +1,8 @@ +2005-11-17 Helge Hess + + * FdExt.subproj/NSCalendarDate+misc.m: include math.h to avoid a floor + warning (v4.5.177) + 2005-10-05 Helge Hess * FdExt.subproj/NSNull+misc.m: added -isNotEmpty to NSSet (v4.5.176) diff --git a/sope-core/NGExtensions/FdExt.subproj/NSCalendarDate+misc.m b/sope-core/NGExtensions/FdExt.subproj/NSCalendarDate+misc.m index b09b2523..7e5f93ce 100644 --- a/sope-core/NGExtensions/FdExt.subproj/NSCalendarDate+misc.m +++ b/sope-core/NGExtensions/FdExt.subproj/NSCalendarDate+misc.m @@ -21,6 +21,7 @@ #include "NSCalendarDate+misc.h" #include "common.h" +#include #define NUMBER_OF_SECONDS_IN_DAY (24 * 60 * 60) diff --git a/sope-core/NGExtensions/Version b/sope-core/NGExtensions/Version index fa38c4ab..0cc913d1 100644 --- a/sope-core/NGExtensions/Version +++ b/sope-core/NGExtensions/Version @@ -1,6 +1,6 @@ # version -SUBMINOR_VERSION:=176 +SUBMINOR_VERSION:=177 # v4.3.115 requires libFoundation v1.0.59 # v4.2.72 requires libEOControl v4.2.39 diff --git a/sope-ical/NGiCal/ChangeLog b/sope-ical/NGiCal/ChangeLog index 775c367e..3d175ac2 100644 --- a/sope-ical/NGiCal/ChangeLog +++ b/sope-ical/NGiCal/ChangeLog @@ -1,3 +1,7 @@ +2005-11-17 Helge Hess + + * include string.h where required (v4.5.70) + 2005-10-05 Helge Hess * iCalMonthlyRecurrenceCalculator.m: implemented calculation of diff --git a/sope-ical/NGiCal/NGVCardSaxHandler.m b/sope-ical/NGiCal/NGVCardSaxHandler.m index 239ae8bc..726517e1 100644 --- a/sope-ical/NGiCal/NGVCardSaxHandler.m +++ b/sope-ical/NGiCal/NGVCardSaxHandler.m @@ -29,6 +29,7 @@ #include "NGVCardOrg.h" #include "NGVCardStrArrayValue.h" #include "common.h" +#include #ifndef XMLNS_VCARD_XML_03 # define XMLNS_VCARD_XML_03 \ diff --git a/sope-ical/NGiCal/Version b/sope-ical/NGiCal/Version index e0046365..db6ad7b3 100644 --- a/sope-ical/NGiCal/Version +++ b/sope-ical/NGiCal/Version @@ -2,7 +2,7 @@ MAJOR_VERSION=4 MINOR_VERSION=5 -SUBMINOR_VERSION:=69 +SUBMINOR_VERSION:=70 # v4.5.40 requires NGExtensions v4.5.145 # v4.5.37 requires NGExtensions v4.5.140 diff --git a/sope-ical/NGiCal/iCalMonthlyRecurrenceCalculator.m b/sope-ical/NGiCal/iCalMonthlyRecurrenceCalculator.m index e54b224d..b2809eda 100644 --- a/sope-ical/NGiCal/iCalMonthlyRecurrenceCalculator.m +++ b/sope-ical/NGiCal/iCalMonthlyRecurrenceCalculator.m @@ -28,6 +28,7 @@ #include "iCalRecurrenceRule.h" #include "NSCalendarDate+ICal.h" #include "common.h" +#include @interface iCalRecurrenceCalculator(PrivateAPI) - (NSCalendarDate *)lastInstanceStartDate; diff --git a/sope-ical/versitSaxDriver/ChangeLog b/sope-ical/versitSaxDriver/ChangeLog index 68b508c1..c23a6fd2 100644 --- a/sope-ical/versitSaxDriver/ChangeLog +++ b/sope-ical/versitSaxDriver/ChangeLog @@ -1,3 +1,8 @@ +2005-11-17 Helge Hess + + * VSSaxDriver.m: renamed internal -error: method to -reportError: to + avoid a conflict with gstep-base (v4.5.20) + 2005-09-28 Helge Hess * GNUmakefile.preamble: install bundle in proper SaxObjC framework diff --git a/sope-ical/versitSaxDriver/VSSaxDriver.m b/sope-ical/versitSaxDriver/VSSaxDriver.m index 2621af92..2e1f6262 100644 --- a/sope-ical/versitSaxDriver/VSSaxDriver.m +++ b/sope-ical/versitSaxDriver/VSSaxDriver.m @@ -601,7 +601,7 @@ static VSStringFormatter *stringFormatter = nil; /* errors */ -- (void)error:(NSString *)_text { +- (void)reportError:(NSString *)_text { SaxParseException *e; e = (id)[SaxParseException exceptionWithName:@"SaxParseException" @@ -648,7 +648,7 @@ static VSStringFormatter *stringFormatter = nil; @" Tag '%@' has not been closed properly. Given " @"document contains errors!", mtName, expectedName, expectedName]; - [self error:s]; + [self reportError:s]; /* probably futile attempt to parse anyways */ if (debugOn) { @@ -662,7 +662,7 @@ static VSStringFormatter *stringFormatter = nil; } else { // TOOD: generate error? - [self error:[@"found end tag without any open tags left: " + [self reportError:[@"found end tag without any open tags left: " stringByAppendingString:mtName]]; } [self _endTag:mtName]; @@ -687,7 +687,7 @@ static VSStringFormatter *stringFormatter = nil; range:todoRange]; /* is line well-formed? */ if (r.length == 0) { - [self error:[@"got an improper content line! ->\n" + [self reportError:[@"got an improper content line! ->\n" stringByAppendingString:_line]]; return; } @@ -717,7 +717,7 @@ static VSStringFormatter *stringFormatter = nil; /* is line well-formed? */ if (r.length == 0 || r.location == 0) { - [self error:[@"got an improper content line! ->\n" + [self reportError:[@"got an improper content line! ->\n" stringByAppendingString:_line]]; [tagAttributes release]; tagAttributes = nil; return; diff --git a/sope-ical/versitSaxDriver/Version b/sope-ical/versitSaxDriver/Version index b5a142f9..161b0af2 100644 --- a/sope-ical/versitSaxDriver/Version +++ b/sope-ical/versitSaxDriver/Version @@ -1,3 +1,3 @@ # Version file -SUBMINOR_VERSION:=19 +SUBMINOR_VERSION:=20 diff --git a/sope-mime/ChangeLog b/sope-mime/ChangeLog index 21fa90b1..5437929d 100644 --- a/sope-mime/ChangeLog +++ b/sope-mime/ChangeLog @@ -1,3 +1,7 @@ +2005-11-17 Helge Hess + + * properly include string.h where required to avoid warnings (v4.5.237) + 2005-09-18 Helge Hess * NGMime: fixed a linking issue on OSX (v4.5.236) diff --git a/sope-mime/NGMail/NGMBoxReader.m b/sope-mime/NGMail/NGMBoxReader.m index a9cfd42e..57368076 100644 --- a/sope-mime/NGMail/NGMBoxReader.m +++ b/sope-mime/NGMail/NGMBoxReader.m @@ -22,6 +22,7 @@ #include "NGMBoxReader.h" #include "NGMimeMessageParser.h" #include "common.h" +#include @implementation NGMBoxReader diff --git a/sope-mime/NGMail/NGMailAddressParser.m b/sope-mime/NGMail/NGMailAddressParser.m index ecef01c8..86dd4f4e 100644 --- a/sope-mime/NGMail/NGMailAddressParser.m +++ b/sope-mime/NGMail/NGMailAddressParser.m @@ -23,6 +23,7 @@ #include "NGMailAddress.h" #include "NGMailAddressList.h" #include "common.h" +#include @interface NGMailAddressParser(PrivateMethods) - (id)parseQuotedString:(BOOL)_guestMode; diff --git a/sope-mime/NGMail/NGMimeMessageGenerator.m b/sope-mime/NGMail/NGMimeMessageGenerator.m index e3e6101d..4f1b7a03 100644 --- a/sope-mime/NGMail/NGMimeMessageGenerator.m +++ b/sope-mime/NGMail/NGMimeMessageGenerator.m @@ -23,6 +23,7 @@ #include "NGMimeMessage.h" #include #include "common.h" +#include @implementation NGMimeMessageGenerator diff --git a/sope-mime/NGMail/NGMimeMessageParser.m b/sope-mime/NGMail/NGMimeMessageParser.m index e883a872..b21cef1c 100644 --- a/sope-mime/NGMail/NGMimeMessageParser.m +++ b/sope-mime/NGMail/NGMimeMessageParser.m @@ -22,6 +22,7 @@ #include "NGMimeMessageParser.h" #include "NGMimeMessage.h" #include "common.h" +#include diff --git a/sope-mime/NGMime/ChangeLog b/sope-mime/NGMime/ChangeLog index 18841bef..084a4907 100644 --- a/sope-mime/NGMime/ChangeLog +++ b/sope-mime/NGMime/ChangeLog @@ -1,3 +1,7 @@ +2005-11-17 Helge Hess + + * properly include string.h where required to avoid warnings + 2005-09-18 Helge Hess * NGMimeAddressHeaderFieldGenerator.m: fixed some strict dependencies diff --git a/sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m b/sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m index a692cf9e..c20d12a9 100644 --- a/sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m +++ b/sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m @@ -23,6 +23,7 @@ #include "NGMimeHeaderFields.h" #include #include "common.h" +#include #if MOVED_TO_NGMAIL # include diff --git a/sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m b/sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m index af429b58..baf78f5b 100644 --- a/sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m +++ b/sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m @@ -22,6 +22,7 @@ #include "NGMimeHeaderFieldGenerator.h" #include "NGMimeHeaderFields.h" #include "common.h" +#include @implementation NGMimeContentDispositionHeaderFieldGenerator diff --git a/sope-mime/NGMime/NGMimeContentTypeHeaderFieldGenerator.m b/sope-mime/NGMime/NGMimeContentTypeHeaderFieldGenerator.m index 390fcead..e5fef89f 100644 --- a/sope-mime/NGMime/NGMimeContentTypeHeaderFieldGenerator.m +++ b/sope-mime/NGMime/NGMimeContentTypeHeaderFieldGenerator.m @@ -22,6 +22,7 @@ #include "NGMimeHeaderFieldGenerator.h" #include "NGMimeHeaderFields.h" #include "common.h" +#include @implementation NGMimeContentTypeHeaderFieldGenerator diff --git a/sope-mime/NGMime/NGMimeFileData.m b/sope-mime/NGMime/NGMimeFileData.m index eb8c7888..a2320321 100644 --- a/sope-mime/NGMime/NGMimeFileData.m +++ b/sope-mime/NGMime/NGMimeFileData.m @@ -21,6 +21,7 @@ #include "NGMimeFileData.h" #include "common.h" +#include #include #include #include diff --git a/sope-mime/NGMime/NGMimeJoinedData.m b/sope-mime/NGMime/NGMimeJoinedData.m index 83c450c7..a89820ad 100644 --- a/sope-mime/NGMime/NGMimeJoinedData.m +++ b/sope-mime/NGMime/NGMimeJoinedData.m @@ -19,9 +19,10 @@ 02111-1307, USA. */ -#include "common.h" #include "NGMimeJoinedData.h" +#include "common.h" #include "timeMacros.h" +#include #include #include #include diff --git a/sope-mime/NGMime/NGMimeMultipartBodyGenerator.m b/sope-mime/NGMime/NGMimeMultipartBodyGenerator.m index e147a843..68055d75 100644 --- a/sope-mime/NGMime/NGMimeMultipartBodyGenerator.m +++ b/sope-mime/NGMime/NGMimeMultipartBodyGenerator.m @@ -25,6 +25,7 @@ #include "NGMimeJoinedData.h" #include "NGMimeFileData.h" #include "common.h" +#include #include @implementation NGMimeMultipartBodyGenerator diff --git a/sope-mime/NGMime/NGMimeMultipartBodyParser.m b/sope-mime/NGMime/NGMimeMultipartBodyParser.m index e25bca05..74aff621 100644 --- a/sope-mime/NGMime/NGMimeMultipartBodyParser.m +++ b/sope-mime/NGMime/NGMimeMultipartBodyParser.m @@ -23,6 +23,7 @@ #include "NGMimeBodyPartParser.h" #include "NGMimeMultipartBody.h" #include "common.h" +#include @implementation NGMimeMultipartBodyParser diff --git a/sope-mime/NGMime/NGMimePartParser.m b/sope-mime/NGMime/NGMimePartParser.m index 82a60254..b71681f0 100644 --- a/sope-mime/NGMime/NGMimePartParser.m +++ b/sope-mime/NGMime/NGMimePartParser.m @@ -24,6 +24,7 @@ #include "NGMimeType.h" #include "NGMimeUtilities.h" #include "common.h" +#include /* this tunes, how big reused data cache objects may get (10MB) */ #define MAX_DATA_OBJECT_SIZE_CACHE (10*1024*1024) diff --git a/sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m b/sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m index 2ddab9ee..32c87b47 100644 --- a/sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m +++ b/sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m @@ -23,6 +23,7 @@ #include "NGMimeHeaderFields.h" #include "NGMimeUtilities.h" #include "common.h" +#include @implementation NGMimeRFC822DateHeaderFieldParser diff --git a/sope-mime/NGMime/NGMimeType.m b/sope-mime/NGMime/NGMimeType.m index d941dd62..f36d9635 100644 --- a/sope-mime/NGMime/NGMimeType.m +++ b/sope-mime/NGMime/NGMimeType.m @@ -23,6 +23,7 @@ #include "NGConcreteMimeType.h" #include "NGMimeUtilities.h" #include "common.h" +#include NGMime_DECLARE NSString *NGMimeTypeText = @"text"; NGMime_DECLARE NSString *NGMimeTypeAudio = @"audio"; diff --git a/sope-mime/NGMime/NGMimeUtilities.m b/sope-mime/NGMime/NGMimeUtilities.m index 376398c1..14209c29 100644 --- a/sope-mime/NGMime/NGMimeUtilities.m +++ b/sope-mime/NGMime/NGMimeUtilities.m @@ -21,6 +21,7 @@ #include #include +#include typedef struct { NSString *charset; diff --git a/sope-mime/Version b/sope-mime/Version index eed402db..98802f86 100644 --- a/sope-mime/Version +++ b/sope-mime/Version @@ -2,7 +2,7 @@ MAJOR_VERSION:=4 MINOR_VERSION:=5 -SUBMINOR_VERSION:=236 +SUBMINOR_VERSION:=237 # v4.5.214 requires libNGExtensions v4.5.146 # v4.2.149 requires libNGStreams v4.2.34 -- 2.39.5