aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar dmaclach <dmaclach@gmail.com>2018-11-13 12:21:51 -0800
committerGravatar GitHub <noreply@github.com>2018-11-13 12:21:51 -0800
commita72981b4f4156d7ae5f184e4a7155b6817f0fda3 (patch)
treedb43998dfd1b233421cf510634635282008d2a8d
parent32cf585ff11679352506cabab4426e8daafd5ed1 (diff)
Remove Unused (and deprecated) GTMNSFileManager+Carbon (#197)
These were functions that dealt with Aliases.
-rw-r--r--Foundation/GTMNSFileManager+Carbon.h73
-rw-r--r--Foundation/GTMNSFileManager+Carbon.m117
-rw-r--r--Foundation/GTMNSFileManager+CarbonTest.m73
-rw-r--r--GTM.xcodeproj/project.pbxproj12
4 files changed, 0 insertions, 275 deletions
diff --git a/Foundation/GTMNSFileManager+Carbon.h b/Foundation/GTMNSFileManager+Carbon.h
deleted file mode 100644
index 02bff65..0000000
--- a/Foundation/GTMNSFileManager+Carbon.h
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// GTMNSFileManager+Carbon.h
-//
-// Copyright 2008 Google Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not
-// use this file except in compliance with the License. You may obtain a copy
-// of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-// License for the specific language governing permissions and limitations under
-// the License.
-//
-
-#import <Foundation/Foundation.h>
-
-
-// A few useful methods for dealing with paths and carbon structures
-@interface NSFileManager (GTMFileManagerCarbonAdditions)
-
-// Converts a path to an alias
-// Args:
-// path - the path to convert
-//
-// Returns:
-// An alias wrapped up in an autoreleased NSData. Nil on failure.
-//
-- (NSData *)gtm_aliasDataForPath:(NSString *)path;
-
-// Converts an alias to a path
-// Args:
-// alias - an alias wrapped up in an NSData
-//
-// Returns:
-// The path. Nil on failure.
-//
-- (NSString *)gtm_pathFromAliasData:(NSData *)alias;
-
-// Converts an alias to a path without optional triggering of UI.
-// Args:
-// alias - an alias wrapped up in an NSData
-// resolve - whether to try to resolve the alias, or simply read path data
-// withUI - whether to show UI when trying to resolve
-//
-// Returns:
-// The path. Nil on failure.
-//
-- (NSString *)gtm_pathFromAliasData:(NSData *)alias
- resolve:(BOOL)resolve
- withUI:(BOOL)withUI;
-
-// Converts a path to an FSRef *
-// Args:
-// path - the path to convert
-//
-// Returns:
-// An autoreleased FSRef *. Nil on failure.
-//
-- (FSRef *)gtm_FSRefForPath:(NSString *)path;
-
-// Converts an FSRef to a path
-// Args:
-// fsRef - the FSRef to convert
-//
-// Returns:
-// The path. Nil on failure.
-//
-- (NSString *)gtm_pathFromFSRef:(FSRef *)fsRef;
-@end
diff --git a/Foundation/GTMNSFileManager+Carbon.m b/Foundation/GTMNSFileManager+Carbon.m
deleted file mode 100644
index fc990ae..0000000
--- a/Foundation/GTMNSFileManager+Carbon.m
+++ /dev/null
@@ -1,117 +0,0 @@
-//
-// GTMNSFileManager+Carbon.m
-//
-// Copyright 2008 Google Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not
-// use this file except in compliance with the License. You may obtain a copy
-// of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-// License for the specific language governing permissions and limitations under
-// the License.
-//
-
-#import "GTMNSFileManager+Carbon.h"
-#import <CoreServices/CoreServices.h>
-#import <sys/param.h>
-#import "GTMDefines.h"
-
-@implementation NSFileManager (GTMFileManagerCarbonAdditions)
-
-- (NSData *)gtm_aliasDataForPath:(NSString *)path {
- NSData *data = nil;
- FSRef ref;
- AliasHandle alias = NULL;
-
- __Require_Quiet([path length], CantUseParams);
- __Require_noErr(FSPathMakeRef((UInt8 *)[path fileSystemRepresentation],
- &ref, NULL), CantMakeRef);
- __Require_noErr(FSNewAlias(NULL, &ref, &alias), CantMakeAlias);
-
- Size length = GetAliasSize(alias);
- data = [NSData dataWithBytes:*alias length:length];
-
- DisposeHandle((Handle)alias);
-
-CantMakeAlias:
-CantMakeRef:
-CantUseParams:
- return data;
-}
-
-- (NSString *)gtm_pathFromAliasData:(NSData *)data {
- return [self gtm_pathFromAliasData:data resolve:YES withUI:YES];
-}
-
-- (NSString *)gtm_pathFromAliasData:(NSData *)data
- resolve:(BOOL)resolve
- withUI:(BOOL)withUI {
- NSString *path = nil;
- __Require_Quiet(data, CantUseParams);
-
- AliasHandle alias;
- const void *bytes = [data bytes];
- NSUInteger length = [data length];
- __Require_noErr(PtrToHand(bytes, (Handle *)&alias, length), CantMakeHandle);
-
- FSRef ref;
- Boolean wasChanged;
- // we don't use a require here because it is quite legitimate for an alias
- // resolve to fail.
-
- if (resolve) {
- OSStatus err
- = FSResolveAliasWithMountFlags(NULL, alias, &ref, &wasChanged,
- withUI ? kResolveAliasFileNoUI : 0);
- if (err == noErr) {
- path = [self gtm_pathFromFSRef:&ref];
- }
- } else {
- OSStatus err
- = FSCopyAliasInfo(alias, NULL, NULL, (CFStringRef *)(&path), NULL, NULL);
- if (err != noErr) path = nil;
- GTMCFAutorelease(path);
- }
- DisposeHandle((Handle)alias);
-CantMakeHandle:
-CantUseParams:
- return path;
-}
-
-- (FSRef *)gtm_FSRefForPath:(NSString *)path {
- FSRef* fsRef = NULL;
- __Require_Quiet([path length], CantUseParams);
- NSMutableData *fsRefData = [NSMutableData dataWithLength:sizeof(FSRef)];
- __Require(fsRefData, CantAllocateFSRef);
- fsRef = (FSRef*)[fsRefData mutableBytes];
- Boolean isDir = FALSE;
- const UInt8 *filePath = (const UInt8 *)[path fileSystemRepresentation];
- __Require_noErr_Action(FSPathMakeRef(filePath, fsRef, &isDir),
- CantMakeRef, fsRef = NULL);
-CantMakeRef:
-CantAllocateFSRef:
-CantUseParams:
- return fsRef;
-}
-
-- (NSString *)gtm_pathFromFSRef:(FSRef *)fsRef {
- NSString *nsPath = nil;
- __Require_Quiet(fsRef, CantUseParams);
-
- char path[MAXPATHLEN];
- __Require_noErr(FSRefMakePath(fsRef, (UInt8 *)path, MAXPATHLEN),
- CantMakePath);
- nsPath = [self stringWithFileSystemRepresentation:path length:strlen(path)];
- nsPath = [nsPath stringByStandardizingPath];
-
-CantMakePath:
-CantUseParams:
- return nsPath;
-}
-
-@end
diff --git a/Foundation/GTMNSFileManager+CarbonTest.m b/Foundation/GTMNSFileManager+CarbonTest.m
deleted file mode 100644
index f42ece4..0000000
--- a/Foundation/GTMNSFileManager+CarbonTest.m
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// GTMNSFileManager+CarbonTest.m
-//
-// Copyright 2006-2008 Google Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not
-// use this file except in compliance with the License. You may obtain a copy
-// of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-// License for the specific language governing permissions and limitations under
-// the License.
-//
-
-#import "GTMSenTestCase.h"
-#import "GTMNSFileManager+Carbon.h"
-#import <CoreServices/CoreServices.h>
-
-@interface GTMNSFileManager_CarbonTest : GTMTestCase
-@end
-
-@implementation GTMNSFileManager_CarbonTest
-
-- (void)testAliasPathFSRefConversion {
- NSString *path = NSHomeDirectory();
- XCTAssertNotNil(path);
- NSFileManager *fileManager = [NSFileManager defaultManager];
- FSRef *fsRef = [fileManager gtm_FSRefForPath:path];
- XCTAssertNotNULL(fsRef);
- AliasHandle alias;
- XCTAssertNoErr(FSNewAlias(nil, fsRef, &alias));
- XCTAssertNotNULL(alias);
- NSData *aliasData = [NSData dataWithBytes:*alias
- length:GetAliasSize(alias)];
- XCTAssertNotNil(aliasData);
- NSString *path2 = [fileManager gtm_pathFromAliasData:aliasData];
- XCTAssertEqualObjects(path, path2);
-
- path2 = [fileManager gtm_pathFromAliasData:aliasData
- resolve:YES
- withUI:NO];
- XCTAssertEqualObjects(path, path2);
-
- path2 = [fileManager gtm_pathFromAliasData:aliasData
- resolve:NO
- withUI:NO];
- XCTAssertEqualObjects(path, path2);
-
- NSData *aliasData2 = [fileManager gtm_aliasDataForPath:path2];
- XCTAssertNotNil(aliasData2);
- NSString *path3 = [fileManager gtm_pathFromAliasData:aliasData2];
- XCTAssertEqualObjects(path2, path3);
- NSString *path4 = [fileManager gtm_pathFromFSRef:fsRef];
- XCTAssertEqualObjects(path, path4);
-
- // Failure cases
- XCTAssertNULL([fileManager gtm_FSRefForPath:@"/ptah/taht/dosent/esixt/"]);
-
- XCTAssertNULL([fileManager gtm_FSRefForPath:@""]);
- XCTAssertNULL([fileManager gtm_FSRefForPath:nil]);
- XCTAssertNil([fileManager gtm_pathFromFSRef:nil]);
- XCTAssertNil([fileManager gtm_pathFromAliasData:nil]);
- XCTAssertNil([fileManager gtm_pathFromAliasData:[NSData data]]);
-
- XCTAssertNil([fileManager gtm_aliasDataForPath:@"/ptah/taht/dosent/esixt/"]);
- XCTAssertNil([fileManager gtm_aliasDataForPath:@""]);
- XCTAssertNil([fileManager gtm_aliasDataForPath:nil]);
-}
-@end
diff --git a/GTM.xcodeproj/project.pbxproj b/GTM.xcodeproj/project.pbxproj
index 895c10e..afee865 100644
--- a/GTM.xcodeproj/project.pbxproj
+++ b/GTM.xcodeproj/project.pbxproj
@@ -75,8 +75,6 @@
8B7DCE1B0DFF39850017E983 /* GTMSenTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B7DCE180DFF39850017E983 /* GTMSenTestCase.m */; };
8B82CEEB1D9B4DA1007182AA /* GTMFoundationUnitTestingUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B17FD13117638D500E7A908 /* GTMFoundationUnitTestingUtilities.m */; };
8B8B10F90EEB8B9E00E543D0 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F42E09AD0D19A62F00D5DDE0 /* Carbon.framework */; };
- 8B8EC87D0EF17C270044D13F /* GTMNSFileManager+Carbon.h in Headers */ = {isa = PBXBuildFile; fileRef = 8B8EC87B0EF17C270044D13F /* GTMNSFileManager+Carbon.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 8B8EC87E0EF17C270044D13F /* GTMNSFileManager+Carbon.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B8EC87C0EF17C270044D13F /* GTMNSFileManager+Carbon.m */; };
8BA983C81D9AE7E6009724B5 /* GTMUnitTestingTest.nib in Resources */ = {isa = PBXBuildFile; fileRef = 8BA983C51D9AE7E6009724B5 /* GTMUnitTestingTest.nib */; };
8BAA9E380F7C19D500DF4F12 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8BAA9E360F7C19D500DF4F12 /* MainMenu.xib */; };
8BAA9EF20F7C2AB500DF4F12 /* GTMCarbonEventTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B3E29290EEB53F3000681D8 /* GTMCarbonEventTest.m */; };
@@ -108,7 +106,6 @@
8BFE6E891282371200B5C894 /* GTMNSData+zlibTest.m in Sources */ = {isa = PBXBuildFile; fileRef = F43E4E600D4E5EC90041161F /* GTMNSData+zlibTest.m */; };
8BFE6E8B1282371200B5C894 /* GTMNSDictionary+URLArgumentsTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 33C3745E0DD8D85B00E97817 /* GTMNSDictionary+URLArgumentsTest.m */; };
8BFE6E8D1282371200B5C894 /* GTMNSFileHandle+UniqueNameTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B29078611F8D1BF0064F50F /* GTMNSFileHandle+UniqueNameTest.m */; };
- 8BFE6E8E1282371200B5C894 /* GTMNSFileManager+CarbonTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B8EC87F0EF17C2F0044D13F /* GTMNSFileManager+CarbonTest.m */; };
8BFE6E8F1282371200B5C894 /* GTMNSFileManager+PathTest.m in Sources */ = {isa = PBXBuildFile; fileRef = F413908E0D75F63C00F72B31 /* GTMNSFileManager+PathTest.m */; };
8BFE6E911282371200B5C894 /* GTMNSObject+KeyValueObservingTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B6C161B0F3580DA00E51E5D /* GTMNSObject+KeyValueObservingTest.m */; };
8BFE6E921282371200B5C894 /* GTMNSScanner+JSONTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BD35B900FB22980009058F5 /* GTMNSScanner+JSONTest.m */; };
@@ -301,9 +298,6 @@
8B6F4B610E8856CA00425D9F /* GTMDebugThreadValidation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTMDebugThreadValidation.h; sourceTree = "<group>"; };
8B6F4B620E8856CA00425D9F /* GTMDebugThreadValidation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTMDebugThreadValidation.m; sourceTree = "<group>"; };
8B7DCE180DFF39850017E983 /* GTMSenTestCase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTMSenTestCase.m; sourceTree = "<group>"; };
- 8B8EC87B0EF17C270044D13F /* GTMNSFileManager+Carbon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTMNSFileManager+Carbon.h"; sourceTree = "<group>"; };
- 8B8EC87C0EF17C270044D13F /* GTMNSFileManager+Carbon.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTMNSFileManager+Carbon.m"; sourceTree = "<group>"; };
- 8B8EC87F0EF17C2F0044D13F /* GTMNSFileManager+CarbonTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTMNSFileManager+CarbonTest.m"; sourceTree = "<group>"; };
8BA983C51D9AE7E6009724B5 /* GTMUnitTestingTest.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; path = GTMUnitTestingTest.nib; sourceTree = "<group>"; };
8BAA9E370F7C19D500DF4F12 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = UnitTesting/GTMUIUnitTestingHarness/English.lproj/MainMenu.xib; sourceTree = "<group>"; };
8BBD1F8A1519258A003152F0 /* GTMNSThread+Blocks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTMNSThread+Blocks.h"; sourceTree = "<group>"; };
@@ -689,9 +683,6 @@
8B29078411F8D1BF0064F50F /* GTMNSFileHandle+UniqueName.h */,
8B29078511F8D1BF0064F50F /* GTMNSFileHandle+UniqueName.m */,
8B29078611F8D1BF0064F50F /* GTMNSFileHandle+UniqueNameTest.m */,
- 8B8EC87B0EF17C270044D13F /* GTMNSFileManager+Carbon.h */,
- 8B8EC87C0EF17C270044D13F /* GTMNSFileManager+Carbon.m */,
- 8B8EC87F0EF17C2F0044D13F /* GTMNSFileManager+CarbonTest.m */,
F413908C0D75F63C00F72B31 /* GTMNSFileManager+Path.h */,
F413908D0D75F63C00F72B31 /* GTMNSFileManager+Path.m */,
F413908E0D75F63C00F72B31 /* GTMNSFileManager+PathTest.m */,
@@ -838,7 +829,6 @@
F41711350ECDFBD500B9B276 /* GTMLightweightProxy.h in Headers */,
8B3E292F0EEB53F8000681D8 /* GTMCarbonEvent.h in Headers */,
F49FA8440EEF2AB700077669 /* GTMFileSystemKQueue.h in Headers */,
- 8B8EC87D0EF17C270044D13F /* GTMNSFileManager+Carbon.h in Headers */,
8B6C15930F356E6400E51E5D /* GTMNSObject+KeyValueObserving.h in Headers */,
7F511DF90F4B0378009F41B6 /* GTMNSColor+Luminance.h in Headers */,
8B40994B0F93C5CC00DF540E /* GTMUILocalizer.h in Headers */,
@@ -1141,7 +1131,6 @@
8BFE6E891282371200B5C894 /* GTMNSData+zlibTest.m in Sources */,
8BFE6E8B1282371200B5C894 /* GTMNSDictionary+URLArgumentsTest.m in Sources */,
8BFE6E8D1282371200B5C894 /* GTMNSFileHandle+UniqueNameTest.m in Sources */,
- 8BFE6E8E1282371200B5C894 /* GTMNSFileManager+CarbonTest.m in Sources */,
8BFE6E8F1282371200B5C894 /* GTMNSFileManager+PathTest.m in Sources */,
8BFE6E911282371200B5C894 /* GTMNSObject+KeyValueObservingTest.m in Sources */,
8BFE6E921282371200B5C894 /* GTMNSScanner+JSONTest.m in Sources */,
@@ -1189,7 +1178,6 @@
F41711360ECDFBD500B9B276 /* GTMLightweightProxy.m in Sources */,
8B3E292E0EEB53F8000681D8 /* GTMCarbonEvent.m in Sources */,
F49FA8450EEF2AB700077669 /* GTMFileSystemKQueue.m in Sources */,
- 8B8EC87E0EF17C270044D13F /* GTMNSFileManager+Carbon.m in Sources */,
8B6C15940F356E6400E51E5D /* GTMNSObject+KeyValueObserving.m in Sources */,
7F511DFA0F4B0378009F41B6 /* GTMNSColor+Luminance.m in Sources */,
8B40994C0F93C5CC00DF540E /* GTMUILocalizer.m in Sources */,