Author: rfm
Date: Wed Mar 19 09:26:48 2014
New Revision: 37757
URL: http://svn.gna.org/viewcvs/gnustep?rev=37757&view=rev
Log:
fix for bug #41626
Modified:
libs/base/trunk/ChangeLog
libs/base/trunk/Headers/Foundation/NSData.h
libs/base/trunk/Source/NSData.m
libs/base/trunk/Source/NSString.m
Modified: libs/base/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/ChangeLog?rev=37757&r1=37756&r2=37757&view=diff
==============================================================================
--- libs/base/trunk/ChangeLog (original)
+++ libs/base/trunk/ChangeLog Wed Mar 19 09:26:48 2014
@@ -2,6 +2,10 @@
* Tools/gdomap.c: Don't open syslog connection until after we have
forked and closed old descriptors .. fix for bug #41751
+ * Headers/Foundation/NSData.h:
+ * Source/NSData.m:
+ * Source/NSString.m:
+ Fix for bug #41626
2014-03-11 Richard Frith-Macdonald <[email protected]>
Modified: libs/base/trunk/Headers/Foundation/NSData.h
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Headers/Foundation/NSData.h?rev=37757&r1=37756&r2=37757&view=diff
==============================================================================
--- libs/base/trunk/Headers/Foundation/NSData.h (original)
+++ libs/base/trunk/Headers/Foundation/NSData.h Wed Mar 19 09:26:48 2014
@@ -46,8 +46,11 @@
};
enum {
- NSAtomicWrite = 1
+ NSDataWritingAtomic = 1
};
+/* The original name for this was NSAtomicWrite ... need for backward comapat
+ */
+#define NSAtomicWrite NSDataWritingAtomic
#endif
@interface NSData : NSObject <NSCoding, NSCopying, NSMutableCopying>
@@ -144,7 +147,7 @@
#if OS_API_VERSION(MAC_OS_X_VERSION_10_4,GS_API_LATEST)
/**
* <p>Writes a copy of the data encapsulated by the receiver to a file
- * at path. If the NSAtomicWrite option is set, this writes to a
+ * at path. If the NSDataWritingAtomic option is set, this writes to a
* temporary file and then renames that to the file at path, thus
* ensuring that path exists and does not contain partially written
* data at any point.
Modified: libs/base/trunk/Source/NSData.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Source/NSData.m?rev=37757&r1=37756&r2=37757&view=diff
==============================================================================
--- libs/base/trunk/Source/NSData.m (original)
+++ libs/base/trunk/Source/NSData.m Wed Mar 19 09:26:48 2014
@@ -877,7 +877,7 @@
{
if (useAuxiliaryFile)
{
- return [self writeToFile: path options: NSAtomicWrite error: 0];
+ return [self writeToFile: path options: NSDataWritingAtomic error: 0];
}
else
{
@@ -889,7 +889,7 @@
{
if (flag)
{
- return [self writeToURL: anURL options: NSAtomicWrite error: 0];
+ return [self writeToURL: anURL options: NSDataWritingAtomic error: 0];
}
else
{
@@ -1328,7 +1328,7 @@
BOOL useAuxiliaryFile = NO;
BOOL error_BadPath = YES;
- if (writeOptionsMask & NSAtomicWrite)
+ if (writeOptionsMask & NSDataWritingAtomic)
{
useAuxiliaryFile = YES;
}
Modified: libs/base/trunk/Source/NSString.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Source/NSString.m?rev=37757&r1=37756&r2=37757&view=diff
==============================================================================
--- libs/base/trunk/Source/NSString.m (original)
+++ libs/base/trunk/Source/NSString.m Wed Mar 19 09:26:48 2014
@@ -5352,7 +5352,7 @@
return NO;
}
return [d writeToFile: path
- options: atomically ? NSAtomicWrite : 0
+ options: atomically ? NSDataWritingAtomic : 0
error: error];
}
@@ -5387,7 +5387,7 @@
return NO;
}
return [d writeToURL: url
- options: atomically ? NSAtomicWrite : 0
+ options: atomically ? NSDataWritingAtomic : 0
error: error];
}
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
