I re-post my patches as a big one patch. On Wed, 2013-02-27 at 17:32 +0100, Jean-Charles BERTIN wrote: > Some minor fixes instroduced when applying my patches in gnustep-base. > > Jean-Charles BERTIN (2): > Added missing expose macros. > Fixed warnings in printf-like formats. > > GSCache.m | 2 ++ > GSFIFO.m | 12 ++++++++---- > GSLinkedList.m | 2 +- > GSSkipMutableArray.m | 25 +++++++++++++------------ > GSThreadPool.m | 9 ++++++--- > GSThroughput.m | 4 ++-- > 6 files changed, 32 insertions(+), 22 deletions(-) > > _______________________________________________ > Gnustep-dev mailing list > Gnustep-dev@gnu.org > https://lists.gnu.org/mailman/listinfo/gnustep-dev
-- Jean-Charles BERTIN Axinoe - Software Engineer Tel.: (+33) (0)1.80.82.59.23 Fax : (+33) (0)1.80.82.59.29 Skype: jcbertin Web: <http://www.axinoe.com/> Certificate Authority: <https://ca.axinoe.com/axinoe-root.crt>
diff --git a/GSCache.m b/GSCache.m index b35686e..e01ef42 100644 --- a/GSCache.m +++ b/GSCache.m @@ -901,6 +901,8 @@ static void removeItem(GSCacheItem *item, GSCacheItem **first) #if defined(GNUSTEP_BASE_LIBRARY) +#define EXPOSE_GSMimeDocument_IVARS +#define EXPOSE_GSMimeHeader_IVARS #import <GNUstepBase/GSMime.h> @implementation GSMimeDocument (GSCacheSizeInBytes) diff --git a/GSFIFO.m b/GSFIFO.m index 6379d61..e02ec29 100644 --- a/GSFIFO.m +++ b/GSFIFO.m @@ -620,10 +620,12 @@ stats(NSTimeInterval ti, uint32_t max, NSTimeInterval *bounds, uint64_t *bands) for (i = 0; i < boundsCount; i++) { [s appendFormat: @" up to %g: %llu\n", - waitBoundaries[i], getWaitCounts[i]]; + waitBoundaries[i], + (unsigned long long)getWaitCounts[i]]; } [s appendFormat: @" above %g: %llu\n", - waitBoundaries[boundsCount-1], getWaitCounts[boundsCount]]; + waitBoundaries[boundsCount-1], + (unsigned long long)getWaitCounts[boundsCount]]; } } @@ -646,10 +648,12 @@ stats(NSTimeInterval ti, uint32_t max, NSTimeInterval *bounds, uint64_t *bands) for (i = 0; i < boundsCount; i++) { [s appendFormat: @" up to %g: %llu\n", - waitBoundaries[i], putWaitCounts[i]]; + waitBoundaries[i], + (unsigned long long)putWaitCounts[i]]; } [s appendFormat: @" above %g: %llu\n", - waitBoundaries[boundsCount-1], putWaitCounts[boundsCount]]; + waitBoundaries[boundsCount-1], + (unsigned long long)putWaitCounts[boundsCount]]; } } diff --git a/GSLinkedList.m b/GSLinkedList.m index 2882972..c60d6d9 100644 --- a/GSLinkedList.m +++ b/GSLinkedList.m @@ -29,7 +29,7 @@ - (void) dealloc { - NSAssert(nil == owner, NSInternalInconsistencyException); + NSAssert1(nil == owner, @"%@", NSInternalInconsistencyException); [item release]; [super dealloc]; } diff --git a/GSSkipMutableArray.m b/GSSkipMutableArray.m index 0b3932d..a4283b7 100644 --- a/GSSkipMutableArray.m +++ b/GSSkipMutableArray.m @@ -125,7 +125,8 @@ static Class concreteClass = 0; [NSNumber numberWithUnsignedInt: l->count], @"Count", self, @"Array", nil, nil]; - reason = [NSString stringWithFormat: @"Index %d is out of range %d (in '%@')", index, l->count, NSStringFromSelector(sel)]; + reason = [NSString stringWithFormat: @"Index %lu is out of range %d (in '%@')", + (unsigned long)index, l->count, NSStringFromSelector(sel)]; exception = [NSException exceptionWithName: NSRangeException reason: reason @@ -276,15 +277,15 @@ static Class concreteClass = 0; foo = [[NSMutableString alloc] init]; [foo appendString: [NSString stringWithFormat: - @"\"%p\" [label = \"%p%@ |{ <delta%i> %i | <forward%i> }", - p, p, p == l->header ? @"(HEADER)" : @"", k, - p->forward[k].delta, k]]; + @"\"%p\" [label = \"%p%@ |{ <delta%lu> %i | <forward%lu> }", + p, p, p == l->header ? @"(HEADER)" : @"", (unsigned long)k, + p->forward[k].delta, (unsigned long)k]]; if (p != GSISLNil) [edges addObject: [NSString stringWithFormat: - @"\"%p\": forward%i -> \"%p\": delta%i;\n", - p, k, p->forward[k].next, - p->forward[k].next == GSISLNil ? 0 : k]]; + @"\"%p\": forward%lu -> \"%p\": delta%lu;\n", + p, (unsigned long)k, p->forward[k].next, + p->forward[k].next == GSISLNil ? 0UL : (unsigned long)k]]; [values setObject: foo forKey: value]; [foo release]; } @@ -292,14 +293,14 @@ static Class concreteClass = 0; { [foo appendString: [NSString stringWithFormat: - @"|{ <delta%i> %i | <forward%i> }", - k, p->forward[k].delta, k]]; + @"|{ <delta%lu> %i | <forward%lu> }", + (unsigned long)k, p->forward[k].delta, (unsigned long)k]]; if (p != GSISLNil) [edges addObject: [NSString stringWithFormat: - @"\"%p\": forward%i -> \"%p\": delta%i;\n", - p, k, p->forward[k].next, - p->forward[k].next == GSISLNil ? 0 : k]]; + @"\"%p\": forward%lu -> \"%p\": delta%lu;\n", + p, (unsigned long)k, p->forward[k].next, + p->forward[k].next == GSISLNil ? 0UL : (unsigned long)k]]; [values setObject: foo forKey: value]; } } diff --git a/GSThreadPool.m b/GSThreadPool.m index 4224b59..d75fff8 100644 --- a/GSThreadPool.m +++ b/GSThreadPool.m @@ -123,9 +123,12 @@ static GSThreadPool *shared = nil; [poolLock lock]; result = [NSString stringWithFormat: - @"%@ queue: %u(%u) threads: %u(%u) active: %u processed: %u", - [super description], operations->count, maxOperations, - idle->count + live->count, maxThreads, live->count, processed]; + @"%@ queue: %lu(%lu) threads: %lu(%lu) active: %lu processed: %lu", + [super description], (unsigned long)operations->count, + (unsigned long)maxOperations, + (unsigned long)(idle->count + live->count), + (unsigned long)maxThreads, (unsigned long)live->count, + (unsigned long)processed]; [poolLock unlock]; return result; } diff --git a/GSThroughput.m b/GSThroughput.m index 11e5061..fc43ccd 100644 --- a/GSThroughput.m +++ b/GSThroughput.m @@ -1019,8 +1019,8 @@ typedef struct { - (void) startDuration: (NSString*)name { - NSAssert(my->supportDurations == YES && my->started == 0.0, - NSInternalInconsistencyException); + NSAssert1(my->supportDurations == YES && my->started == 0.0, + @"%@", NSInternalInconsistencyException); if (my->event != nil) { [NSException raise: NSInternalInconsistencyException
smime.p7s
Description: S/MIME cryptographic signature
_______________________________________________ Gnustep-dev mailing list Gnustep-dev@gnu.org https://lists.gnu.org/mailman/listinfo/gnustep-dev