configd-204.tar.gz

[apple/configd.git] / configd.tproj / _notifycancel.c

diff --git a/configd.tproj/_notifycancel.c b/configd.tproj/_notifycancel.c
index bcf06d70b67383e62b824a4d351184c938922096..ba77aa02444dbebe5ed0d7ad4ec6266ad6c5f82b 100644 (file)
--- a/configd.tproj/_notifycancel.c
+++ b/configd.tproj/_notifycancel.c
@@ -1,22 +1,23 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000, 2001, 2003-2006 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
- *
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- *
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- *
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
  * @APPLE_LICENSE_HEADER_END@
  */
 
@@ -36,17 +37,12 @@
 #include "session.h"
 
 
+__private_extern__
 int
 __SCDynamicStoreNotifyCancel(SCDynamicStoreRef store)
 {
        SCDynamicStorePrivateRef        storePrivate = (SCDynamicStorePrivateRef)store;
 
-       SCLog(_configd_verbose, LOG_DEBUG, CFSTR("__SCDynamicStoreNotifyCancel:"));
-
-       if (!store) {
-               return kSCStatusNoStoreSession; /* you must have an open session to play */
-       }
-
        /*
         * cleanup any mach port based notifications.
         */
@@ -58,8 +54,8 @@ __SCDynamicStoreNotifyCancel(SCDynamicStoreRef store)
        /*
         * cleanup any file based notifications.
         */
-       if (storePrivate->notifyFile >= 0) {
-               SCLog(_configd_verbose, LOG_DEBUG, CFSTR("  closing (notification) fd %d"), storePrivate->notifyFile);
+       if (storePrivate->notifyFile != -1) {
+               // close (notification) fd
                (void) close(storePrivate->notifyFile);
                storePrivate->notifyFile = -1;
        }
@@ -94,19 +90,18 @@ __SCDynamicStoreNotifyCancel(SCDynamicStoreRef store)
 }
 
 
+__private_extern__
 kern_return_t
 _notifycancel(mach_port_t      server,
              int               *sc_status)
 {
        serverSessionRef        mySession = getSession(server);
 
-       SCLog(_configd_verbose, LOG_DEBUG, CFSTR("Cancel requested notifications."));
-       SCLog(_configd_verbose, LOG_DEBUG, CFSTR("  server = %d"), server);
-
-       *sc_status = __SCDynamicStoreNotifyCancel(mySession->store);
-       if (*sc_status != kSCStatusOK) {
-               SCLog(_configd_verbose, LOG_DEBUG, CFSTR("  __SCDynamicStoreNotifyCancel(): %s"), SCErrorString(*sc_status));
+       if (mySession == NULL) {
+               *sc_status = kSCStatusNoStoreSession;   /* you must have an open session to play */
+               return KERN_SUCCESS;
        }
 
+       *sc_status = __SCDynamicStoreNotifyCancel(mySession->store);
        return KERN_SUCCESS;
 }