configd-293.8.tar.gz

[apple/configd.git] / scutil.tproj / net_set.c

diff --git a/scutil.tproj/net_set.c b/scutil.tproj/net_set.c
index 7677279f2b8efc27ea1174b03b714352230e0a99..fa528f45d4bbbb9399991c39956fb5600e060774 100644 (file)
--- a/scutil.tproj/net_set.c
+++ b/scutil.tproj/net_set.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2004, 2005 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2004, 2005, 2009 Apple Inc. All rights reserved.

  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 


@@ -242,8 +242,8 @@ create_set(int argc, char **argv)
                Boolean         ok;
 
                setName = CFStringCreateWithCString(NULL, argv[0], kCFStringEncodingUTF8);
                Boolean         ok;
 
                setName = CFStringCreateWithCString(NULL, argv[0], kCFStringEncodingUTF8);

-               argv++;
-               argc--;
+//             argv++;
+//             argc--;

 
                ok = SCNetworkSetSetName(set, setName);
                CFRelease(setName);
 
                ok = SCNetworkSetSetName(set, setName);
                CFRelease(setName);


@@ -529,7 +529,6 @@ show_set(int argc, char **argv)
                CFIndex                 n;
                CFIndex                 nOrder  = 0;
                CFArrayRef              order;
                CFIndex                 n;
                CFIndex                 nOrder  = 0;
                CFArrayRef              order;

-               CFMutableArrayRef       sorted  = (CFMutableArrayRef)services;

 
                order = SCNetworkSetGetServiceOrder(set);
                if (order != NULL) {
 
                order = SCNetworkSetGetServiceOrder(set);
                if (order != NULL) {


@@ -538,11 +537,15 @@ show_set(int argc, char **argv)
 
                n = CFArrayGetCount(services);
                if (n > 1) {
 
                n = CFArrayGetCount(services);
                if (n > 1) {

+                       CFMutableArrayRef       sorted;
+

                        sorted = CFArrayCreateMutableCopy(NULL, 0, services);
                        CFArraySortValues(sorted,
                                          CFRangeMake(0, CFArrayGetCount(sorted)),
                                          _compare_services,
                                          (void *)order);
                        sorted = CFArrayCreateMutableCopy(NULL, 0, services);
                        CFArraySortValues(sorted,
                                          CFRangeMake(0, CFArrayGetCount(sorted)),
                                          _compare_services,
                                          (void *)order);

+                       CFRelease(services);
+                       services = sorted;

                }
 
                SCPrint(TRUE, stdout, CFSTR("services =\n"));
                }
 
                SCPrint(TRUE, stdout, CFSTR("services =\n"));


@@ -553,7 +556,7 @@ show_set(int argc, char **argv)
                        CFStringRef             serviceName;
                        CFStringRef             serviceID;
 
                        CFStringRef             serviceName;
                        CFStringRef             serviceID;
 

-                       service     = CFArrayGetValueAtIndex(sorted, i);
+                       service     = CFArrayGetValueAtIndex(services, i);

                        serviceID   = SCNetworkServiceGetServiceID(service);
                        serviceName = SCNetworkServiceGetName(service);
                        if (serviceName == NULL) serviceName = CFSTR("");
                        serviceID   = SCNetworkServiceGetServiceID(service);
                        serviceName = SCNetworkServiceGetName(service);
                        if (serviceName == NULL) serviceName = CFSTR("");


@@ -582,8 +585,6 @@ show_set(int argc, char **argv)
                }
 
                CFRelease(services);
                }
 
                CFRelease(services);

-
-               if (sorted != services) CFRelease(sorted);

        }
 
        if (_sc_debug) {
        }
 
        if (_sc_debug) {