• Finally got around to find/replacing all of the NO_ARC macros, which were needed to work in macOS 10.5, with !__has_feature(objc_arc), has been available since 10.7 or so.

jerrykrinock · jerrykrinock · commit d0e3fad7528f · 2017-11-09T18:17:24.000-08:00
diff --git a/SSYAlertSounder.m b/SSYAlertSounder.m
@@ -26,7 +26,7 @@ - (void)dealloc {
         AudioServicesDisposeSystemSoundID((unsigned int)[soundId longValue]) ;
     }
     
-#if NO_ARC
+#if !__has_feature(objc_arc)
     [m_soundIds release] ;
     
     [super dealloc] ;
@@ -107,7 +107,7 @@ - (NSArray*)availableSoundsSorted {
     
     NSArray* answer = [names copy] ;
     
-#if NO_ARC
+#if !__has_feature(objc_arc)
     [paths release] ;
     [names release] ;
     [answer autorelease] ;
@@ -162,4 +162,4 @@ - (void)playAlertSoundNamed:(NSString*)name {
     }
 }
 
-@end
+@end
diff --git a/SSYInterappClient.m b/SSYInterappClient.m
@@ -72,7 +72,7 @@ + (BOOL)sendHeaderByte:(char)txHeaderByte
         aggrRxData = (__bridge NSData*)cfData ;
         // As always, we are careful not to CFRelease(NULL) ;
         CFRelease(remotePort) ;
-#if NO_ARC
+#if !__has_feature(objc_arc)
         [aggrTxData release] ;
 #endif
         
@@ -98,7 +98,7 @@ + (BOOL)sendHeaderByte:(char)txHeaderByte
             }
         }
         
-#if NO_ARC
+#if !__has_feature(objc_arc)
         [aggrRxData release] ;
 #endif
     }
@@ -141,7 +141,7 @@ + (BOOL)sendHeaderByte:(char)txHeaderByte
             txHeaderString = [[NSString alloc] initWithBytes:&txHeaderByte
                                                        length:1
                                                      encoding:NSUTF8StringEncoding] ;
-#if NO_ARC
+#if !__has_feature(objc_arc)
             [txHeaderString autorelease] ;
 #endif
         }
diff --git a/SSYInterappServer.m b/SSYInterappServer.m
@@ -105,7 +105,7 @@ CFDataRef SSYInterappServerCallBackCreateData(
         else {
             outputData = NULL ;
         }
-#if NO_ARC
+#if !__has_feature(objc_arc)
         [responseData release] ;
 #endif
     }
@@ -143,7 +143,7 @@ - (void)dealloc {
 		m_port = NULL ;
 	}
 	
-#if NO_ARC
+#if !__has_feature(objc_arc)
 	[super dealloc] ;
 #endif
 }
@@ -240,7 +240,7 @@ - (id)initWithPortName:(NSString*)portName
 	
 	if (errorCode != 0) {
         // See http://lists.apple.com/archives/Objc-language/2008/Sep/msg00133.html ...
-#if NO_ARC
+#if !__has_feature(objc_arc)
 		[super dealloc] ;
 #endif
 		self = nil ;
@@ -317,7 +317,7 @@ + (SSYInterappServer*)leaseServerWithPortName:(NSString*)portName
             // Internal Error 713-0192 here, but it was not providing any
             // useful information not already in the error.
 		}
-#if NO_ARC
+#if !__has_feature(objc_arc)
 		[server release] ;
 #endif
 	}
diff --git a/SSYKeychain.m b/SSYKeychain.m
@@ -51,7 +51,7 @@ + (NSString*)passwordForServost:(NSString*)servostName
         }
     }
     
-#if NO_ARC
+#if !__has_feature(objc_arc)
     [subs release] ;
     [query release] ;
 #endif
@@ -78,7 +78,7 @@ + (BOOL)deletePasswordForServost:(NSString*)servostName
     [query setAccount:account] ;
 
     BOOL ok = [query deleteItem:error_p] ;
-#if NO_ARC
+#if !__has_feature(objc_arc)
     [query release] ;
 #endif
     return ok ;
@@ -103,7 +103,7 @@ + (BOOL)setPassword:(NSString*)password
     [query setPassword:password] ;
     
     BOOL ok = [query save:error_p] ;
-#if NO_ARC
+#if !__has_feature(objc_arc)
     [query release] ;
 #endif
     return ok ;
