Revision: 28544
http://sourceforge.net/p/bibdesk/svn/28544
Author: hofman
Date: 2024-01-04 23:27:41 +0000 (Thu, 04 Jan 2024)
Log Message:
-----------
add some CFBridgingRelease
Modified Paths:
--------------
trunk/bibdesk/BDSKBibTeXParser.m
trunk/bibdesk/BDSKConverter.m
trunk/bibdesk/NSAttributedString_BDSKExtensions.m
trunk/bibdesk/NSFileManager_BDSKExtensions.m
trunk/bibdesk/NSString_BDSKExtensions.m
trunk/bibdesk/NSURL_BDSKExtensions.m
Modified: trunk/bibdesk/BDSKBibTeXParser.m
===================================================================
--- trunk/bibdesk/BDSKBibTeXParser.m 2024-01-04 23:15:02 UTC (rev 28543)
+++ trunk/bibdesk/BDSKBibTeXParser.m 2024-01-04 23:27:41 UTC (rev 28544)
@@ -823,7 +823,7 @@
}
// create a fixed-size mutable array, since we've counted the number of
nodes
- NSMutableArray *nodes = (NSMutableArray
*)CFArrayCreateMutable(CFAllocatorGetDefault(), nodeCount,
&kCFTypeArrayCallBacks);
+ NSMutableArray *nodes =
CFBridgingRelease(CFArrayCreateMutable(CFAllocatorGetDefault(), nodeCount,
&kCFTypeArrayCallBacks));
while(simple_value){
if (simple_value->text){
@@ -848,7 +848,6 @@
[NSException raise:@"bad node type exception"
format:@"Node type %d is unexpected.", simple_value->nodetype];
}
if (nil == s) {
- [nodes release];
return nil;
}
sNode = [[BDSKStringNode alloc] initWithType:sType value:s];
@@ -862,7 +861,6 @@
// This will return a single string-type node as a non-complex string.
NSString *returnValue = [[NSString alloc] initWithNodes:nodes
macroResolver:macroResolver];
- [nodes release];
return returnValue;
}
Modified: trunk/bibdesk/BDSKConverter.m
===================================================================
--- trunk/bibdesk/BDSKConverter.m 2024-01-04 23:15:02 UTC (rev 28543)
+++ trunk/bibdesk/BDSKConverter.m 2024-01-04 23:27:41 UTC (rev 28544)
@@ -220,19 +220,16 @@
CFAllocatorRef alloc = CFGetAllocator(charString);
// isolate accent
- NSString *accentChar = (NSString *)CFStringCreateWithSubstring(alloc,
(__bridge CFStringRef)charString, CFRangeMake(1, 1));
+ NSString *accentChar =
CFBridgingRelease(CFStringCreateWithSubstring(alloc, (__bridge
CFStringRef)charString, CFRangeMake(1, 1)));
NSString *accent = [texifyAccents objectForKey:accentChar];
- [accentChar release];
// isolate character
- NSString *character = (NSString *)CFStringCreateWithSubstring(alloc,
(__bridge CFStringRef)charString, CFRangeMake(0, 1));
+ NSString *character = CFBridgingRelease(CFStringCreateWithSubstring(alloc,
(__bridge CFStringRef)charString, CFRangeMake(0, 1)));
// handle i and j (others as well?)
if (([character isEqualToString:@"i"] || [character isEqualToString:@"j"])
&&
![accent isEqualToString:@"c "] && ![accent isEqualToString:@"d
"] && ![accent isEqualToString:@"b "]) {
- NSString *oldCharacter = character;
- character = [[@"\\" stringByAppendingString:oldCharacter] copy];
- [oldCharacter release];
+ character = [@"\\" stringByAppendingString:character];
}
// [accent length] == 2 in some cases, and the 'character' may or may not
have \\ prepended, so we'll just replace the entire string rather than trying
to catch all of those cases by recomputing lengths
@@ -241,8 +238,6 @@
[charString appendString:character];
[charString appendString:@"}"];
- [character release];
-
return YES;
}
@@ -354,15 +349,13 @@
if (ch == '}') {
CFAllocatorRef alloc = CFGetAllocator(texString);
- character = (NSString *)CFStringCreateWithSubstring(alloc,
(__bridge CFStringRef)texString, CFRangeMake(letterStart, idx - letterStart));
+ character = CFBridgingRelease(CFStringCreateWithSubstring(alloc,
(__bridge CFStringRef)texString, CFRangeMake(letterStart, idx - letterStart)));
// special cases for old style i, j
if ([character isEqualToString:@"\\i"]) {
- [character release];
- character = [@"i" retain];
+ character = @"i";
} else if ([character isEqualToString:@"\\j"]) {
- [character release];
- character = [@"j" retain];
+ character = @"j";
}
if ([character length] == 1) {
@@ -374,19 +367,16 @@
[texString setString:(__bridge NSString
*)mutableCharacter];
} else {
// if it can't be composed to a single character, we won't
be able to convert it back
- [character release];
CFRelease(mutableCharacter);
return NO;
}
// should be at idx = length anyway
- [character release];
CFRelease(mutableCharacter);
return YES;
} else {
// incorrect length of the character
- [character release];
return NO;
}
}
Modified: trunk/bibdesk/NSAttributedString_BDSKExtensions.m
===================================================================
--- trunk/bibdesk/NSAttributedString_BDSKExtensions.m 2024-01-04 23:15:02 UTC
(rev 28543)
+++ trunk/bibdesk/NSAttributedString_BDSKExtensions.m 2024-01-04 23:27:41 UTC
(rev 28544)
@@ -68,7 +68,7 @@
while( (cmdRange = [mutableString
rangeOfTeXCommandInRange:searchRange]).location != NSNotFound){
// copy the command
- texStyle = (NSString *)CFStringCreateWithSubstring(alloc, (__bridge
CFStringRef)mutableString, CFRangeMake(cmdRange.location, cmdRange.length));
+ texStyle = CFBridgingRelease(CFStringCreateWithSubstring(alloc,
(__bridge CFStringRef)mutableString, CFRangeMake(cmdRange.location,
cmdRange.length)));
// delete the command, now that we know what it was
[mutableString deleteCharactersInRange:cmdRange];
@@ -90,7 +90,6 @@
newTrait = NSItalicFontMask;
else if([texStyle isEqualToString:@"\\textup"])
newTrait = NSUnitalicFontMask;
- [texStyle release];
if (0 != newTrait) {
Modified: trunk/bibdesk/NSFileManager_BDSKExtensions.m
===================================================================
--- trunk/bibdesk/NSFileManager_BDSKExtensions.m 2024-01-04 23:15:02 UTC
(rev 28543)
+++ trunk/bibdesk/NSFileManager_BDSKExtensions.m 2024-01-04 23:27:41 UTC
(rev 28544)
@@ -145,13 +145,12 @@
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
if (noErr == FSFindFolder(kUserDomain, kChewableItemsFolderType, TRUE,
&chewableRef)) {
- NSURL *chewableURL = (NSURL
*)CFURLCreateFromFSRef(kCFAllocatorDefault, &chewableRef);
+ NSURL *chewableURL =
CFBridgingRelease(CFURLCreateFromFSRef(kCFAllocatorDefault, &chewableRef));
#pragma clang diagnostic pop
NSString *appName = [[NSBundle mainBundle]
objectForInfoDictionaryKey:(__bridge NSString *)kCFBundleNameKey];
chewableItemsFolderURL = [[chewableURL
URLByAppendingPathComponent:appName isDirectory:YES] copy];
if ([chewableItemsFolderURL
checkResourceIsReachableAndReturnError:NULL] == NO)
[self createDirectoryAtPath:[chewableItemsFolderURL path]
withIntermediateDirectories:NO attributes:nil error:NULL];
- [chewableURL release];
}
}
return chewableItemsFolderURL;
Modified: trunk/bibdesk/NSString_BDSKExtensions.m
===================================================================
--- trunk/bibdesk/NSString_BDSKExtensions.m 2024-01-04 23:15:02 UTC (rev
28543)
+++ trunk/bibdesk/NSString_BDSKExtensions.m 2024-01-04 23:27:41 UTC (rev
28544)
@@ -1210,7 +1210,7 @@
NSMutableArray *words = nil;
if (comp) {
- words = (NSMutableArray *)CFArrayCreateMutableCopy(alloc,
CFArrayGetCount(comp), comp);
+ words = CFBridgingRelease(CFArrayCreateMutableCopy(alloc,
CFArrayGetCount(comp), comp));
CFRelease(comp);
}
@@ -1245,7 +1245,6 @@
NSString *toReturn = nil;
if (words) {
toReturn = CFBridgingRelease(CFStringCreateByCombiningStrings(alloc,
(__bridge CFArrayRef)words, CFSTR(" ")));
- [words release];
}
return toReturn;
}
Modified: trunk/bibdesk/NSURL_BDSKExtensions.m
===================================================================
--- trunk/bibdesk/NSURL_BDSKExtensions.m 2024-01-04 23:15:02 UTC (rev
28543)
+++ trunk/bibdesk/NSURL_BDSKExtensions.m 2024-01-04 23:27:41 UTC (rev
28544)
@@ -197,7 +197,7 @@
FSRef fileRef;
Boolean wasChanged;
if (noErr == FSResolveAliasWithMountFlags(NULL,
(AliasHandle)handle, &fileRef, &wasChanged, allowUI ? 0 :
kResolveAliasFileNoUI))
- fileURL = [(NSURL *)CFURLCreateFromFSRef(kCFAllocatorDefault,
&fileRef) autorelease];
+ fileURL =
CFBridgingRelease(CFURLCreateFromFSRef(kCFAllocatorDefault, &fileRef));
DisposeHandle(handle);
}
#pragma clang diagnostic pop
@@ -226,7 +226,7 @@
CFIndex len = GetHandleSize(handle);
SInt8 handleState = HGetState(handle);
HLock(handle);
- data = [(NSData *)CFDataCreate(kCFAllocatorDefault, (const UInt8
*)*handle, len) autorelease];
+ data = CFBridgingRelease(CFDataCreate(kCFAllocatorDefault, (const
UInt8 *)*handle, len));
HSetState(handle, handleState);
DisposeHandle(handle);
}
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
