diff mbox series

<string.h>: Make strchrnul, strcasestr, memmem available by default

Message ID 87h6yo4e3v.fsf@oldenburg.str.redhat.com
State Committed
Commit 30e3ca78f92be44f46851557f54b47e789bd3416
Headers
Series <string.h>: Make strchrnul, strcasestr, memmem available by default |

Checks

Context Check Description
dj/TryBot-apply_patch success Patch applied to master at the time it was sent
dj/TryBot-32bit success Build for i686

Commit Message

Florian Weimer Nov. 24, 2022, 2:32 p.m. UTC 
  FreeBSD makes them available by default, too, so there does not seem
to be a reason to restrict these functions to _GNU_SOURCE.

Tested on x86_64-linux-gnu.

---
 string/string.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


base-commit: a46956e65d037358161e7512a9f0fd408ea1333a

Comments

Adhemerval Zanella Dec. 8, 2022, 5:07 p.m. UTC | #1 
On 24/11/22 11:32, Florian Weimer via Libc-alpha wrote:
> FreeBSD makes them available by default, too, so there does not seem
> to be a reason to restrict these functions to _GNU_SOURCE.
> 
> Tested on x86_64-linux-gnu.

LGTM, thanks.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>

> 
> ---
>  string/string.h | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/string/string.h b/string/string.h
> index 54dd8344de..bfeeeb2eb4 100644
> --- a/string/string.h
> +++ b/string/string.h
> @@ -274,7 +274,7 @@ extern char *strrchr (const char *__s, int __c)
>       __THROW __attribute_pure__ __nonnull ((1));
>  #endif
>  
> -#ifdef __USE_GNU
> +#ifdef __USE_MISC
>  /* This function is similar to `strchr'.  But it returns a pointer to
>     the closing NUL byte in case C is not found in S.  */
>  # ifdef __CORRECT_ISO_CPP_STRING_H_PROTO
> @@ -368,7 +368,7 @@ extern char *strtok_r (char *__restrict __s, const char *__restrict __delim,
>       __THROW __nonnull ((2, 3));
>  #endif
>  
> -#ifdef __USE_GNU
> +#ifdef __USE_MISC
>  /* Similar to `strstr' but this function ignores the case of both strings.  */
>  # ifdef __CORRECT_ISO_CPP_STRING_H_PROTO
>  extern "C++" char *strcasestr (char *__haystack, const char *__needle)
> @@ -382,7 +382,7 @@ extern char *strcasestr (const char *__haystack, const char *__needle)
>  # endif
>  #endif
>  
> -#ifdef __USE_GNU
> +#ifdef __USE_MISC
>  /* Find the first occurrence of NEEDLE in HAYSTACK.
>     NEEDLE is NEEDLELEN bytes long;
>     HAYSTACK is HAYSTACKLEN bytes long.  */
> 
> base-commit: a46956e65d037358161e7512a9f0fd408ea1333a
>
Florian Weimer April 6, 2023, 3:04 p.m. UTC | #2 
* Adhemerval Zanella Netto:

> On 24/11/22 11:32, Florian Weimer via Libc-alpha wrote:
>> FreeBSD makes them available by default, too, so there does not seem
>> to be a reason to restrict these functions to _GNU_SOURCE.
>> 
>> Tested on x86_64-linux-gnu.
>
> LGTM, thanks.
>
> Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>

Thanks, finally pushed this after re-testing.

Florian
diff mbox series

Patch

diff --git a/string/string.h b/string/string.h
index 54dd8344de..bfeeeb2eb4 100644
--- a/string/string.h
+++ b/string/string.h
@@ -274,7 +274,7 @@  extern char *strrchr (const char *__s, int __c)
      __THROW __attribute_pure__ __nonnull ((1));
 #endif
 
-#ifdef __USE_GNU
+#ifdef __USE_MISC
 /* This function is similar to `strchr'.  But it returns a pointer to
    the closing NUL byte in case C is not found in S.  */
 # ifdef __CORRECT_ISO_CPP_STRING_H_PROTO
@@ -368,7 +368,7 @@  extern char *strtok_r (char *__restrict __s, const char *__restrict __delim,
      __THROW __nonnull ((2, 3));
 #endif
 
-#ifdef __USE_GNU
+#ifdef __USE_MISC
 /* Similar to `strstr' but this function ignores the case of both strings.  */
 # ifdef __CORRECT_ISO_CPP_STRING_H_PROTO
 extern "C++" char *strcasestr (char *__haystack, const char *__needle)
@@ -382,7 +382,7 @@  extern char *strcasestr (const char *__haystack, const char *__needle)
 # endif
 #endif
 
-#ifdef __USE_GNU
+#ifdef __USE_MISC
 /* Find the first occurrence of NEEDLE in HAYSTACK.
    NEEDLE is NEEDLELEN bytes long;
    HAYSTACK is HAYSTACKLEN bytes long.  */