@@ -124,7 +124,7 @@ + (NSArray*)allItemsForHost:(NSString*)hostName
     }
     
     NSArray* answer = [query fetchAll:nil] ;
-#if NO_ARC
+#if !__has_feature(objc_arc)
     [query release] ;
 #endif
     return answer ;
@@ -164,7 +164,7 @@ + (NSArray*)accountNamesForServost:(NSString*)servostName
 
     NSError* error = nil ;
     NSArray* items = [query fetchAll:&error] ;
-#if NO_ARC
+#if !__has_feature(objc_arc)
     [query release] ;
 #endif
     NSArray* accountNames = [items valueForKey:(NSString*)kSecAttrAccount] ;
diff --git a/SSYKeychainQuery.m b/SSYKeychainQuery.m
@@ -29,7 +29,7 @@ - (id)init {
     return self ;
 }
 
-#if NO_ARC
+#if !__has_feature(objc_arc)
 - (void)dealloc {
     [_account release] ;
     [_service release] ;
@@ -162,7 +162,7 @@ - (NSArray*)fetchAll:(NSError *__autoreleasing *)error {
         *error = [[self class] errorWithCode:status] ;
     }
     
-#if NO_ARC
+#if !__has_feature(objc_arc)
     return [(NSArray*)result autorelease] ;
 #else
     return (__bridge_transfer NSArray*)result ;
@@ -194,7 +194,7 @@ - (BOOL)fetch:(NSError *__autoreleasing *)error_p {
         }
     }
     
-#if NO_ARC
+#if !__has_feature(objc_arc)
     [self setPasswordData:result] ;
     [(NSData*)result autorelease] ;
 #else
@@ -233,7 +233,7 @@ - (void)setPassword:(NSString *)password {
 - (NSString *)password {
     if ([[self passwordData] length] > 0) {
         NSString* word = [[NSString alloc] initWithData:[self passwordData] encoding:NSUTF8StringEncoding] ;
-#if NO_ARC
+#if !__has_feature(objc_arc)
         [word autorelease] ;
 #endif
         return word ;
@@ -357,7 +357,7 @@ + (NSError *)errorWithCode:(NSInteger)code {
         }
 #else
         default:
-#if NO_ARC
+#if !__has_feature(objc_arc)
             message = (NSString*)SecCopyErrorMessageString((OSStatus)code, NULL) ;
             [message autorelease] ;
 #else
diff --git a/SSYLaunchdBasics.m b/SSYLaunchdBasics.m
@@ -42,7 +42,7 @@ + (NSSet*)installedLaunchdAgentLabelsWithPrefix:(NSString*)prefix {
 	}
 	
 	NSSet* answer = [targetAgentNames copy] ;
-#if NO_ARC
+#if !__has_feature(objc_arc)
 	[targetAgentNames release] ;
 	[answer autorelease] ;
 #endif
@@ -66,7 +66,7 @@ + (NSDictionary*)installedLaunchdAgentsWithPrefix:(NSString*)prefix {
 	}
 	
 	NSDictionary* answer = [agents copy] ;
-#if NO_ARC
+#if !__has_feature(objc_arc)
 	[agents release] ;
 	[answer autorelease] ;
 #endif
diff --git a/SSYShellTasker.m b/SSYShellTasker.m
@@ -39,7 +39,7 @@ - (void)doWithInfo:(NSMutableDictionary*)info {
 	// To conserve system resources, therefore, we use a local pool here.
 	// For more info, 
 	//	  http://www.cocoabuilder.com/archive/message/cocoa/2002/11/30/51122
-#if NO_ARC
+#if !__has_feature(objc_arc)
 	NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init] ;
 #endif
 	NSString* command = [info objectForKey:constKeySSYShellTaskerCommand] ;
@@ -79,7 +79,7 @@ - (void)doWithInfo:(NSMutableDictionary*)info {
             }
         }
         [task setEnvironment:taskEnvironment] ;
-#if NO_ARC
+#if !__has_feature(objc_arc)
        [taskEnvironment release] ;
 #endif
     }
@@ -194,15 +194,15 @@ - (void)doWithInfo:(NSMutableDictionary*)info {
 			 forKey:constKeySSYShellTaskerNSError] ;
 	}
 	
