Revision: 5180
http://skim-app.svn.sourceforge.net/skim-app/?rev=5180&view=rev
Author: hofman
Date: 2009-01-28 13:00:20 +0000 (Wed, 28 Jan 2009)
Log Message:
-----------
Use consistent naming for method to remove EAs
Modified Paths:
--------------
trunk/SkimNotes/NSFileManager_SKNExtensions.m
trunk/SkimNotes/NSFileManager_SKNToolExtensions.m
trunk/SkimNotes/SKNExtendedAttributeManager.h
trunk/SkimNotes/SKNExtendedAttributeManager.m
Modified: trunk/SkimNotes/NSFileManager_SKNExtensions.m
===================================================================
--- trunk/SkimNotes/NSFileManager_SKNExtensions.m 2009-01-28 12:54:50 UTC
(rev 5179)
+++ trunk/SkimNotes/NSFileManager_SKNExtensions.m 2009-01-28 13:00:20 UTC
(rev 5180)
@@ -57,12 +57,12 @@
SKNExtendedAttributeManager *eam = [SKNExtendedAttributeManager
sharedManager];
// first remove all old notes
- if ([eam removeExtendedAttribute:SKIM_NOTES_KEY atPath:path
traverseLink:YES error:&error] == NO) {
+ if ([eam removeExtendedAttributeNamed:SKIM_NOTES_KEY atPath:path
traverseLink:YES error:&error] == NO) {
// should we set success to NO and return an error?
//NSLog(@"%@: %@", self, error);
}
- [eam removeExtendedAttribute:SKIM_TEXT_NOTES_KEY atPath:path
traverseLink:YES error:NULL];
- [eam removeExtendedAttribute:SKIM_RTF_NOTES_KEY atPath:path
traverseLink:YES error:NULL];
+ [eam removeExtendedAttributeNamed:SKIM_TEXT_NOTES_KEY atPath:path
traverseLink:YES error:NULL];
+ [eam removeExtendedAttributeNamed:SKIM_RTF_NOTES_KEY atPath:path
traverseLink:YES error:NULL];
if ([notes count]) {
if ([eam setExtendedAttributeNamed:SKIM_NOTES_KEY toValue:data
atPath:path options:kSKNXattrDefault error:&error] == NO) {
Modified: trunk/SkimNotes/NSFileManager_SKNToolExtensions.m
===================================================================
--- trunk/SkimNotes/NSFileManager_SKNToolExtensions.m 2009-01-28 12:54:50 UTC
(rev 5179)
+++ trunk/SkimNotes/NSFileManager_SKNToolExtensions.m 2009-01-28 13:00:20 UTC
(rev 5180)
@@ -210,13 +210,13 @@
error1 = error2 = error3 = [NSError
errorWithDomain:NSPOSIXErrorDomain code:ENOENT userInfo:[NSDictionary
dictionaryWithObjectsAndKeys:@"Could not remove notes file",
NSLocalizedDescriptionKey, nil]];
} else {
SKNExtendedAttributeManager *eam = [SKNExtendedAttributeManager
sharedManager];
- success1 = [eam removeExtendedAttribute:SKIM_NOTES_KEY atPath:path
traverseLink:YES error:&error1];
+ success1 = [eam removeExtendedAttributeNamed:SKIM_NOTES_KEY
atPath:path traverseLink:YES error:&error1];
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];
+ success2 = [eam removeExtendedAttributeNamed:SKIM_TEXT_NOTES_KEY
atPath:path traverseLink:YES error:&error2];
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];
+ success3 = [eam removeExtendedAttributeNamed:SKIM_RTF_NOTES_KEY
atPath:path traverseLink:YES error:&error3];
if (success3 == NO && [[error3 domain]
isEqualToString:NSPOSIXErrorDomain] && [error3 code] == ENOATTR)
success3 = YES;
}
Modified: trunk/SkimNotes/SKNExtendedAttributeManager.h
===================================================================
--- trunk/SkimNotes/SKNExtendedAttributeManager.h 2009-01-28 12:54:50 UTC
(rev 5179)
+++ trunk/SkimNotes/SKNExtendedAttributeManager.h 2009-01-28 13:00:20 UTC
(rev 5180)
@@ -59,7 +59,7 @@
kSKNXattrCreateOnly = 1 << 2,
kSKNXattrReplaceOnly = 1 << 3,
kSKNXattrNoSplitData = 1 << 4,
- kSKNXattrNoCompress = 1 << 5,
+ kSKNXattrNoCompress = 1 << 5
};
typedef int SKNXattrFlags;
@@ -197,7 +197,7 @@
@param error Error object describing the error if <code>nil</code>
was returned.
@result Returns <code>NO</code> if an error occurred.
*/
-- (BOOL)removeExtendedAttribute:(NSString *)attr atPath:(NSString *)path
traverseLink:(BOOL)follow error:(NSError **)error;
+- (BOOL)removeExtendedAttributeNamed:(NSString *)attr atPath:(NSString *)path
traverseLink:(BOOL)follow error:(NSError **)error;
/*!
@abstract Removes all extended attributes at the specified path.
Modified: trunk/SkimNotes/SKNExtendedAttributeManager.m
===================================================================
--- trunk/SkimNotes/SKNExtendedAttributeManager.m 2009-01-28 12:54:50 UTC
(rev 5179)
+++ trunk/SkimNotes/SKNExtendedAttributeManager.m 2009-01-28 13:00:20 UTC
(rev 5180)
@@ -381,7 +381,7 @@
return success;
}
-- (BOOL)removeExtendedAttribute:(NSString *)attr atPath:(NSString *)path
traverseLink:(BOOL)follow error:(NSError **)error;
+- (BOOL)removeExtendedAttributeNamed:(NSString *)attr atPath:(NSString *)path
traverseLink:(BOOL)follow error:(NSError **)error;
{
NSParameterAssert(path != nil);
const char *fsPath = [path fileSystemRepresentation];
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