Revision: 28550
http://sourceforge.net/p/bibdesk/svn/28550
Author: hofman
Date: 2024-01-05 18:06:43 +0000 (Fri, 05 Jan 2024)
Log Message:
-----------
bridge retained to avoid objc object to be released by ARC
Modified Paths:
--------------
trunk/bibdesk/BDSKErrorEditor.m
trunk/bibdesk/BDSKServerInfo.m
trunk/bibdesk/NSFileManager_BDSKExtensions.m
trunk/bibdesk/NSURL_BDSKExtensions.m
Modified: trunk/bibdesk/BDSKErrorEditor.m
===================================================================
--- trunk/bibdesk/BDSKErrorEditor.m 2024-01-05 10:49:27 UTC (rev 28549)
+++ trunk/bibdesk/BDSKErrorEditor.m 2024-01-05 18:06:43 UTC (rev 28550)
@@ -430,7 +430,7 @@
NSCharacterSet *newlineSet = [NSCharacterSet newlineCharacterSet];
NSTextStorage *textStorage = [notification object];
- CFStringRef string = (__bridge CFStringRef)[textStorage string];
+ CFStringRef string = CFBridgingRetain([textStorage string]);
CFIndex length;
NSRange editedRange = [textStorage editedRange];
@@ -548,6 +548,7 @@
SetColor(hashColor, cnt, 1);
}
}
+ CFRelease(string);
if(braceDepth > 0){
invalidSyntaxHighlightMark = editedRange.location + length;
} else if(invalidSyntaxHighlightMark <= editedRange.location + length){
Modified: trunk/bibdesk/BDSKServerInfo.m
===================================================================
--- trunk/bibdesk/BDSKServerInfo.m 2024-01-05 10:49:27 UTC (rev 28549)
+++ trunk/bibdesk/BDSKServerInfo.m 2024-01-05 18:06:43 UTC (rev 28550)
@@ -551,8 +551,7 @@
- (BOOL)validateResultEncoding:(id *)value error:(NSError **)error {
BOOL isValid = NO;
if (*value) {
- CFStringRef charsetName = (__bridge CFStringRef)*value;
- CFStringEncoding enc =
CFStringConvertIANACharSetNameToEncoding(charsetName);
+ CFStringEncoding enc =
CFStringConvertIANACharSetNameToEncoding((__bridge CFStringRef)*value);
isValid = enc != kCFStringEncodingInvalidId;
// ZOOMConnection will consider any unrecognized string to be marc-8,
but check here
Modified: trunk/bibdesk/NSFileManager_BDSKExtensions.m
===================================================================
--- trunk/bibdesk/NSFileManager_BDSKExtensions.m 2024-01-05 10:49:27 UTC
(rev 28549)
+++ trunk/bibdesk/NSFileManager_BDSKExtensions.m 2024-01-05 18:06:43 UTC
(rev 28550)
@@ -424,8 +424,7 @@
nsEncoding = CFStringConvertEncodingToNSStringEncoding(cfEncoding);
}
else if ([array count] > 0) {
- CFStringRef name = (__bridge CFStringRef)[array objectAtIndex:0];
- CFStringEncoding cfEncoding =
CFStringConvertIANACharSetNameToEncoding(name);
+ CFStringEncoding cfEncoding =
CFStringConvertIANACharSetNameToEncoding((__bridge CFStringRef)[array
objectAtIndex:0]);
nsEncoding = CFStringConvertEncodingToNSStringEncoding(cfEncoding);
}
else if (NULL != error && nil != encodingString /* we read something from
EA, but couldn't understand it */) {
Modified: trunk/bibdesk/NSURL_BDSKExtensions.m
===================================================================
--- trunk/bibdesk/NSURL_BDSKExtensions.m 2024-01-05 10:49:27 UTC (rev
28549)
+++ trunk/bibdesk/NSURL_BDSKExtensions.m 2024-01-05 18:06:43 UTC (rev
28550)
@@ -119,7 +119,7 @@
if (isSymLink) {
oldURL = fileURL;
- fileURL = (CFURLRef)[[(__bridge NSURL *)fileURL
URLByResolvingSymlinksInPath] retain];
+ fileURL = CFBridgingRetain([(__bridge NSURL *)fileURL
URLByResolvingSymlinksInPath]);
// avoid being stuck in a loop when the symlink does not resolve
didResolve = fileURL != NULL && FALSE == CFEqual(fileURL, oldURL);
CFRelease(oldURL);
@@ -169,7 +169,7 @@
CFRelease(oldURL);
}
- return [(NSURL *)fileURL autorelease];
+ return CFBridgingRelease(fileURL);
}
- (NSURL *)fileURLByStrictlyResolvingAliases {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
