Don't create the full name twice (<rdar://problem/23144358>)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12967 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/CHANGES-2.1.txt b/CHANGES-2.1.txt
index 568bb48c263451c8e3a68e4b6baac93ec367e04f..63211b5503ab53531e2a3f32d38e8d27d2934918 100644 (file)
--- a/CHANGES-2.1.txt
+++ b/CHANGES-2.1.txt
@@ -12,7 +12,7 @@ CHANGES IN CUPS V2.1.1
          <rdar://problem/23134356>, <rdar://problem/23134415>,
          <rdar://problem/23134506>, <rdar://problem/23135066>,
          <rdar://problem/23135122>, <rdar://problem/23135207>,
-         <rdar://problem/23144290>)
+         <rdar://problem/23144290>, <rdar://problem/23144358>)
        - The cupsGetPPD* functions did not work with IPP printers (STR #4725)
        - Some older HP LaserJet printers need a delayed close when printing
          using the libusb-based USB backend (STR #4549)

diff --git a/backend/dnssd.c b/backend/dnssd.c
index 33a6f70d85217d60ce40b9be1e0b74d764c867c8..b46d8cf5f39b49e115b86a90b71ca959b3c5be14 100644 (file)
--- a/backend/dnssd.c
+++ b/backend/dnssd.c
@@ -921,13 +921,6 @@ get_device(cups_array_t *devices,  /* I - Device array */
   * Yes, add the device...
   */
 
-#ifdef HAVE_DNSSD
-  DNSServiceConstructFullName(fullName, serviceName, regtype, replyDomain);
-#else /* HAVE_AVAHI */
-  avahi_service_name_join(fullName, kDNSServiceMaxDomainName,
-                          serviceName, regtype, replyDomain);
-#endif /* HAVE_DNSSD */
-
   device           = calloc(sizeof(cups_device_t), 1);
   device->name     = strdup(serviceName);
   device->domain   = strdup(replyDomain);
@@ -943,8 +936,7 @@ get_device(cups_array_t *devices,   /* I - Device array */
 #ifdef HAVE_DNSSD
   DNSServiceConstructFullName(fullName, serviceName, regtype, replyDomain);
 #else /* HAVE_AVAHI */
-  avahi_service_name_join(fullName, kDNSServiceMaxDomainName,
-                          serviceName, regtype, replyDomain);
+  avahi_service_name_join(fullName, kDNSServiceMaxDomainName, serviceName, regtype, replyDomain);
 #endif /* HAVE_DNSSD */
 
   device->fullName = strdup(fullName);