diff options
author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2015-11-13 19:49:10 +0000 |
---|---|---|
committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2015-11-13 19:49:10 +0000 |
commit | 28af862a1c19fb19b2813406ce12728a9f599cbb (patch) | |
tree | fd71eea870e7499e083a5bc70ce4141053a090d5 /backend/dnssd.c | |
parent | be939dc257eb9680b39d25101e55cc31a17d74e9 (diff) | |
download | cups-28af862a1c19fb19b2813406ce12728a9f599cbb.tar.gz |
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
Diffstat (limited to 'backend/dnssd.c')
-rw-r--r-- | backend/dnssd.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/backend/dnssd.c b/backend/dnssd.c index 33a6f70d8..b46d8cf5f 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); |