diff options
author | raf <none@none> | 2008-06-06 14:02:15 -0700 |
---|---|---|
committer | raf <none@none> | 2008-06-06 14:02:15 -0700 |
commit | 7257d1b4d25bfac0c802847390e98a464fd787ac (patch) | |
tree | c73fc17df920bc2ca9438c25fea3529890296afd /usr/src/lib/nsswitch/files/common | |
parent | 455903679f53d12d92035adc60bc7c3d95e6b6a2 (diff) | |
download | illumos-joyent-7257d1b4d25bfac0c802847390e98a464fd787ac.tar.gz |
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
Diffstat (limited to 'usr/src/lib/nsswitch/files/common')
-rw-r--r-- | usr/src/lib/nsswitch/files/common/files_common.h | 3 | ||||
-rw-r--r-- | usr/src/lib/nsswitch/files/common/gethostent.c | 26 |
2 files changed, 13 insertions, 16 deletions
diff --git a/usr/src/lib/nsswitch/files/common/files_common.h b/usr/src/lib/nsswitch/files/common/files_common.h index 9f7457a033..b526833022 100644 --- a/usr/src/lib/nsswitch/files/common/files_common.h +++ b/usr/src/lib/nsswitch/files/common/files_common.h @@ -20,7 +20,7 @@ */ /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -33,7 +33,6 @@ #pragma ident "%Z%%M% %I% %E% SMI" -#include "c_synonyms.h" #include <nss_common.h> #include <nss_dbdefs.h> #include <stdio.h> diff --git a/usr/src/lib/nsswitch/files/common/gethostent.c b/usr/src/lib/nsswitch/files/common/gethostent.c index f389a56885..c2d9530a86 100644 --- a/usr/src/lib/nsswitch/files/common/gethostent.c +++ b/usr/src/lib/nsswitch/files/common/gethostent.c @@ -18,11 +18,10 @@ * * CDDL HEADER END */ + /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. - * - * files/gethostent.c -- "files" backend for nsswitch "hosts" database */ #pragma ident "%Z%%M% %I% %E% SMI" @@ -77,13 +76,13 @@ check_name(nss_XbyY_args_t *argp, const char *line, int linelen, keyp = argp->key.name; *namep = linep; while (*keyp && linep < limit && !isspace(*linep) && - tolower(*keyp) == tolower(*linep)) { + tolower(*keyp) == tolower(*linep)) { keyp++; linep++; } if (*keyp == '\0' && (linep == limit || isspace(*linep))) { if (__nss_files_get_addr(type, addrstart, addrlen, - addrp, v6flag, addrsize)) { + addrp, v6flag, addrsize)) { *namelen = linep - *namep; return (1); } @@ -101,13 +100,13 @@ check_name(nss_XbyY_args_t *argp, const char *line, int linelen, /* compare name (case insensitive) */ keyp = argp->key.name; while (*keyp && linep < limit && !isspace(*linep) && - tolower(*keyp) == tolower(*linep)) { + tolower(*keyp) == tolower(*linep)) { keyp++; linep++; } if (*keyp == '\0' && (linep == limit || isspace(*linep))) return (__nss_files_get_addr(type, addrstart, addrlen, - addrp, v6flag, addrsize)); + addrp, v6flag, addrsize)); /* skip remainder of alias, if any */ while (linep < limit && !isspace(*linep)) @@ -157,7 +156,7 @@ __nss_files_get_addr(int af, const char *addrstart, int addrlen, return (0); } else { if ((addr_ipv4.s_addr = inet_addr(addrbuf)) == - 0xffffffffU) + 0xffffffffU) return (0); IN6_INADDR_TO_V4MAPPED(&addr_ipv4, addrpv6); } @@ -198,13 +197,13 @@ __nss_files_check_addr(int af, nss_XbyY_args_t *argp, const char *line, } addrlen = linep - addrstart; if (__nss_files_get_addr(af, addrstart, addrlen, h_addrp, - v6flag, &h_length) == 0) + v6flag, &h_length) == 0) return (0); /* Compare the address */ return (h_length == argp->key.hostaddr.len && - memcmp(h_addrp, argp->key.hostaddr.addr, - argp->key.hostaddr.len) == 0); + memcmp(h_addrp, argp->key.hostaddr.addr, + argp->key.hostaddr.len) == 0); } static int @@ -227,7 +226,6 @@ getbyaddr(be, a) return (res); } -int _inet_aton(const char *cp, struct in_addr *addr); /* * filter_ipv6 * @@ -261,7 +259,7 @@ filter_ipv6(char *instr, int lenstr) { /* extract IP address */ c = *p; *p = '\0'; - rc = _inet_aton(addrstart, &addr); + rc = inet_aton(addrstart, &addr); *p = c; if (rc == 0) @@ -299,7 +297,7 @@ getent_hosts(files_backend_ptr_t be, void *a) * These addresses have to be filtered. */ if (filter_ipv6(args->returnval, args->returnlen) - == NSS_STR_PARSE_SUCCESS) + == NSS_STR_PARSE_SUCCESS) break; /* * The entry is an IPv6 address or other errors. |