From ea650dfc5bf37fb36ff8d831a153ddc01a59adeb Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Thu, 10 Nov 2005 14:43:07 +0000 Subject: Use strchr instead of index (BSD) --- libc/misc/syslog/syslog.c | 2 +- libc/misc/ttyent/getttyent.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'libc') diff --git a/libc/misc/syslog/syslog.c b/libc/misc/syslog/syslog.c index 2b478e13d..704336006 100644 --- a/libc/misc/syslog/syslog.c +++ b/libc/misc/syslog/syslog.c @@ -254,7 +254,7 @@ vsyslog( int pri, const char *fmt, va_list ap ) /* should mode be `O_WRONLY | O_NOCTTY' ? -- Uli */ if (LogStat & LOG_CONS && (fd = open(_PATH_CONSOLE, O_WRONLY, 0)) >= 0) { - p = index(tbuf, '>') + 1; + p = strchr(tbuf, '>') + 1; last_chr[0] = '\r'; last_chr[1] = '\n'; (void)write(fd, p, last_chr - p + 2); diff --git a/libc/misc/ttyent/getttyent.c b/libc/misc/ttyent/getttyent.c index 6e2fbd2f4..d7d77c1ba 100644 --- a/libc/misc/ttyent/getttyent.c +++ b/libc/misc/ttyent/getttyent.c @@ -96,7 +96,7 @@ static char * skip(register char *p) static char * value(register char *p) { - return ((p = index(p, '=')) ? ++p : NULL); + return ((p = strchr(p, '=')) ? ++p : NULL); } struct ttyent * getttyent(void) @@ -122,7 +122,7 @@ struct ttyent * getttyent(void) return (NULL); } /* skip lines that are too big */ - if (!index(p, '\n')) { + if (!strchr(p, '\n')) { while ((c = getc_unlocked(tf)) != '\n' && c != EOF) ; continue; @@ -171,7 +171,7 @@ struct ttyent * getttyent(void) tty.ty_comment = p; if (*p == 0) tty.ty_comment = 0; - if ((p = index(p, '\n'))) + if ((p = strchr(p, '\n'))) *p = '\0'; return (&tty); } -- cgit v1.2.3