diff options
author | gtm.daemon <gtm.daemon@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3> | 2012-06-21 21:30:11 +0000 |
---|---|---|
committer | gtm.daemon <gtm.daemon@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3> | 2012-06-21 21:30:11 +0000 |
commit | 7247d5e2ea3e43a48c1f85bf263c5237d459641a (patch) | |
tree | be744b82ab288a21decc4a31a5adc8db001d85d9 | |
parent | b962a2ca36c7efbb9ae89330041a3edcd12e7704 (diff) |
[Author: dmaclach]
Clean up some basic issues in GTM.
Also removes GTMUniqueFileObjectPathBasedOn which depended on mktemp which is
bad.
R=thomasvl
DELTA=55 (6 added, 32 deleted, 17 changed)
-rw-r--r-- | AppKit/GTMHotKeyTextField.m | 2 | ||||
-rw-r--r-- | DebugUtils/GTMDebugSelectorValidation.h | 8 | ||||
-rw-r--r-- | Foundation/GTMAbstractDOListener.m | 2 | ||||
-rw-r--r-- | Foundation/GTMNSAppleEventDescriptor+Foundation.m | 2 | ||||
-rw-r--r-- | Foundation/GTMNSAppleScript+Handler.m | 18 | ||||
-rw-r--r-- | Foundation/GTMNSAppleScript+HandlerTest.m | 13 | ||||
-rw-r--r-- | Foundation/GTMNSFileHandle+UniqueName.h | 4 | ||||
-rw-r--r-- | Foundation/GTMNSFileHandle+UniqueName.m | 11 | ||||
-rw-r--r-- | Foundation/GTMNSFileHandle+UniqueNameTest.m | 10 | ||||
-rw-r--r-- | Foundation/GTMRegex.m | 2 |
10 files changed, 23 insertions, 49 deletions
diff --git a/AppKit/GTMHotKeyTextField.m b/AppKit/GTMHotKeyTextField.m index 276f212..c73d217 100644 --- a/AppKit/GTMHotKeyTextField.m +++ b/AppKit/GTMHotKeyTextField.m @@ -492,7 +492,7 @@ static CFStringRef kGTM_TISPropertyUnicodeKeyLayoutData = NULL; uchrChars); if (err != noErr) { // COV_NF_START - _GTMDevLog(@"failed to translate the keycode, err=%d", err); + _GTMDevLog(@"failed to translate the keycode, err=%d", (int)err); return nil; // COV_NF_END } diff --git a/DebugUtils/GTMDebugSelectorValidation.h b/DebugUtils/GTMDebugSelectorValidation.h index 19d8b8e..2396524 100644 --- a/DebugUtils/GTMDebugSelectorValidation.h +++ b/DebugUtils/GTMDebugSelectorValidation.h @@ -58,10 +58,10 @@ static void GTMAssertSelectorNilOrImplementedWithReturnTypeAndArguments(id obj, const char *foundArgType = [sig getArgumentTypeAtIndex:argCount]; _GTMDevAssert(0 == strncmp(foundArgType, expectedArgType, strlen(expectedArgType)), - @"\"%@\" selector \"%@\" argument %d should be type %s", + @"\"%@\" selector \"%@\" argument %u should be type %s", NSStringFromClass([obj class]), NSStringFromSelector(sel), - (argCount - 2), + (uint32_t)(argCount - 2), expectedArgType); } argCount++; @@ -69,10 +69,10 @@ static void GTMAssertSelectorNilOrImplementedWithReturnTypeAndArguments(id obj, // check that the proper number of arguments are present in the selector _GTMDevAssert(argCount == [sig numberOfArguments], - @"\"%@\" selector \"%@\" should have %d arguments", + @"\"%@\" selector \"%@\" should have %u arguments", NSStringFromClass([obj class]), NSStringFromSelector(sel), - (argCount - 2)); + (uint32_t)(argCount - 2)); // if asked, validate the return type if (retType && (strcmp("gtm_skip_return_test", retType) != 0)) { diff --git a/Foundation/GTMAbstractDOListener.m b/Foundation/GTMAbstractDOListener.m index cf24c77..0e221a8 100644 --- a/Foundation/GTMAbstractDOListener.m +++ b/Foundation/GTMAbstractDOListener.m @@ -255,7 +255,7 @@ static NSMutableSet *gAllListeners = nil; NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; _GTMDevAssert(!connection_, @"Connection_ should not be set. Was this " - @"listener already started? %@"); + @"listener already started? %@", self); connection_ = [[NSConnection alloc] initWithReceivePort:port_ sendPort:nil]; NSProtocolChecker *checker = diff --git a/Foundation/GTMNSAppleEventDescriptor+Foundation.m b/Foundation/GTMNSAppleEventDescriptor+Foundation.m index ea9fe81..f9828d4 100644 --- a/Foundation/GTMNSAppleEventDescriptor+Foundation.m +++ b/Foundation/GTMNSAppleEventDescriptor+Foundation.m @@ -519,7 +519,7 @@ static NSMutableDictionary *gTypeMap = nil; = [[[NSAppleEventDescriptor alloc] initWithAEDescNoCopy:&replyEvent] autorelease]; if (err) { isGood = NO; - _GTMDevLog(@"Unable to send message: %@ %d", self, err); + _GTMDevLog(@"Unable to send message: %@ %d", self, (int)err); } if (isGood) { NSAppleEventDescriptor *errorDesc = [replyDesc descriptorForKeyword:keyErrorNumber]; diff --git a/Foundation/GTMNSAppleScript+Handler.m b/Foundation/GTMNSAppleScript+Handler.m index e4ace96..3917015 100644 --- a/Foundation/GTMNSAppleScript+Handler.m +++ b/Foundation/GTMNSAppleScript+Handler.m @@ -222,7 +222,7 @@ GTM_METHOD_CHECK(NSAppleEventDescriptor, gtm_registerSelector:forTypes:count:); } if (!wasGood) { _GTMDevLog(@"Unable to setValue:%@ forProperty:%@ from %@ (%d)", - value, property, self, error); + value, property, self, (int)error); } return wasGood; } @@ -250,7 +250,7 @@ GTM_METHOD_CHECK(NSAppleEventDescriptor, gtm_registerSelector:forTypes:count:); desc = [[[NSAppleEventDescriptor alloc] initWithAEDescNoCopy:&result] autorelease]; } else { - _GTMDevLog(@"Unable to coerce script %d", error); + _GTMDevLog(@"Unable to coerce script %d", (int)error); } return desc; } @@ -264,7 +264,7 @@ GTM_METHOD_CHECK(NSAppleEventDescriptor, gtm_registerSelector:forTypes:count:); kASHasOpenHandler, &value); if (error) { - _GTMDevLog(@"Unable to get script info about open handler %d", error); + _GTMDevLog(@"Unable to get script info about open handler %d", (int)error); value = 0; } return value != 0; @@ -346,7 +346,7 @@ GTM_METHOD_CHECK(NSAppleEventDescriptor, gtm_registerSelector:forTypes:count:); } if (error) { _GTMDevLog(@"Unable to get valueForProperty:%@ from %@ (%d)", - property, self, error); + property, self, (int)error); } return desc; } @@ -390,7 +390,7 @@ GTM_METHOD_CHECK(NSAppleEventDescriptor, gtm_registerSelector:forTypes:count:); array = [desc gtm_objectValue]; } if (error != noErr) { - _GTMDevLog(@"Error getting handlers: %d", error); // COV_NF_LINE + _GTMDevLog(@"Error getting handlers: %d", (int)error); // COV_NF_LINE } return [NSSet setWithArray:array]; } @@ -409,7 +409,7 @@ GTM_METHOD_CHECK(NSAppleEventDescriptor, gtm_registerSelector:forTypes:count:); array = [desc gtm_objectValue]; } if (error != noErr) { - _GTMDevLog(@"Error getting properties: %d", error); // COV_NF_LINE + _GTMDevLog(@"Error getting properties: %d", (int)error); // COV_NF_LINE } return [NSSet setWithArray:array]; } @@ -420,7 +420,7 @@ GTM_METHOD_CHECK(NSAppleEventDescriptor, gtm_registerSelector:forTypes:count:); OSAID exactID = osaID; OSAError error = OSARealToGenericID(genericComponent, &exactID, component); if (error != noErr) { - _GTMDevLog(@"Unable to get real id script: %@ %d", self, error); // COV_NF_LINE + _GTMDevLog(@"Unable to get real id script: %@ %d", self, (int)error); // COV_NF_LINE exactID = kOSANullScript; // COV_NF_LINE } return exactID; @@ -462,7 +462,7 @@ GTM_METHOD_CHECK(NSAppleEventDescriptor, gtm_registerSelector:forTypes:count:); } } if (err != noErr) { - _GTMDevLog(@"Unable to create desc for id:%d (%d)", osaID, err); // COV_NF_LINE + _GTMDevLog(@"Unable to create desc for id:%d (%d)", osaID, (int)err); // COV_NF_LINE } return desc; } @@ -480,7 +480,7 @@ GTM_METHOD_CHECK(NSAppleEventDescriptor, gtm_registerSelector:forTypes:count:); ComponentInstance genericComponent = [NSAppleScript _defaultScriptingComponent]; OSAError error = OSAGenericToRealID(genericComponent, &genericID, component); if (error != noErr) { - _GTMDevLog(@"Unable to get real id script: %@ %d", self, error); // COV_NF_LINE + _GTMDevLog(@"Unable to get real id script: %@ %d", self, (int)error); // COV_NF_LINE genericID = kOSANullScript; // COV_NF_LINE } return genericID; diff --git a/Foundation/GTMNSAppleScript+HandlerTest.m b/Foundation/GTMNSAppleScript+HandlerTest.m index dd559e9..16886a8 100644 --- a/Foundation/GTMNSAppleScript+HandlerTest.m +++ b/Foundation/GTMNSAppleScript+HandlerTest.m @@ -25,6 +25,12 @@ #import "GTMSystemVersion.h" #import "GTMFourCharCode.h" +@protocol ScriptInterface +- (id)test; +- (id)testReturnParam:(id)param; +- (id)testAddParams:(id)param1 :(id)param2; +@end + @interface GTMNSAppleScript_HandlerTest : GTMTestCase { NSAppleScript *script_; } @@ -502,13 +508,6 @@ STAssertTrue([script gtm_hasOpenDocumentsHandler], nil); } - -@protocol ScriptInterface -- (id)test; -- (id)testReturnParam:(id)param; -- (id)testAddParams:(id)param1 :(id)param2; -@end - - (void)testForwarding { id<ScriptInterface> foo = (id<ScriptInterface>)script_; [foo test]; diff --git a/Foundation/GTMNSFileHandle+UniqueName.h b/Foundation/GTMNSFileHandle+UniqueName.h index 38197cd..85b7933 100644 --- a/Foundation/GTMNSFileHandle+UniqueName.h +++ b/Foundation/GTMNSFileHandle+UniqueName.h @@ -75,7 +75,3 @@ inDirectory:(NSSearchPathDirectory)directory domainMask:(NSSearchPathDomainMask)mask; @end - -// Same template as you would pass to mktemp. Note that this has the same -// potential race conditions for use with file creation as mktemp does. -GTM_EXTERN NSString *GTMUniqueFileObjectPathBasedOn(NSString *pathTemplate); diff --git a/Foundation/GTMNSFileHandle+UniqueName.m b/Foundation/GTMNSFileHandle+UniqueName.m index fc790ee..57d507e 100644 --- a/Foundation/GTMNSFileHandle+UniqueName.m +++ b/Foundation/GTMNSFileHandle+UniqueName.m @@ -17,17 +17,6 @@ // #import "GTMNSFileHandle+UniqueName.h" -#include <unistd.h> - -NSString *GTMUniqueFileObjectPathBasedOn(NSString *pathTemplate) { - if (!pathTemplate) return nil; - char *pathTemplateCString = strdup([pathTemplate fileSystemRepresentation]); - if (!pathTemplateCString) return nil; - char *newCName = mktemp(pathTemplateCString); - NSString *newName = newCName ? [NSString stringWithUTF8String:newCName] : nil; - free(pathTemplateCString); - return newName; -} @implementation NSFileHandle (GTMFileHandleUniqueNameAdditions) diff --git a/Foundation/GTMNSFileHandle+UniqueNameTest.m b/Foundation/GTMNSFileHandle+UniqueNameTest.m index 34453a0..45cd8c7 100644 --- a/Foundation/GTMNSFileHandle+UniqueNameTest.m +++ b/Foundation/GTMNSFileHandle+UniqueNameTest.m @@ -24,16 +24,6 @@ @implementation GTMNSFileHandle_UniqueNameTest -- (void)testGTMUniqueFileObjectPathBasedOn { - NSString *path = GTMUniqueFileObjectPathBasedOn(nil); - STAssertNil(path, nil); - path = GTMUniqueFileObjectPathBasedOn(@"/System"); - STAssertNil(path, nil); - path = GTMUniqueFileObjectPathBasedOn(@"/Users/HappyXXXXXX"); - STAssertTrue([path hasPrefix:@"/Users/Happy"], nil); - STAssertNotEqualObjects(path, @"/Users/HappyXXXXXX", nil); -} - - (void)testFileHandleWithUniqueNameBasedOnFinalPath { NSFileHandle *handle = [NSFileHandle gtm_fileHandleWithUniqueNameBasedOn:nil diff --git a/Foundation/GTMRegex.m b/Foundation/GTMRegex.m index f4d6362..d0b831c 100644 --- a/Foundation/GTMRegex.m +++ b/Foundation/GTMRegex.m @@ -719,7 +719,7 @@ static NSString *const kReplacementPattern = [NSMutableString stringWithFormat:@"%@<%p> { isMatch=\"%s\", subPatterns=(", [self class], self, (isMatch_ ? "YES" : "NO")]; for (NSUInteger x = 0; x <= numRegMatches_; ++x) { - NSInteger length = (NSInteger)(regMatches_[x].rm_eo - regMatches_[x].rm_so); + int length = (int)(regMatches_[x].rm_eo - regMatches_[x].rm_so); const char* string = (((const char*)[utf8StrBuf_ bytes]) + regMatches_[x].rm_so); if (x == 0) { |