[Bibdesk-commit] SF.net SVN: bibdesk:[28564] trunk/bibdesk/BDSKBibTeXP arser.m

[hofman--- via Bibdesk-commit]

Revision: 28564
          http://sourceforge.net/p/bibdesk/svn/28564
Author:   hofman
Date:     2024-01-06 18:46:38 +0000 (Sat, 06 Jan 2024)
Log Message:
-----------
return CFStringRef from function to avoid a bridging cast

Modified Paths:
--------------
    trunk/bibdesk/BDSKBibTeXParser.m

Modified: trunk/bibdesk/BDSKBibTeXParser.m
===================================================================
--- trunk/bibdesk/BDSKBibTeXParser.m    2024-01-06 18:27:38 UTC (rev 28563)
+++ trunk/bibdesk/BDSKBibTeXParser.m    2024-01-06 18:46:38 UTC (rev 28564)
@@ -600,7 +600,7 @@
 }
 
 // creates an NSString from the given bt_name and bt_namepart, which were 
parsed with the given encoding; returns nil if no such name component exists
-static NSString *createNameStringForComponent(CFAllocatorRef alloc, bt_name 
*theName, bt_namepart thePart, CFStringEncoding encoding)
+static CFStringRef __BDCreateNameStringForComponent(CFAllocatorRef alloc, 
bt_name *theName, bt_namepart thePart, CFStringEncoding encoding)
 {
     NSInteger i, numberOfTokens = theName->part_len[thePart];
     CFStringRef theString = NULL;
@@ -622,7 +622,7 @@
         }
         theString = mutableString;
     }
-    return (NSString *)theString;
+    return theString;
 }
 
 + (NSDictionary *)nameComponents:(NSString *)aName forPublication:(BibItem 
*)pub{
@@ -691,26 +691,26 @@
     if(shouldFree)
         CFAllocatorDeallocate(alloc, (void *)name_cstring);
     
-    NSString *nameString = nil;
+    CFStringRef nameString = NULL;
     
-    if ((nameString = createNameStringForComponent(alloc, theName, BTN_FIRST, 
encoding))) {
-        [parts setObject:nameString forKey:@"first"];
-        [nameString release];
+    if ((nameString = __BDCreateNameStringForComponent(alloc, theName, 
BTN_FIRST, encoding))) {
+        [parts setObject:(__bridge NSString *)nameString forKey:@"first"];
+        CFRelease(nameString);
     }
     
-    if ((nameString = createNameStringForComponent(alloc, theName, BTN_VON, 
encoding))) {
-        [parts setObject:nameString forKey:@"von"];
-        [nameString release];
+    if ((nameString = __BDCreateNameStringForComponent(alloc, theName, 
BTN_VON, encoding))) {
+        [parts setObject:(__bridge NSString *)nameString forKey:@"von"];
+        CFRelease(nameString);
     }
     
-    if ((nameString = createNameStringForComponent(alloc, theName, BTN_LAST, 
encoding))) {
-        [parts setObject:nameString forKey:@"last"];
-        [nameString release];
+    if ((nameString = __BDCreateNameStringForComponent(alloc, theName, 
BTN_LAST, encoding))) {
+        [parts setObject:(__bridge NSString *)nameString forKey:@"last"];
+        CFRelease(nameString);
     }
     
-    if ((nameString = createNameStringForComponent(alloc, theName, BTN_JR, 
encoding))) {
-        [parts setObject:nameString forKey:@"jr"];
-        [nameString release];
+    if ((nameString = __BDCreateNameStringForComponent(alloc, theName, BTN_JR, 
encoding))) {
+        [parts setObject:(__bridge NSString *)nameString forKey:@"jr"];
+        CFRelease(nameString);
     }
     
     bt_free_name(theName);

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.



_______________________________________________
Bibdesk-commit mailing list
Bibdesk-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit