64bit printf tweaks

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@34401 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2012-01-03 14:48:04 +00:00
parent c21cdfad4d
commit 5b0ed744eb
9 changed files with 25 additions and 22 deletions

View file

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

View file

@ -3111,7 +3111,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 %u - %@",
NSLog(@"[-initWithBytes:length:] shared mem get failed for %lu - %@",
bufferSize, [NSError _last]);
DESTROY(self);
self = [dataMalloc allocWithZone: NSDefaultMallocZone()];
@ -3121,7 +3121,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 %u - %@",
NSLog(@"[-initWithBytes:length:] shared mem attach failed for %lu - %@",
bufferSize, [NSError _last]);
bytes = 0;
DESTROY(self);
@ -3301,7 +3301,7 @@ getBytes(void* dst, void* src, unsigned len, unsigned limit, unsigned *pos)
if (bytes == 0)
{
NSLog(@"[NSMutableDataMalloc -initWithCapacity:] out of memory "
@"for %u bytes - %@", size, [NSError _last]);
@"for %lu bytes - %@", size, [NSError _last]);
DESTROY(self);
return nil;
}
@ -3845,7 +3845,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 %u - %@", bufferSize, [NSError _last]);
@"get failed for %lu - %@", bufferSize, [NSError _last]);
DESTROY(self);
self = [mutableDataMalloc allocWithZone: NSDefaultMallocZone()];
return [self initWithCapacity: bufferSize];
@ -3855,7 +3855,7 @@ getBytes(void* dst, void* src, unsigned len, unsigned limit, unsigned *pos)
if (bytes == (void*)-1)
{
NSLog(@"[NSMutableDataShared -initWithCapacity:] shared memory "
@"attach failed for %u - %@", bufferSize, [NSError _last]);
@"attach failed for %lu - %@", bufferSize, [NSError _last]);
bytes = 0;
DESTROY(self);
self = [mutableDataMalloc allocWithZone: NSDefaultMallocZone()];

View file

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

View file

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

View file

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

View file

@ -522,12 +522,12 @@ static Class runLoopClass;
if (NO == GSPrivateSockaddrSetup(addr,
[aPort portNumber], nil, nil, &sockAddr))
{
NSLog(@"bad address - '%s'", addr);
NSLog(@"bad address - '%@'", addr);
}
else
{
gotAddr = YES;
NSDebugMLLog(@"GSTcpHandle", @"Connecting to %s:%d using desc %d",
NSDebugMLLog(@"GSTcpHandle", @"Connecting to %@:%d using desc %d",
addr, [aPort portNumber], desc);
}
}
@ -537,7 +537,7 @@ static Class runLoopClass;
{
if (!GSWOULDBLOCK)
{
NSLog(@"unable to make connection to %d - %@",
NSLog(@"unable to make connection to %lu - %@",
GSPrivateSockaddrName(&sockAddr), [NSError _last]);
if (addrNum < [addrs count])
{
@ -2289,7 +2289,7 @@ static Class tcpPortClass;
rl = [self reservedSpaceLength];
if (length != 0 && length != rl)
{
NSLog(@"bad reserved length - %u", length);
NSLog(@"bad reserved length - %lu", length);
return NO;
}
if ([receivingPort isKindOfClass: tcpPortClass] == NO)

View file

@ -1535,7 +1535,7 @@ static NSURLProtocol *placeholder = nil;
}
else
{
NSLog(@"Unexpected event %d occurred on stream %@ not being used by %@",
NSLog(@"Unexpected event %lu occurred on stream %@ not being used by %@",
event, stream, self);
}
if (event == NSStreamEventErrorOccurred)
@ -1547,7 +1547,7 @@ static NSURLProtocol *placeholder = nil;
}
else
{
NSLog(@"Unexpected event %d ignored on stream %@ of %@",
NSLog(@"Unexpected event %lu ignored on stream %@ of %@",
event, stream, self);
}
}
@ -1681,7 +1681,7 @@ static NSURLProtocol *placeholder = nil;
}
else
{
NSLog(@"Unexpected event %d occurred on stream %@ not being used by %@",
NSLog(@"Unexpected event %lu occurred on stream %@ not being used by %@",
event, stream, self);
}
if (event == NSStreamEventErrorOccurred)
@ -1693,7 +1693,7 @@ static NSURLProtocol *placeholder = nil;
}
else
{
NSLog(@"Unexpected event %d ignored on stream %@ of %@",
NSLog(@"Unexpected event %lu ignored on stream %@ of %@",
event, stream, self);
}
}

View file

@ -192,7 +192,8 @@
}
else
{
NSLog(@"_dispatch with unexpected status %d", [self streamStatus]);
NSLog(@"_dispatch with unexpected status %lu",
(unsigned long)[self streamStatus]);
}
}
@end
@ -321,7 +322,8 @@
}
else
{
NSLog(@"_dispatch with unexpected status %d", [self streamStatus]);
NSLog(@"_dispatch with unexpected status %lu",
(unsigned long)[self streamStatus]);
}
}
@end

View file

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