a97f833c81
OK jasper@, landry@
49 lines
2.1 KiB
Plaintext
49 lines
2.1 KiB
Plaintext
$OpenBSD: patch-Source_NSData_m,v 1.2 2011/05/24 13:58:28 sebastia Exp $
|
|
--- Source/NSData.m.orig Tue Apr 5 14:12:34 2011
|
|
+++ Source/NSData.m Mon May 23 12:57:03 2011
|
|
@@ -3109,7 +3109,7 @@ getBytes(void* dst, void* src, unsigned len, unsigned
|
|
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()];
|
|
@@ -3119,7 +3119,7 @@ getBytes(void* dst, void* src, unsigned len, unsigned
|
|
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);
|
|
@@ -3299,7 +3299,7 @@ getBytes(void* dst, void* src, unsigned len, unsigned
|
|
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;
|
|
}
|
|
@@ -3843,7 +3843,7 @@ getBytes(void* dst, void* src, unsigned len, unsigned
|
|
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];
|
|
@@ -3853,7 +3853,7 @@ getBytes(void* dst, void* src, unsigned len, unsigned
|
|
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()];
|