From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Fri, 13 Nov 2015 19:49:10 +0000 (+0000)
Subject: Don't create the full name twice (<rdar://problem/23144358>)
X-Git-Tag: v2.2b1~153
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=28af862a1c19fb19b2813406ce12728a9f599cbb;p=thirdparty%2Fcups.git

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 568bb48c26..63211b5503 100644
--- 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 33a6f70d85..b46d8cf5f3 100644
--- 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);