gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 09:04:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Temporary revert David's change to use PRIxPTR, PRIuPTR and

Browse source 
PRIdPTR. Old compilers don't handled these well. (That change
didn't have a ChangeLog entry)


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@33766 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fredkiefer 2011-08-20 13:05:37 +00:00
parent c3d229f716
commit 9e7246aa24
11 changed files with 36 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ChangeLog
View file

@ -1,3 +1,19 @@
2011-08-20 Fred Kiefer <FredKiefer@gmx.de>
* Source/Additions/GSMime.m,
* Source/unix/NSStream.m,
* Source/NSData.m,
* Source/NSDistantObject.m,
* Source/NSInvocation.m,
* Source/NSMessagePort.m,
* Source/NSNumber.m,
* Source/NSSocketPort.m,
* Source/NSURLProtocol.m,
* Tools/autogsdoc.m:
Temporary revert David's change to use PRIxPTR, PRIuPTR and
PRIdPTR. Old compilers don't handled these well. (That change
didn't have a ChangeLog entry)
2011-08-17 Fred Kiefer <FredKiefer@gmx.de>
* Source/Additions/GSMime.m: Use specific IMP type for method

2
Source/Additions/GSMime.m
View file

@ -3789,7 +3789,7 @@ appendString(NSMutableData *m, NSUInteger offset, NSUInteger fold,
}
if (offset > fold)
{
NSLog(@"Name '%@' too long for folding at %" PRIuPTR " in header", n, fold);
NSLog(@"Name '%@' too long for folding at %u in header", n, fold);
}
offset = appendBytes(md, offset, fold, ":", 1);

10
Source/NSData.m
View file

