Merge changes from CUPS 1.4svn-r7696.

[thirdparty/cups.git] / scheduler / dirsvc.c

diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
index 9b7b285c48c63b4141b776f8d17254370b8cab11..51509b850f7e42096b4d10250260341bb1c6b401 100644 (file)
--- a/scheduler/dirsvc.c
+++ b/scheduler/dirsvc.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: dirsvc.c 7003 2007-10-01 23:10:13Z mike $"
+ * "$Id: dirsvc.c 7676 2008-06-18 23:42:37Z mike $"
  *
  *   Directory services routines for the Common UNIX Printing System (CUPS).
  *
@@ -29,7 +29,6 @@
  *   cupsdStopBrowsing()        - Stop sending and receiving broadcast
  *                                information.
  *   cupsdStopPolling()         - Stop polling servers as needed.
- *   cupsdUpdateDNSSDBrowse()   - Handle DNS-SD queries.
  *   cupsdUpdateDNSSDName()     - Update the computer name we use for
  *                                browsing...
  *   cupsdUpdateLDAPBrowse()    - Scan for new printers via LDAP...
@@ -44,6 +43,7 @@
  *   dnssdRegisterCallback()    - DNSServiceRegister callback.
  *   dnssdRegisterPrinter()     - Start sending broadcast information for a
  *                                printer or update the broadcast contents.
+ *   dnssdUpdate()              - Handle DNS-SD queries.
  *   get_hostconfig()           - Get an /etc/hostconfig service setting.
  *   is_local_queue()           - Determine whether the URI points at a local
  *                                queue.
@@ -128,6 +128,7 @@ static void dnssdRegisterCallback(DNSServiceRef sdRef,
                                      const char *name, const char *regtype,
                                      const char *domain, void *context);
 static void    dnssdRegisterPrinter(cupsd_printer_t *p);
+static void    dnssdUpdate(void);
 #endif /* HAVE_DNSSD */
 
 #ifdef HAVE_OPENLDAP
@@ -1058,7 +1059,7 @@ cupsdStartBrowsing(void)
       */
 
       cupsdAddSelect(DNSServiceRefSockFD(DNSSDRef),
-                    (cupsd_selfunc_t)cupsdUpdateDNSSDBrowse, NULL, NULL);
+                    (cupsd_selfunc_t)dnssdUpdate, NULL, NULL);
 
      /*
       * Then get the port we use for registrations.  If we are not listening
@@ -1475,23 +1476,6 @@ cupsdStopPolling(void)
 
 
 #ifdef HAVE_DNSSD
-/*
- * 'cupsdUpdateDNSSDBrowse()' - Handle DNS-SD queries.
- */
-
-void
-cupsdUpdateDNSSDBrowse(void)
-{
-  DNSServiceErrorType  sdErr;          /* Service discovery error */
-
-
-  if ((sdErr = DNSServiceProcessResult(DNSSDRef)) != kDNSServiceErr_NoError)
-    cupsdLogMessage(CUPSD_LOG_ERROR,
-                    "DNS Service Discovery registration error %d!",
-                   sdErr);
-}
-
-
 /*
  * 'cupsdUpdateDNSSDName()' - Update the computer name we use for browsing...
  */
@@ -2308,6 +2292,23 @@ dnssdRegisterPrinter(cupsd_printer_t *p)/* I - Printer */
       free(printer_txt);
   }
 }
+
+
+/*
+ * 'dnssdUpdate()' - Handle DNS-SD queries.
+ */
+
+static void
+dnssdUpdate(void)
+{
+  DNSServiceErrorType  sdErr;          /* Service discovery error */
+
+
+  if ((sdErr = DNSServiceProcessResult(DNSSDRef)) != kDNSServiceErr_NoError)
+    cupsdLogMessage(CUPSD_LOG_ERROR,
+                    "DNS Service Discovery registration error %d!",
+                   sdErr);
+}
 #endif /* HAVE_DNSSD */
 
 
@@ -3324,7 +3325,7 @@ send_ldap_browse(cupsd_printer_t *p)      /* I - Printer to register */
                  NULL
                };
 
-  cupsdLogMessage(CUPSD_LOG_DEBUG2, "send_ldap_browse: %s\n", p->name);
+  cupsdLogMessage(CUPSD_LOG_DEBUG2, "send_ldap_browse: %s", p->name);
 
  /*
   * Everything in ldap is ** so we fudge around it...
@@ -4278,5 +4279,5 @@ update_smb(int onoff)                     /* I - 1 = turn on, 0 = turn off */
 
 
 /*
- * End of "$Id: dirsvc.c 7003 2007-10-01 23:10:13Z mike $".
+ * End of "$Id: dirsvc.c 7676 2008-06-18 23:42:37Z mike $".
  */