configd-1109.101.1.tar.gz

[apple/configd.git] / libSystemConfiguration / libSystemConfiguration_server.c

diff --git a/libSystemConfiguration/libSystemConfiguration_server.c b/libSystemConfiguration/libSystemConfiguration_server.c
index 38cc44fdd9ec902263eed9c786e303a876baf828..c193147a9d4b1cee2197639a1df805b9cd165fe8 100644 (file)
--- a/libSystemConfiguration/libSystemConfiguration_server.c
+++ b/libSystemConfiguration/libSystemConfiguration_server.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2015 Apple Inc. All rights reserved.
+ * Copyright (c) 2012-2018 Apple Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  *
@@ -21,9 +21,7 @@
  * @APPLE_LICENSE_HEADER_END@
  */
 
-#include <Availability.h>
 #include <TargetConditionals.h>
-#include <asl.h>
 #include <dispatch/dispatch.h>
 #include <vproc.h>
 #include <vproc_priv.h>
@@ -32,13 +30,14 @@
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <SystemConfiguration/SCPrivate.h>
-
 #include "libSystemConfiguration_server.h"
 
 #define kTrailingEdgeAgentEntitlement "com.apple.SystemConfiguration.trailing-edge-agent"
 
-#pragma mark -
-#pragma mark Support functions
+#ifdef SC_LOG_HANDLE
+#include <os/log.h>
+os_log_t       SC_LOG_HANDLE(void);
+#endif //SC_LOG_HANDLE
 
 
 #pragma mark -
@@ -113,7 +112,7 @@ _handle_entitlement_check_failure(pid_t pid)
 __private_extern__
 void
 _libSC_info_server_init(libSC_info_server_t *server_info) {
-       bzero(server_info, sizeof(*server_info));
+       memset(server_info, 0, sizeof(*server_info));
        server_info->info = CFDictionaryCreateMutable(NULL,
                                                      0,
                                                      &kCFTypeDictionaryKeyCallBacks,