Revision: 5179
http://skim-app.svn.sourceforge.net/skim-app/?rev=5179&view=rev
Author: hofman
Date: 2009-01-28 12:54:50 +0000 (Wed, 28 Jan 2009)
Log Message:
-----------
Check for POSIX error domain when checking for ENOATTR error
Modified Paths:
--------------
trunk/SkimNotes/NSFileManager_SKNExtensions.m
trunk/SkimNotes/NSFileManager_SKNToolExtensions.m
Modified: trunk/SkimNotes/NSFileManager_SKNExtensions.m
===================================================================
--- trunk/SkimNotes/NSFileManager_SKNExtensions.m 2009-01-28 12:37:13 UTC
(rev 5178)
+++ trunk/SkimNotes/NSFileManager_SKNExtensions.m 2009-01-28 12:54:50 UTC
(rev 5179)
@@ -102,7 +102,7 @@
if ([data length]) {
@try { notes = [NSKeyedUnarchiver unarchiveObjectWithData:data]; }
@catch (id e) {}
- } else if (data || [error code] == ENOATTR) {
+ } else if (data || ([[error domain]
isEqualToString:NSPOSIXErrorDomain] && [error code] == ENOATTR)) {
notes = [NSArray array];
}
}
@@ -118,7 +118,7 @@
if ([aURL isFileURL]) {
string = [[SKNExtendedAttributeManager sharedManager]
propertyListFromExtendedAttributeNamed:SKIM_TEXT_NOTES_KEY atPath:[aURL path]
traverseLink:YES error:&error];
- if (string == nil && [error code] == ENOATTR)
+ if (string == nil && [[error domain]
isEqualToString:NSPOSIXErrorDomain] && [error code] == ENOATTR)
string = [NSString string];
}
if (string == nil && outError)
@@ -133,7 +133,7 @@
if ([aURL isFileURL]) {
data = [[SKNExtendedAttributeManager sharedManager]
extendedAttributeNamed:SKIM_RTF_NOTES_KEY atPath:[aURL path] traverseLink:YES
error:&error];
- if (data == nil && [error code] == ENOATTR)
+ if (data == nil && [[error domain] isEqualToString:NSPOSIXErrorDomain]
&& [error code] == ENOATTR)
data = [NSData data];
}
if(data == nil && outError)
Modified: trunk/SkimNotes/NSFileManager_SKNToolExtensions.m
===================================================================
--- trunk/SkimNotes/NSFileManager_SKNToolExtensions.m 2009-01-28 12:37:13 UTC
(rev 5178)
+++ trunk/SkimNotes/NSFileManager_SKNToolExtensions.m 2009-01-28 12:54:50 UTC
(rev 5179)
@@ -89,7 +89,7 @@
} else {
data = [[SKNExtendedAttributeManager sharedManager]
extendedAttributeNamed:SKIM_NOTES_KEY atPath:path traverseLink:YES
error:&error];
if (nil == data) {
- if ([error code] == ENOATTR)
+ if ([[error domain] isEqualToString:NSPOSIXErrorDomain] && [error
code] == ENOATTR)
data = [NSData data];
else if (outError)
*outError = error;
@@ -113,7 +113,7 @@
} else {
string = [[SKNExtendedAttributeManager sharedManager]
propertyListFromExtendedAttributeNamed:SKIM_TEXT_NOTES_KEY atPath:path
traverseLink:YES error:&error];
if (nil == string) {
- if ([error code] == ENOATTR)
+ if ([[error domain] isEqualToString:NSPOSIXErrorDomain] && [error
code] == ENOATTR)
string = @"";
else if (outError)
*outError = error;
@@ -137,7 +137,7 @@
} else {
data = [[SKNExtendedAttributeManager sharedManager]
extendedAttributeNamed:SKIM_RTF_NOTES_KEY atPath:path traverseLink:YES
error:&error];
if (nil == data) {
- if ([error code] == ENOATTR)
+ if ([[error domain] isEqualToString:NSPOSIXErrorDomain] && [error
code] == ENOATTR)
data = [NSData data];
else if (outError)
*outError = error;
@@ -211,13 +211,13 @@
} else {
SKNExtendedAttributeManager *eam = [SKNExtendedAttributeManager
sharedManager];
success1 = [eam removeExtendedAttribute:SKIM_NOTES_KEY atPath:path
traverseLink:YES error:&error1];
- if (success1 == NO && [error1 code] == ENOATTR)
+ if (success1 == NO && [[error1 domain]
isEqualToString:NSPOSIXErrorDomain] && [error1 code] == ENOATTR)
success1 = YES;
success2 = [eam removeExtendedAttribute:SKIM_TEXT_NOTES_KEY
atPath:path traverseLink:YES error:&error2];
- if (success2 == NO && [error2 code] == ENOATTR)
+ if (success2 == NO && [[error2 domain]
isEqualToString:NSPOSIXErrorDomain] && [error2 code] == ENOATTR)
success2 = YES;
success3 = [eam removeExtendedAttribute:SKIM_RTF_NOTES_KEY atPath:path
traverseLink:YES error:&error3];
- if (success3 == NO && [error3 code] == ENOATTR)
+ if (success3 == NO && [[error3 domain]
isEqualToString:NSPOSIXErrorDomain] && [error3 code] == ENOATTR)
success3 = YES;
}
if (success1 == NO && outError)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by:
SourcForge Community
SourceForge wants to tell your story.
http://p.sf.net/sfu/sf-spreadtheword
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit