unofficial mirror of libc-alpha@sourceware.org
 help / color / mirror / Atom feed
* [PATCH v2] <stdio.h>: Make fopencookie, vasprintf, asprintf available by default
@ 2022-11-24 15:49 Florian Weimer via Libc-alpha
  2022-12-08 17:08 ` Adhemerval Zanella Netto via Libc-alpha
  0 siblings, 1 reply; 3+ messages in thread
From: Florian Weimer via Libc-alpha @ 2022-11-24 15:49 UTC (permalink / raw)
  To: libc-alpha

FreeBSD makes these functions available by default, so we should
not treat them as GNU-specific and restrict them to _GNU_SOURCE.

---
v2: Do not include fcloseall because it's broken.

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

diff --git a/libio/stdio.h b/libio/stdio.h
index 0e0f16b464..10af6d9b60 100644
--- a/libio/stdio.h
+++ b/libio/stdio.h
@@ -42,7 +42,7 @@ __BEGIN_DECLS
 #include <bits/types/FILE.h>
 #include <bits/types/struct_FILE.h>
 
-#ifdef __USE_GNU
+#ifdef __USE_MISC
 # include <bits/types/cookie_io_functions_t.h>
 #endif
 
@@ -294,7 +294,7 @@ extern FILE *fdopen (int __fd, const char *__modes) __THROW
   __attribute_malloc__ __attr_dealloc_fclose __wur;
 #endif
 
-#ifdef	__USE_GNU
+#ifdef	__USE_MISC
 /* Create a new stream that refers to the given magic cookie,
    and uses the given functions for input and output.  */
 extern FILE *fopencookie (void *__restrict __magic_cookie,
@@ -384,7 +384,7 @@ extern int vsnprintf (char *__restrict __s, size_t __maxlen,
      __THROWNL __attribute__ ((__format__ (__printf__, 3, 0)));
 #endif
 
-#if __GLIBC_USE (LIB_EXT2)
+#if defined (__USE_MISC) || __GLIBC_USE (LIB_EXT2)
 /* Write formatted output to a string dynamically allocated with `malloc'.
    Store the address of the string in *PTR.  */
 extern int vasprintf (char **__restrict __ptr, const char *__restrict __f,

base-commit: 5bb4b51a76cc9bec72f67f702b5bf2fce30f0f7c


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH v2] <stdio.h>: Make fopencookie, vasprintf, asprintf available by default
  2022-11-24 15:49 [PATCH v2] <stdio.h>: Make fopencookie, vasprintf, asprintf available by default Florian Weimer via Libc-alpha
@ 2022-12-08 17:08 ` Adhemerval Zanella Netto via Libc-alpha
  2023-04-06 15:04   ` Florian Weimer via Libc-alpha
  0 siblings, 1 reply; 3+ messages in thread
From: Adhemerval Zanella Netto via Libc-alpha @ 2022-12-08 17:08 UTC (permalink / raw)
  To: Florian Weimer, libc-alpha



On 24/11/22 12:49, Florian Weimer via Libc-alpha wrote:
> FreeBSD makes these functions available by default, so we should
> not treat them as GNU-specific and restrict them to _GNU_SOURCE.
> 


LGTM, thanks.

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

> ---
> v2: Do not include fcloseall because it's broken.
> 
>  libio/stdio.h | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/libio/stdio.h b/libio/stdio.h
> index 0e0f16b464..10af6d9b60 100644
> --- a/libio/stdio.h
> +++ b/libio/stdio.h
> @@ -42,7 +42,7 @@ __BEGIN_DECLS
>  #include <bits/types/FILE.h>
>  #include <bits/types/struct_FILE.h>
>  
> -#ifdef __USE_GNU
> +#ifdef __USE_MISC
>  # include <bits/types/cookie_io_functions_t.h>
>  #endif
>  
> @@ -294,7 +294,7 @@ extern FILE *fdopen (int __fd, const char *__modes) __THROW
>    __attribute_malloc__ __attr_dealloc_fclose __wur;
>  #endif
>  
> -#ifdef	__USE_GNU
> +#ifdef	__USE_MISC
>  /* Create a new stream that refers to the given magic cookie,
>     and uses the given functions for input and output.  */
>  extern FILE *fopencookie (void *__restrict __magic_cookie,
> @@ -384,7 +384,7 @@ extern int vsnprintf (char *__restrict __s, size_t __maxlen,
>       __THROWNL __attribute__ ((__format__ (__printf__, 3, 0)));
>  #endif
>  
> -#if __GLIBC_USE (LIB_EXT2)
> +#if defined (__USE_MISC) || __GLIBC_USE (LIB_EXT2)
>  /* Write formatted output to a string dynamically allocated with `malloc'.
>     Store the address of the string in *PTR.  */
>  extern int vasprintf (char **__restrict __ptr, const char *__restrict __f,
> 
> base-commit: 5bb4b51a76cc9bec72f67f702b5bf2fce30f0f7c
> 

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH v2] <stdio.h>: Make fopencookie, vasprintf, asprintf available by default
  2022-12-08 17:08 ` Adhemerval Zanella Netto via Libc-alpha
@ 2023-04-06 15:04   ` Florian Weimer via Libc-alpha
  0 siblings, 0 replies; 3+ messages in thread
From: Florian Weimer via Libc-alpha @ 2023-04-06 15:04 UTC (permalink / raw)
  To: Adhemerval Zanella Netto; +Cc: libc-alpha

* Adhemerval Zanella Netto:

> On 24/11/22 12:49, Florian Weimer via Libc-alpha wrote:
>> FreeBSD makes these functions available by default, so we should
>> not treat them as GNU-specific and restrict them to _GNU_SOURCE.
>> 
>
>
> LGTM, thanks.
>
> Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>

Thanks.  Pushed after retesting.

Florian


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2023-04-06 15:04 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-24 15:49 [PATCH v2] <stdio.h>: Make fopencookie, vasprintf, asprintf available by default Florian Weimer via Libc-alpha
2022-12-08 17:08 ` Adhemerval Zanella Netto via Libc-alpha
2023-04-06 15:04   ` Florian Weimer via Libc-alpha

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).