X-Git-Url: https://git.saurik.com/apple/configd.git/blobdiff_plain/dbf6a266c384fc8b55e00a396eebe5cb62e21547..441dd19beddb71be6edb0b50e19a89e700a89468:/scutil.tproj/net_set.c

diff --git a/scutil.tproj/net_set.c b/scutil.tproj/net_set.c
index 0e0082e..fa528f4 100644
--- a/scutil.tproj/net_set.c
+++ b/scutil.tproj/net_set.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2004, 2005, 2009 Apple Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
@@ -33,6 +33,7 @@
 #include "net.h"
 #include "net_set.h"
 #include "net_service.h"
+#include "prefs.h"
 
 
 /* -------------------- */
@@ -241,8 +242,8 @@ create_set(int argc, char **argv)
 		Boolean		ok;
 
 		setName = CFStringCreateWithCString(NULL, argv[0], kCFStringEncodingUTF8);
-		argv++;
-		argc--;
+//		argv++;
+//		argc--;
 
 		ok = SCNetworkSetSetName(set, setName);
 		CFRelease(setName);
@@ -254,7 +255,7 @@ create_set(int argc, char **argv)
 		}
 	}
 
-	net_changed = TRUE;
+	_prefs_changed = TRUE;
 
 	if (net_set != NULL) CFRelease(net_set);
 	net_set = set;
@@ -324,7 +325,7 @@ remove_set(int argc, char **argv)
 		goto done;
 	}
 
-	net_changed = TRUE;
+	_prefs_changed = TRUE;
 
 	setName = SCNetworkSetGetName(set);
 	if (setName != NULL) {
@@ -458,7 +459,7 @@ set_set(int argc, char **argv)
 				return;
 			}
 
-			net_changed = TRUE;
+			_prefs_changed = TRUE;
 
 			if (sets != NULL) {
 				/*
@@ -528,7 +529,6 @@ show_set(int argc, char **argv)
 		CFIndex			n;
 		CFIndex			nOrder	= 0;
 		CFArrayRef		order;
-		CFMutableArrayRef	sorted	= (CFMutableArrayRef)services;
 
 		order = SCNetworkSetGetServiceOrder(set);
 		if (order != NULL) {
@@ -537,11 +537,15 @@ show_set(int argc, char **argv)
 
 		n = CFArrayGetCount(services);
 		if (n > 1) {
+			CFMutableArrayRef	sorted;
+
 			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"));
@@ -552,7 +556,7 @@ show_set(int argc, char **argv)
 			CFStringRef		serviceName;
 			CFStringRef		serviceID;
 
-			service     = CFArrayGetValueAtIndex(sorted, i);
+			service     = CFArrayGetValueAtIndex(services, i);
 			serviceID   = SCNetworkServiceGetServiceID(service);
 			serviceName = SCNetworkServiceGetName(service);
 			if (serviceName == NULL) serviceName = CFSTR("");
@@ -581,8 +585,6 @@ show_set(int argc, char **argv)
 		}
 
 		CFRelease(services);
-
-		if (sorted != services) CFRelease(sorted);
 	}
 
 	if (_sc_debug) {