From 7257d1b4d25bfac0c802847390e98a464fd787ac Mon Sep 17 00:00:00 2001 From: raf Date: Fri, 6 Jun 2008 14:02:15 -0700 Subject: PSARC 2008/309 expunge synonyms.h 6700179 expunge synonyms.h --HG-- rename : usr/src/cmd/sgs/libelf/common/syn.h => deleted_files/usr/src/cmd/sgs/libelf/common/syn.h rename : usr/src/cmd/sgs/librtld/common/lintsup.c => deleted_files/usr/src/cmd/sgs/librtld/common/lintsup.c rename : usr/src/cmd/sgs/rtld/common/_synonyms.h => deleted_files/usr/src/cmd/sgs/rtld/common/_synonyms.h rename : usr/src/common/atomic/atomic_asm_weak.h => deleted_files/usr/src/common/atomic/atomic_asm_weak.h rename : usr/src/lib/common/inc/c_synonyms.h => deleted_files/usr/src/lib/common/inc/c_synonyms.h rename : usr/src/lib/libc/amd64/gen/lexp10.c => deleted_files/usr/src/lib/libc/amd64/gen/lexp10.c rename : usr/src/lib/libc/amd64/gen/llog10.c => deleted_files/usr/src/lib/libc/amd64/gen/llog10.c rename : usr/src/lib/libc/amd64/gen/ltostr.c => deleted_files/usr/src/lib/libc/amd64/gen/ltostr.c rename : usr/src/lib/libc/i386/gen/lexp10.c => deleted_files/usr/src/lib/libc/i386/gen/lexp10.c rename : usr/src/lib/libc/i386/gen/llog10.c => deleted_files/usr/src/lib/libc/i386/gen/llog10.c rename : usr/src/lib/libc/i386/gen/ltostr.c => deleted_files/usr/src/lib/libc/i386/gen/ltostr.c rename : usr/src/lib/libc/inc/synonyms.h => deleted_files/usr/src/lib/libc/inc/synonyms.h rename : usr/src/lib/libc/sparcv9/gen/lexp10.c => deleted_files/usr/src/lib/libc/sparcv9/gen/lexp10.c rename : usr/src/lib/libc/sparcv9/gen/llog10.c => deleted_files/usr/src/lib/libc/sparcv9/gen/llog10.c rename : usr/src/lib/libc_psr/inc.flg => deleted_files/usr/src/lib/libc_psr/inc.flg rename : usr/src/lib/libcrypt/inc/des_synonyms.h => deleted_files/usr/src/lib/libcrypt/inc/des_synonyms.h rename : usr/src/lib/libgen/inc/gen_synonyms.h => deleted_files/usr/src/lib/libgen/inc/gen_synonyms.h rename : usr/src/lib/libtsnet/common/synonyms.h => deleted_files/usr/src/lib/libtsnet/common/synonyms.h rename : usr/src/tools/scripts/check_fnames.sh => deleted_files/usr/src/tools/scripts/check_fnames.sh rename : usr/src/lib/libc/sparc/gen/lexp10.c => usr/src/lib/libc/port/gen/lexp10.c rename : usr/src/lib/libc/sparc/gen/llog10.c => usr/src/lib/libc/port/gen/llog10.c --- usr/src/lib/libsocket/inet/ether_addr.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'usr/src/lib/libsocket/inet/ether_addr.c') diff --git a/usr/src/lib/libsocket/inet/ether_addr.c b/usr/src/lib/libsocket/inet/ether_addr.c index 12c7a06f70..37105bb302 100644 --- a/usr/src/lib/libsocket/inet/ether_addr.c +++ b/usr/src/lib/libsocket/inet/ether_addr.c @@ -20,7 +20,7 @@ */ /* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -47,7 +47,6 @@ * bytes are always in network order. */ -#include "c_synonyms.h" #include #include #include @@ -92,7 +91,7 @@ ether_hostton( NSS_XbyY_INIT(&arg, e, NULL, 0, str2ether); arg.key.name = host; res = nss_search(&db_root, _nss_initf_ethers, - NSS_DBOP_ETHERS_HOSTTON, &arg); + NSS_DBOP_ETHERS_HOSTTON, &arg); (void) NSS_XbyY_FINI(&arg); return (arg.status = res); } @@ -117,7 +116,7 @@ ether_ntohost( NSS_XbyY_INIT(&arg, NULL, host, 0, str2ether); arg.key.ether = (void *)e; res = nss_search(&db_root, _nss_initf_ethers, - NSS_DBOP_ETHERS_NTOHOST, &arg); + NSS_DBOP_ETHERS_NTOHOST, &arg); /* memcpy(host, ether_res.host, strlen(ether_res.host)); */ (void) NSS_XbyY_FINI(&arg); return (arg.status = res); @@ -294,7 +293,7 @@ ether_aton(const char *s) i = sscanf(s, " %x:%x:%x:%x:%x:%x", &t[0], &t[1], &t[2], &t[3], &t[4], &t[5]); if (i != 6) - return (NULL); + return (NULL); for (i = 0; i < 6; i++) e->ether_addr_octet[i] = (uchar_t)t[i]; return (e); -- cgit v1.2.3