-#if NO_ARC
+#if !__has_feature(objc_arc)
 	[pipeStdin release] ;
 	[pipeStdout release] ;
 	[pipeStderr release] ;
 #endif
 	[[NSNotificationCenter defaultCenter] removeObserver:self
 													name:NSTaskDidTerminateNotification
 												  object:task] ;	
-#if NO_ARC
+#if !__has_feature(objc_arc)
     [task release] ;
 	[pool release] ;
 #endif
@@ -272,7 +272,7 @@ + (NSInteger)doShellTaskCommand:(NSString*)command
 		
 	result = [[info objectForKey:constKeySSYShellTaskerResult] integerValue] ;
 
-#if NO_ARC
+#if !__has_feature(objc_arc)
 	[tasker release] ;
 #endif
     
@@ -349,4 +349,4 @@ int main(int argc, const char *argv[]) {
  return 0 ;
  }
 
-*/
+*/
diff --git a/SSYStarRatingView.m b/SSYStarRatingView.m
@@ -78,7 +78,7 @@ - (id)initWithFrame:(NSRect)frame
 #endif
 #endif
 
-#if NO_ARC
+#if !__has_feature(objc_arc)
 -(void)dealloc
 {
     [m_starImage release] ;
diff --git a/SSYThreadPauser.m b/SSYThreadPauser.m
@@ -12,7 +12,7 @@
 @implementation SSYThreadPauser
 
 - (void)beginWorkWithInfo:(NSDictionary*)info {
-#if NO_ARC
+#if !__has_feature(objc_arc)
 	NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init] ;
 #endif
 	NSConditionLock* lock = [info objectForKey:SSYThreadPauserKeyLock] ;
@@ -23,7 +23,7 @@ - (void)beginWorkWithInfo:(NSDictionary*)info {
 	[invocation invoke] ;
 	
 	[lock unlockWithCondition:WORK_IS_DONE] ;
-#if NO_ARC
+#if !__has_feature(objc_arc)
 	[pool drain] ;
 #endif
 }
@@ -69,7 +69,7 @@ + (BOOL)blockUntilWorker:(id)worker
     NSThread* workerThread = [[NSThread alloc] initWithTarget:instance
                                                      selector:@selector(beginWorkWithInfo:)
                                                        object:info] ;
-#if NO_ARC
+#if !__has_feature(objc_arc)
     [workerThread autorelease] ;
 #endif
     // Name the thread, to help in debugging.
@@ -84,7 +84,7 @@ + (BOOL)blockUntilWorker:(id)worker
 	}
 	[workerThread cancel] ;
 	
-#if NO_ARC
+#if !__has_feature(objc_arc)
 	[instance release] ;
 	[lock release] ;
 #endif
diff --git a/SSYXMLPeeker.m b/SSYXMLPeeker.m
@@ -16,7 +16,7 @@ @implementation SSYXMLPeeker
 @synthesize targetElement = m_targetElement ;
 @synthesize error = m_error ;
 
-#if NO_ARC
+#if !__has_feature(objc_arc)
 - (void)dealloc {
     [m_parsedValue release] ;
     [m_targetElement release] ;
@@ -39,7 +39,7 @@ - (NSString*)stringValueOfElement:(NSString*)targetElement
     // is done or aborted.
 
     
-#if NO_ARC
+#if !__has_feature(objc_arc)
     [parser release] ;
 #endif
     return [self parsedValue] ;
@@ -55,7 +55,7 @@ + (NSString*)stringValueOfElement:(NSString*)targetElement
         *error_p = [peeker error] ;
     }
     
-#if NO_ARC
+#if !__has_feature(objc_arc)
     [peeker release] ;
 #endif
     
@@ -73,7 +73,7 @@ - (void)    parser:(NSXMLParser*)parser
     if ([elementName isEqualToString:[self targetElement]]) {
         NSMutableString* emptyString = [[NSMutableString alloc] init] ;
         [self setParsedValue:emptyString] ;
-#if NO_ARC
+#if !__has_feature(objc_arc)
         [emptyString release] ;
 #endif
     }

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ - (void)dealloc {`
`26`	`26`	`AudioServicesDisposeSystemSoundID((unsigned int)[soundId longValue]) ;`
`27`	`27`	`}`
`28`	`28`
`29`		`-#if NO_ARC`
	`29`	`+#if !__has_feature(objc_arc)`
