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 /iconvdata | |
| 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 'iconvdata')
| -rw-r--r-- | iconvdata/iso646.c | 2 | ||||
| -rw-r--r-- | iconvdata/utf-7.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/iconvdata/iso646.c b/iconvdata/iso646.c index e044ed2cba..f7111a3759 100644 --- a/iconvdata/iso646.c +++ b/iconvdata/iso646.c @@ -133,7 +133,7 @@ gconv_init (struct __gconv_step *step) enum variant var = 0; for (const char *name = names; *name != '\0'; - name = __rawmemchr (name, '\0') + 1) + name = strchr (name, '\0') + 1) { if (__strcasecmp (step->__from_name, name) == 0) { diff --git a/iconvdata/utf-7.c b/iconvdata/utf-7.c index 198ba99c2b..babeb56f4e 100644 --- a/iconvdata/utf-7.c +++ b/iconvdata/utf-7.c @@ -189,7 +189,7 @@ gconv_init (struct __gconv_step *step) enum variant var = 0; for (const char *name = names; *name != '\0'; - name = __rawmemchr (name, '\0') + 1) + name = strchr (name, '\0') + 1) { if (__strcasecmp (step->__from_name, name) == 0) { |