[v2] Remove index defines
Commit Message
OK here is a new version that also removes index from hurd and sunrpc:
As a minor cleanup remove the (r)index defines from include/string.h as
they are only used internally in a few places. Rename all uses that
occur in GLIBC to str(r)chr.
ChangeLog:
2017-01-11 Wilco Dijkstra <wdijkstr@arm.com>
* hurd/path-lookup.c (file_name_path_scan): Rename index to strchr.
* include/string.h (index): Remove define.
(rindex): Likewise.
* misc/getttyent.c (__getttyent): Rename index to strchr.
* misc/ttyslot.c (ttyslot): Rename rindex to strrchr.
* sunrpc/rpc_main.c (mkfile_output): Likewise.
--
Comments
On Wed, 11 Jan 2017, Wilco Dijkstra wrote:
> OK here is a new version that also removes index from hurd and sunrpc:
>
> As a minor cleanup remove the (r)index defines from include/string.h as
> they are only used internally in a few places. Rename all uses that
> occur in GLIBC to str(r)chr.
>
> ChangeLog:
> 2017-01-11 Wilco Dijkstra <wdijkstr@arm.com>
>
> * hurd/path-lookup.c (file_name_path_scan): Rename index to strchr.
> * include/string.h (index): Remove define.
> (rindex): Likewise.
> * misc/getttyent.c (__getttyent): Rename index to strchr.
> * misc/ttyslot.c (ttyslot): Rename rindex to strrchr.
> * sunrpc/rpc_main.c (mkfile_output): Likewise.
OK for 2.26 (as it's not a bug fix I see no need for it during the
freeze).
@@ -33,7 +33,7 @@ file_name_path_scan (const char *file_name, const char *path,
error_t (*fun)(const char *name),
char **prefixed_name)
{
- if (path == NULL || index (file_name, '/'))
+ if (path == NULL || strchr (file_name, '/'))
{
if (prefixed_name)
*prefixed_name = 0;
@@ -47,7 +47,7 @@ file_name_path_scan (const char *file_name, const char *path,
for (;;)
{
error_t err;
- const char *next = index (path, ':') ?: path + strlen (path);
+ const char *next = strchr (path, ':') ?: path + strlen (path);
size_t pfx_len = next - path;
char pfxed_name[pfx_len + 2 + file_name_len + 1];
@@ -160,15 +160,6 @@ extern __typeof (mempcpy) mempcpy __asm__ ("__mempcpy");
extern __typeof (stpcpy) stpcpy __asm__ ("__stpcpy");
#endif
-# ifndef _ISOMAC
-# ifndef index
-# define index(s, c) (strchr ((s), (c)))
-# endif
-# ifndef rindex
-# define rindex(s, c) (strrchr ((s), (c)))
-# endif
-# endif
-
extern void *__memcpy_chk (void *__restrict __dest,
const void *__restrict __src, size_t __len,
size_t __destlen) __THROW;
@@ -78,7 +78,7 @@ __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;
@@ -127,7 +127,7 @@ __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);
}
@@ -179,7 +179,7 @@ internal_function
value (char *p)
{
- return ((p = index(p, '=')) ? ++p : NULL);
+ return ((p = strchr (p, '=')) ? ++p : NULL);
}
int
@@ -56,7 +56,7 @@ ttyslot (void)
__setttyent();
for (cnt = 0; cnt < 3; ++cnt)
if (__ttyname_r (cnt, name, buflen) == 0) {
- if ((p = rindex(name, '/')))
+ if ((p = strrchr (name, '/')))
++p;
else
p = name;
@@ -956,7 +956,7 @@ mkfile_output (struct commandline *cmd)
mkfilename = alloc (strlen ("Makefile.") + strlen (cmd->infile) + 1);
if (mkfilename == NULL)
abort ();
- temp = rindex (cmd->infile, '.');
+ temp = strrchr (cmd->infile, '.');
cp = stpcpy (mkfilename, "Makefile.");
if (temp != NULL)
*((char *) stpncpy (cp, cmd->infile, temp - cmd->infile)) = '\0';