diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-11-18 03:14:53 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-11-18 03:14:53 +0000 |
| commit | f87c7bd4133a2b3ad9b45c32fab33d167a348c4b (patch) | |
| tree | 7259957b97704c375b3d8ab42f8da3d52665845e /libc/inet | |
| parent | 164a928b77f596b6617a4bbf43a2c06bc35a5602 (diff) | |
| download | uClibc-alpine-f87c7bd4133a2b3ad9b45c32fab33d167a348c4b.tar.bz2 uClibc-alpine-f87c7bd4133a2b3ad9b45c32fab33d167a348c4b.tar.xz | |
Massive merge from trunk.
Diffstat (limited to 'libc/inet')
| -rw-r--r-- | libc/inet/rpc/getrpcent.c | 20 | ||||
| -rw-r--r-- | libc/inet/rpc/rexec.c | 2 | ||||
| -rw-r--r-- | libc/inet/rpc/sa_len.c | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/libc/inet/rpc/getrpcent.c b/libc/inet/rpc/getrpcent.c index b796d856d..56fbbbe45 100644 --- a/libc/inet/rpc/getrpcent.c +++ b/libc/inet/rpc/getrpcent.c @@ -166,8 +166,8 @@ static char *firstwhite(char *s) { char *s1, *s2; - s1 = index(s, ' '); - s2 = index(s, '\t'); + s1 = strchr(s, ' '); + s2 = strchr(s, '\t'); if (s1) { if (s2) return (s1 < s2) ? s1 : s2; @@ -187,9 +187,9 @@ static struct rpcent *interpret(register struct rpcdata *d) d->line[strlen(p)-1] = '\n'; if (*p == '#') return __get_next_rpcent(d); - cp = index(p, '#'); + cp = strchr(p, '#'); if (cp == NULL) { - cp = index(p, '\n'); + cp = strchr(p, '\n'); if (cp == NULL) return __get_next_rpcent(d); } @@ -200,9 +200,9 @@ static struct rpcent *interpret(register struct rpcdata *d) else return __get_next_rpcent(d); #else - cp = index(p, ' '); + cp = strchr(p, ' '); if (cp == NULL) { - cp = index(p, '\t'); + cp = strchr(p, '\t'); if (cp == NULL) return __get_next_rpcent(d); } @@ -218,11 +218,11 @@ static struct rpcent *interpret(register struct rpcdata *d) if ((cp = firstwhite(cp))) *cp++ = '\0'; #else - cp = index(p, ' '); + cp = strchr(p, ' '); if (cp != NULL) *cp++ = '\0'; else { - cp = index(p, '\t'); + cp = strchr(p, '\t'); if (cp != NULL) *cp++ = '\0'; } @@ -238,11 +238,11 @@ static struct rpcent *interpret(register struct rpcdata *d) if ((cp = firstwhite(cp))) *cp++ = '\0'; #else - cp = index(p, ' '); + cp = strchr(p, ' '); if (cp != NULL) *cp++ = '\0'; else { - cp = index(p, '\t'); + cp = strchr(p, '\t'); if (cp != NULL) *cp++ = '\0'; } diff --git a/libc/inet/rpc/rexec.c b/libc/inet/rpc/rexec.c index 7af948991..2c280d922 100644 --- a/libc/inet/rpc/rexec.c +++ b/libc/inet/rpc/rexec.c @@ -43,7 +43,7 @@ #include <unistd.h> #define SA_LEN(_x) __libc_sa_len((_x)->sa_family) -extern int __libc_sa_len (sa_family_t __af) __THROW; +extern int __libc_sa_len (sa_family_t __af) __THROW attribute_hidden; int rexecoptions; char ahostbuf[NI_MAXHOST]; diff --git a/libc/inet/rpc/sa_len.c b/libc/inet/rpc/sa_len.c index 50b4a7b12..21a6417af 100644 --- a/libc/inet/rpc/sa_len.c +++ b/libc/inet/rpc/sa_len.c @@ -31,7 +31,7 @@ #include <netrose/rose.h> #endif -int __libc_sa_len (sa_family_t af) +int attribute_hidden __libc_sa_len (sa_family_t af) { switch (af) { |