[Bibdesk-commit] SF.net SVN: bibdesk:[25222] trunk/bibdesk/BDSKLinkedFile.m

[hofman--- via Bibdesk-commit]

Revision: 25222
          http://sourceforge.net/p/bibdesk/svn/25222
Author:   hofman
Date:     2020-12-20 14:42:49 +0000 (Sun, 20 Dec 2020)
Log Message:
-----------
Allow NULL FSRef to be passed to convenience function to create a URL

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

Modified: trunk/bibdesk/BDSKLinkedFile.m
===================================================================
--- trunk/bibdesk/BDSKLinkedFile.m      2020-12-20 07:30:31 UTC (rev 25221)
+++ trunk/bibdesk/BDSKLinkedFile.m      2020-12-20 14:42:49 UTC (rev 25222)
@@ -563,14 +563,13 @@
     if (hadFileRef == NO)
         [self updateFileRef];
     
-    CFURLRef aURL = fileRef ? BDSKCreateURLFromFSRef(fileRef) : NULL;
+    CFURLRef aURL = BDSKCreateURLFromFSRef(fileRef);
     
     if (aURL == NULL && hadFileRef) {
         // fileRef was invalid, try to update it
         [self setFileRef:NULL];
         [self updateFileRef];
-        if (fileRef != NULL)
-            aURL = BDSKCreateURLFromFSRef(fileRef);
+        aURL = BDSKCreateURLFromFSRef(fileRef);
     }
     
     BOOL changed = [(NSURL *)aURL isEqual:fileURL] == NO && (aURL != NULL || 
hadFileURL);
@@ -849,7 +848,7 @@
 
 static CFURLRef BDSKCreateURLFromFSRef(const FSRef *inRef)
 {
-    return CFURLCreateFromFSRef(NULL, inRef);
+    return inRef == NULL ? NULL : CFURLCreateFromFSRef(NULL, inRef);
 }
 
 static void BDSKDisposeAliasHandle(AliasHandle inAlias)

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