OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.

	* 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.
This commit is contained in:
Wilco Dijkstra 2017-02-06 18:14:16 +00:00
parent 5a68e857bf
commit c7a37ad352
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2017-02-06 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.
2017-02-06 Joseph Myers <joseph@codesourcery.com> 2017-02-06 Joseph Myers <joseph@codesourcery.com>
* math/libm-test-driver.c: New file. Based on math/libm-test.inc. * math/libm-test-driver.c: New file. Based on math/libm-test.inc.

4
hurd/path-lookup.c
View File

@ -33,7 +33,7 @@ file_name_path_scan (const char *file_name, const char *path,
error_t (*fun)(const char *name), error_t (*fun)(const char *name),
char **prefixed_name) char **prefixed_name)
{ {
if (path == NULL || index (file_name, '/')) if (path == NULL || strchr (file_name, '/'))
{ {
if (prefixed_name) if (prefixed_name)
*prefixed_name = 0; *prefixed_name = 0;
@ -47,7 +47,7 @@ file_name_path_scan (const char *file_name, const char *path,
for (;;) for (;;)
{ {
error_t err; 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; size_t pfx_len = next - path;
char pfxed_name[pfx_len + 2 + file_name_len + 1]; char pfxed_name[pfx_len + 2 + file_name_len + 1];

9
include/string.h
View File

@ -160,15 +160,6 @@ extern __typeof (mempcpy) mempcpy __asm__ ("__mempcpy");
extern __typeof (stpcpy) stpcpy __asm__ ("__stpcpy"); extern __typeof (stpcpy) stpcpy __asm__ ("__stpcpy");
#endif #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, extern void *__memcpy_chk (void *__restrict __dest,
const void *__restrict __src, size_t __len, const void *__restrict __src, size_t __len,
size_t __destlen) __THROW; size_t __destlen) __THROW;

6
misc/getttyent.c
View File

@ -78,7 +78,7 @@ __getttyent (void)
return (NULL); return (NULL);
} }
/* skip lines that are too big */ /* skip lines that are too big */
if (!index(p, '\n')) { if (!strchr (p, '\n')) {
while ((c = getc_unlocked(tf)) != '\n' && c != EOF) while ((c = getc_unlocked(tf)) != '\n' && c != EOF)
; ;
continue; continue;
@ -127,7 +127,7 @@ __getttyent (void)
tty.ty_comment = p; tty.ty_comment = p;
if (*p == 0) if (*p == 0)
tty.ty_comment = 0; tty.ty_comment = 0;
if ((p = index(p, '\n'))) if ((p = strchr (p, '\n')))
*p = '\0'; *p = '\0';
return (&tty); return (&tty);
} }
@ -179,7 +179,7 @@ internal_function
value (char *p) value (char *p)
{ {
return ((p = index(p, '=')) ? ++p : NULL); return ((p = strchr (p, '=')) ? ++p : NULL);
} }
int int

2
misc/ttyslot.c
View File

@ -56,7 +56,7 @@ ttyslot (void)
__setttyent(); __setttyent();
for (cnt = 0; cnt < 3; ++cnt) for (cnt = 0; cnt < 3; ++cnt)
if (__ttyname_r (cnt, name, buflen) == 0) { if (__ttyname_r (cnt, name, buflen) == 0) {
if ((p = rindex(name, '/'))) if ((p = strrchr (name, '/')))
++p; ++p;
else else
p = name; p = name;

2
sunrpc/rpc_main.c
View File

@ -956,7 +956,7 @@ mkfile_output (struct commandline *cmd)
mkfilename = alloc (strlen ("Makefile.") + strlen (cmd->infile) + 1); mkfilename = alloc (strlen ("Makefile.") + strlen (cmd->infile) + 1);
if (mkfilename == NULL) if (mkfilename == NULL)
abort (); abort ();
temp = rindex (cmd->infile, '.'); temp = strrchr (cmd->infile, '.');
cp = stpcpy (mkfilename, "Makefile."); cp = stpcpy (mkfilename, "Makefile.");
if (temp != NULL) if (temp != NULL)
*((char *) stpncpy (cp, cmd->infile, temp - cmd->infile)) = '\0'; *((char *) stpncpy (cp, cmd->infile, temp - cmd->infile)) = '\0';