configd-1061.40.2.tar.gz

[apple/configd.git] / SystemConfiguration.fproj / SCPreferencesPathKey.c

diff --git a/SystemConfiguration.fproj/SCPreferencesPathKey.c b/SystemConfiguration.fproj/SCPreferencesPathKey.c
index d3a738a3c8785ec79e441fc982e99dab4d5a0ffe..159b9ea332a53f5e26c60fc6e30c3e0bd26a936f 100644 (file)
--- a/SystemConfiguration.fproj/SCPreferencesPathKey.c
+++ b/SystemConfiguration.fproj/SCPreferencesPathKey.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2004, 2005 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2001, 2004, 2005, 2010, 2015 Apple Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
@@ -32,21 +32,26 @@
 
 #include <stdarg.h>
 
-__private_extern__ CFStringRef
+CFStringRef
 SCPreferencesPathKeyCreate(CFAllocatorRef      allocator,
                           CFStringRef          fmt,
                           ...)
 {
-       va_list args;
+       va_list         args;
+       CFStringRef     result;
+
        va_start(args, fmt);
-       return (CFStringCreateWithFormatAndArguments(allocator,
-                                                    NULL,
-                                                    fmt,
-                                                    args));
+       result = CFStringCreateWithFormatAndArguments(allocator,
+                                                     NULL,
+                                                     fmt,
+                                                     args);
+       va_end(args);
+
+       return result;
 }
 
 
-__private_extern__ CFStringRef
+CFStringRef
 SCPreferencesPathKeyCreateNetworkServices(CFAllocatorRef       allocator)
 {
        /*
@@ -59,7 +64,7 @@ SCPreferencesPathKeyCreateNetworkServices(CFAllocatorRef      allocator)
 }
 
 
-__private_extern__ CFStringRef
+CFStringRef
 SCPreferencesPathKeyCreateNetworkServiceEntity(CFAllocatorRef  allocator,
                                               CFStringRef      service,
                                               CFStringRef      entity)
@@ -91,7 +96,7 @@ SCPreferencesPathKeyCreateNetworkServiceEntity(CFAllocatorRef allocator,
 }
 
 
-__private_extern__ CFStringRef
+CFStringRef
 SCPreferencesPathKeyCreateSets(CFAllocatorRef  allocator)
 {
        /*
@@ -104,7 +109,7 @@ SCPreferencesPathKeyCreateSets(CFAllocatorRef       allocator)
 }
 
 
-__private_extern__ CFStringRef
+CFStringRef
 SCPreferencesPathKeyCreateSet(CFAllocatorRef   allocator,
                              CFStringRef       set)
 {
@@ -119,7 +124,7 @@ SCPreferencesPathKeyCreateSet(CFAllocatorRef        allocator,
 }
 
 
-__private_extern__ CFStringRef
+CFStringRef
 SCPreferencesPathKeyCreateSetNetworkGlobalEntity(CFAllocatorRef        allocator,
                                              CFStringRef       set,
                                              CFStringRef       entity)
@@ -138,7 +143,7 @@ SCPreferencesPathKeyCreateSetNetworkGlobalEntity(CFAllocatorRef     allocator,
 }
 
 
-__private_extern__ CFStringRef
+CFStringRef
 SCPreferencesPathKeyCreateSetNetworkInterfaceEntity(CFAllocatorRef     allocator,
                                                 CFStringRef    set,
                                                 CFStringRef    ifname,
@@ -147,6 +152,16 @@ SCPreferencesPathKeyCreateSetNetworkInterfaceEntity(CFAllocatorRef allocator,
        /*
         * create "/Sets/set-id/Network/Interface/interface-name/entity"
         */
+       if (entity == NULL) {
+               return CFStringCreateWithFormat(allocator,
+                                               NULL,
+                                               CFSTR("/%@/%@/%@/%@/%@"),
+                                               kSCPrefSets,
+                                               set,
+                                               kSCCompNetwork,
+                                               kSCCompInterface,
+                                               ifname);
+       }
        return CFStringCreateWithFormat(allocator,
                                        NULL,
                                        CFSTR("/%@/%@/%@/%@/%@/%@"),
@@ -159,7 +174,7 @@ SCPreferencesPathKeyCreateSetNetworkInterfaceEntity(CFAllocatorRef  allocator,
 }
 
 
-__private_extern__ CFStringRef
+CFStringRef
 SCPreferencesPathKeyCreateSetNetworkService(CFAllocatorRef     allocator,
                                            CFStringRef         set,
                                            CFStringRef         service)
@@ -195,7 +210,7 @@ SCPreferencesPathKeyCreateSetNetworkService(CFAllocatorRef  allocator,
 }
 
 
-__private_extern__ CFStringRef
+CFStringRef
 SCPreferencesPathKeyCreateSetNetworkServiceEntity(CFAllocatorRef       allocator,
                                                  CFStringRef           set,
                                                  CFStringRef           service,