Changeset 156 for trunk/appswitch/appswitch/main.c

Timestamp:

04/19/04 02:40:59 (20 years ago)

Author:

Nicholas Riley

Message:

appswitch.1: Updated for appswitch 1.0.1.

appswitch.xcode: Converted to Xcode project from PBX project; still
using legacy target for now.

main.c: Updated copyright date. Fixed memory leak and bogus return
value in bundleIdentifierForApplication. Fixed a caller to properly
release then bundle identifier when it's finished with it.

README: Updated for appswitch 1.0.1. Summarize changes.

File:

• trunk/appswitch/appswitch/main.c (modified) (3 diffs)

trunk/appswitch/appswitch/main.c

@@ -3 +3 @@
  Nicholas Riley <appswitch@sabi.net>
 
- Copyright (c) 2003, Nicholas Riley
+ Copyright (c) 2003-04, Nicholas Riley
  All rights reserved.
 
@@ -250 +250 @@
     if (bundle != NULL) {
         *bundleID = CFBundleGetIdentifier(bundle);
+        if (*bundleID != NULL) {
+            CFRetain(*bundleID);
 #if DEBUG
-        CFShow(*bundleID);
+            CFShow(*bundleID);
 #endif
+        }
+        CFRelease(bundle);
+    } else {
+        *bundleID = NULL;
     }
     CFRelease(url);
@@ -346 +352 @@
                    if (!bundleIdentifierForApplication(&bundleID, path))
                        errexit("can't get bundle location for process '%s' (PSN %ld.%ld, pid %ld)", name, psn.hi, psn.lo, info->UnixPID);
-                   if (bundleID != NULL && CFStringCompare(OPTS.bundleID, bundleID, kCFCompareCaseInsensitive) == kCFCompareEqualTo)
-                       break;
+                   if (bundleID != NULL) {
+                       CFComparisonResult result = CFStringCompare(OPTS.bundleID, bundleID, kCFCompareCaseInsensitive);
+                       if (result == kCFCompareEqualTo)
+                           break;
+                       CFRelease(bundleID);
+                   }
                    continue;
                }