@ -3110,7 +3110,7 @@ getBytes(void* dst, void* src, unsigned len, unsigned limit, unsigned *pos)
shmid = shmget(IPC_PRIVATE, bufferSize, IPC_CREAT|VM_RDONLY);
if (shmid == -1) /* Created memory? */
{
NSLog(@"[-initWithBytes:length:] shared mem get failed for %" PRIuPTR " - %@",
NSLog(@"[-initWithBytes:length:] shared mem get failed for %u - %@",
bufferSize, [NSError _last]);
DESTROY(self);
self = [dataMalloc allocWithZone: NSDefaultMallocZone()];
@ -3120,7 +3120,7 @@ getBytes(void* dst, void* src, unsigned len, unsigned limit, unsigned *pos)
bytes = shmat(shmid, 0, 0);
if (bytes == (void*)-1)
{
NSLog(@"[-initWithBytes:length:] shared mem attach failed for %" PRIuPTR " - %@",
NSLog(@"[-initWithBytes:length:] shared mem attach failed for %u - %@",
bufferSize, [NSError _last]);
bytes = 0;
DESTROY(self);
@ -3300,7 +3300,7 @@ getBytes(void* dst, void* src, unsigned len, unsigned limit, unsigned *pos)
if (bytes == 0)
{
NSLog(@"[NSMutableDataMalloc -initWithCapacity:] out of memory "
@"for %" PRIuPTR " bytes - %@", size, [NSError _last]);
@"for %u bytes - %@", size, [NSError _last]);
DESTROY(self);
return nil;
}
@ -3844,7 +3844,7 @@ getBytes(void* dst, void* src, unsigned len, unsigned limit, unsigned *pos)
if (shmid == -1) /* Created memory? */
{
NSLog(@"[NSMutableDataShared -initWithCapacity:] shared memory "
@"get failed for %" PRIuPTR " - %@", bufferSize, [NSError _last]);
@"get failed for %u - %@", bufferSize, [NSError _last]);
DESTROY(self);
self = [mutableDataMalloc allocWithZone: NSDefaultMallocZone()];
return [self initWithCapacity: bufferSize];
@ -3854,7 +3854,7 @@ getBytes(void* dst, void* src, unsigned len, unsigned limit, unsigned *pos)
if (bytes == (void*)-1)
{
NSLog(@"[NSMutableDataShared -initWithCapacity:] shared memory "
@"attach failed for %" PRIuPTR " - %@", bufferSize, [NSError _last]);
@"attach failed for %u - %@", bufferSize, [NSError _last]);
bytes = 0;
DESTROY(self);
self = [mutableDataMalloc allocWithZone: NSDefaultMallocZone()];

2
Source/NSDistantObject.m
View file

@ -826,7 +826,7 @@ enum proxyLocation
if (_connection)
{
if (debug_proxy > 3)
NSLog(@"retain count for connection (%p) is now %" PRIxPTR "\n",
NSLog(@"retain count for connection (%p) is now %x\n",
_connection, [_connection retainCount]);
/*
* A proxy for local object retains its target - so we release it.

2
Source/NSInvocation.m
View file

@ -118,7 +118,7 @@
if (buffer == (void*)0)
{
NSLog(@"Failed to map %" PRIuPTR " bytes for execute: %@", _size, [NSError _last]);
NSLog(@"Failed to map %u bytes for execute: %@", _size, [NSError _last]);
buffer = 0;
[self dealloc];
self = nil;

2
Source/NSMessagePort.m
View file

@ -1786,7 +1786,7 @@ typedef struct {
rl = [self reservedSpaceLength];
if (length != 0 && length != rl)
{
NSLog(@"bad reserved length - %" PRIuPTR, length);
NSLog(@"bad reserved length - %u", length);
return NO;
}
if ([receivingPort isKindOfClass: messagePortClass] == NO)

2
Source/NSNumber.m
View file

@ -356,7 +356,7 @@ static BOOL useSmallInt;
@implementation NSSmallInt
#undef VALUE
#define VALUE (((intptr_t)self) >> OBJC_SMALL_OBJECT_SHIFT)
#define FORMAT @"%" PRIdPTR
#define FORMAT @"%d"
#include "NSNumberMethods.h"
+ (void)load
{

2
Source/NSSocketPort.m
View file

@ -2316,7 +2316,7 @@ static Class tcpPortClass;
rl = [self reservedSpaceLength];
if (length != 0 && length != rl)
{
NSLog(@"bad reserved length - %" PRIuPTR, length);
NSLog(@"bad reserved length - %u", length);
return NO;
}
if ([receivingPort isKindOfClass: tcpPortClass] == NO)

8
Source/NSURLProtocol.m
View file

@ -1494,7 +1494,7 @@ static NSURLProtocol *placeholder = nil;
}
else
{
NSLog(@"Unexpected event %" PRIdPTR " occurred on stream %@ not being used by %@",
NSLog(@"Unexpected event %d occurred on stream %@ not being used by %@",
event, stream, self);
}
if (event == NSStreamEventErrorOccurred)
@ -1506,7 +1506,7 @@ static NSURLProtocol *placeholder = nil;
}
else
{
NSLog(@"Unexpected event %" PRIdPTR " ignored on stream %@ of %@",
NSLog(@"Unexpected event %d ignored on stream %@ of %@",
event, stream, self);
}
}
@ -1640,7 +1640,7 @@ static NSURLProtocol *placeholder = nil;
}
else
{
NSLog(@"Unexpected event %" PRIdPTR " occurred on stream %@ not being used by %@",
NSLog(@"Unexpected event %d occurred on stream %@ not being used by %@",
event, stream, self);
}
if (event == NSStreamEventErrorOccurred)
@ -1652,7 +1652,7 @@ static NSURLProtocol *placeholder = nil;
}
else
{
NSLog(@"Unexpected event %" PRIdPTR " ignored on stream %@ of %@",
NSLog(@"Unexpected event %d ignored on stream %@ of %@",
event, stream, self);
}
}

4
Source/unix/NSStream.m
View file

@ -195,7 +195,7 @@
}
else
{
NSLog(@"_dispatch with unexpected status %" PRIdPTR, [self streamStatus]);
NSLog(@"_dispatch with unexpected status %d", [self streamStatus]);
}
}
@end
@ -324,7 +324,7 @@
}
else
{
NSLog(@"_dispatch with unexpected status %" PRIdPTR, [self streamStatus]);
NSLog(@"_dispatch with unexpected status %d", [self streamStatus]);
}
}
@end

6
Tools/autogsdoc.m
View file

@ -2221,7 +2221,7 @@ main(int argc, char **argv, char **env)
options: NSLiteralSearch];
if (r.length == 0)
{
NSLog(@"Missing '#' in href at %" PRIuPTR, replace.location);
NSLog(@"Missing '#' in href at %u", replace.location);
break;
}
href = [href substringFromIndex: NSMaxRange(r)];
@ -2233,7 +2233,7 @@ main(int argc, char **argv, char **env)
options: NSLiteralSearch];
if (r.length == 0)
{
NSLog(@"Missing '$' in href at %" PRIuPTR, replace.location);
NSLog(@"Missing '$' in href at %u", replace.location);
break;
}
type = [href substringToIndex: r.location];
@ -2272,7 +2272,7 @@ main(int argc, char **argv, char **env)
}
if (unit == nil)
{
NSLog(@"Missing unit name terminator at %" PRIuPTR,
NSLog(@"Missing unit name terminator at %u",
replace.location);
break;
}