diff options
| author | Wilco Dijkstra <wilco.dijkstra@arm.com> | 2023-02-03 12:01:33 +0000 |
|---|---|---|
| committer | Wilco Dijkstra <wilco.dijkstra@arm.com> | 2023-02-06 16:16:19 +0000 |
| commit | 32c7acd46401530fdbd4e98508c9baaa705f8b53 (patch) | |
| tree | 000fcd17f9b6ddbc14af397f33963e72a3c9d4bb /nis | |
| parent | d2d3f3720ce627a4fe154d8dd14db716a32bcc6e (diff) | |
| download | glibc-32c7acd46401530fdbd4e98508c9baaa705f8b53.tar.gz glibc-32c7acd46401530fdbd4e98508c9baaa705f8b53.tar.xz glibc-32c7acd46401530fdbd4e98508c9baaa705f8b53.zip | |
Replace rawmemchr (s, '\0') with strchr
Almost all uses of rawmemchr find the end of a string. Since most targets use a generic implementation, replacing it with strchr is better since that is optimized by compilers into strlen (s) + s. Also fix the generic rawmemchr implementation to use a cast to unsigned char in the if statement. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'nis')
| -rw-r--r-- | nis/nis_addmember.c | 2 | ||||
| -rw-r--r-- | nis/nis_call.c | 4 | ||||
| -rw-r--r-- | nis/nis_local_names.c | 4 | ||||
| -rw-r--r-- | nis/nis_removemember.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/nis/nis_addmember.c b/nis/nis_addmember.c index f7d7f16607..89e7affee1 100644 --- a/nis/nis_addmember.c +++ b/nis/nis_addmember.c @@ -32,7 +32,7 @@ nis_addmember (const_nis_name member, const_nis_name group) nis_error status; char *cp, *cp2; - cp = rawmemchr (nis_leaf_of_r (group, buf, sizeof (buf) - 1), '\0'); + cp = strchr (nis_leaf_of_r (group, buf, sizeof (buf) - 1), '\0'); cp = stpcpy (cp, ".groups_dir"); cp2 = nis_domain_of_r (group, domainbuf, sizeof (domainbuf) - 1); if (cp2 != NULL && cp2[0] != '\0') diff --git a/nis/nis_call.c b/nis/nis_call.c index ec19b21c53..75f2129c76 100644 --- a/nis/nis_call.c +++ b/nis/nis_call.c @@ -483,7 +483,7 @@ rec_dirsearch (const_nis_name name, directory_obj *dir, nis_error *status) } while (nis_dir_cmp (domain, dir->do_name) != SAME_NAME); - cp = rawmemchr (leaf, '\0'); + cp = strchr (leaf, '\0'); *cp++ = '.'; strcpy (cp, domain); @@ -614,7 +614,7 @@ nis_server_cache_search (const_nis_name name, int search_parent, if (ret == NULL) break; - addr = rawmemchr (nis_server_cache[i]->name, '\0') + 8; + addr = strchr (nis_server_cache[i]->name, '\0') + 8; addr = (char *) ((uintptr_t) addr & ~(uintptr_t) 7); xdrmem_create (&xdrs, addr, nis_server_cache[i]->size, XDR_DECODE); if (!_xdr_directory_obj (&xdrs, ret)) diff --git a/nis/nis_local_names.c b/nis/nis_local_names.c index 8fbe9ed80a..e685255300 100644 --- a/nis/nis_local_names.c +++ b/nis/nis_local_names.c @@ -63,7 +63,7 @@ nis_local_directory (void) __nisdomainname[0] = '\0'; else { - char *cp = rawmemchr (__nisdomainname, '\0'); + char *cp = strchr (__nisdomainname, '\0'); /* Missing trailing dot? */ if (cp[-1] != '.') @@ -154,7 +154,7 @@ nis_local_host (void) __nishostname[0] = '\0'; else { - char *cp = rawmemchr (__nishostname, '\0'); + char *cp = strchr (__nishostname, '\0'); int len = cp - __nishostname; /* Hostname already fully qualified? */ diff --git a/nis/nis_removemember.c b/nis/nis_removemember.c index 77702db30c..fbf9703b12 100644 --- a/nis/nis_removemember.c +++ b/nis/nis_removemember.c @@ -32,7 +32,7 @@ nis_removemember (const_nis_name member, const_nis_name group) nis_error status; char *cp, *cp2; - cp = rawmemchr (nis_leaf_of_r (group, buf, sizeof (buf) - 1), '\0'); + cp = strchr (nis_leaf_of_r (group, buf, sizeof (buf) - 1), '\0'); cp = stpcpy (cp, ".groups_dir"); cp2 = nis_domain_of_r (group, domainbuf, sizeof (domainbuf) - 1); if (cp2 != NULL && cp2[0] != '\0') |