`30`	`30`	`[m_soundIds release] ;`
`31`	`31`
`32`	`32`	`[super dealloc] ;`
`@@ -107,7 +107,7 @@ - (NSArray*)availableSoundsSorted {`
`107`	`107`
`108`	`108`	`NSArray* answer = [names copy] ;`
`109`	`109`
`110`		`-#if NO_ARC`
	`110`	`+#if !__has_feature(objc_arc)`
`111`	`111`	`[paths release] ;`
`112`	`112`	`[names release] ;`
`113`	`113`	`[answer autorelease] ;`
`@@ -162,4 +162,4 @@ - (void)playAlertSoundNamed:(NSString*)name {`
`162`	`162`	`}`
`163`	`163`	`}`
`164`	`164`
`165`		`-@end`
	`165`	`+@end`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ + (BOOL)sendHeaderByte:(char)txHeaderByte`
`72`	`72`	`aggrRxData = (__bridge NSData*)cfData ;`
`73`	`73`	`// As always, we are careful not to CFRelease(NULL) ;`
`74`	`74`	`CFRelease(remotePort) ;`
`75`		`-#if NO_ARC`
	`75`	`+#if !__has_feature(objc_arc)`
`76`	`76`	`[aggrTxData release] ;`
`77`	`77`	`#endif`
`78`	`78`
`@@ -98,7 +98,7 @@ + (BOOL)sendHeaderByte:(char)txHeaderByte`
`98`	`98`	`}`
`99`	`99`	`}`
`100`	`100`
`101`		`-#if NO_ARC`
	`101`	`+#if !__has_feature(objc_arc)`
`102`	`102`	`[aggrRxData release] ;`
`103`	`103`	`#endif`
`104`	`104`	`}`
`@@ -141,7 +141,7 @@ + (BOOL)sendHeaderByte:(char)txHeaderByte`
`141`	`141`	`txHeaderString = [[NSString alloc] initWithBytes:&txHeaderByte`
`142`	`142`	`length:1`
`143`	`143`	`encoding:NSUTF8StringEncoding] ;`
`144`		`-#if NO_ARC`
	`144`	`+#if !__has_feature(objc_arc)`
`145`	`145`	`[txHeaderString autorelease] ;`
`146`	`146`	`#endif`
`147`	`147`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ CFDataRef SSYInterappServerCallBackCreateData(`
`105`	`105`	`else {`
`106`	`106`	`outputData = NULL ;`
`107`	`107`	`}`
`108`		`-#if NO_ARC`
	`108`	`+#if !__has_feature(objc_arc)`
`109`	`109`	`[responseData release] ;`
`110`	`110`	`#endif`
`111`	`111`	`}`
`@@ -143,7 +143,7 @@ - (void)dealloc {`
`143`	`143`	`m_port = NULL ;`
`144`	`144`	`}`
`145`	`145`
`146`		`-#if NO_ARC`
	`146`	`+#if !__has_feature(objc_arc)`
`147`	`147`	`[super dealloc] ;`
`148`	`148`	`#endif`
`149`	`149`	`}`
`@@ -240,7 +240,7 @@ - (id)initWithPortName:(NSString*)portName`
`240`	`240`
`241`	`241`	`if (errorCode != 0) {`
`242`	`242`	`// See http://lists.apple.com/archives/Objc-language/2008/Sep/msg00133.html ...`
`243`		`-#if NO_ARC`
	`243`	`+#if !__has_feature(objc_arc)`
`244`	`244`	`[super dealloc] ;`
`245`	`245`	`#endif`
`246`	`246`	`self = nil ;`
`@@ -317,7 +317,7 @@ + (SSYInterappServer)leaseServerWithPortName:(NSString)portName`
`317`	`317`	`// Internal Error 713-0192 here, but it was not providing any`
`318`	`318`	`// useful information not already in the error.`
`319`	`319`	`}`
`320`		`-#if NO_ARC`
	`320`	`+#if !__has_feature(objc_arc)`
`321`	`321`	`[server release] ;`
`322`	`322`	`#endif`
`323`	`323`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ - (id)initWithFrame:(NSRect)frame`
`78`	`78`	`#endif`
`79`	`79`	`#endif`
`80`	`80`
`81`		`-#if NO_ARC`
	`81`	`+#if !__has_feature(objc_arc)`
`82`	`82`	`-(void)dealloc`
`83`	`83`	`{`
`84`	`84`	`[m_starImage release] ;`