* [PATCH] stdlib: Reduce namespace pollution in <inttypes.h>
@ 2020-02-17 10:56 Florian Weimer
2020-02-17 11:54 ` Andreas Schwab
0 siblings, 1 reply; 4+ messages in thread
From: Florian Weimer @ 2020-02-17 10:56 UTC (permalink / raw)
To: libc-alpha
This results in conform test failures if the tests are run
__USE_EXTERN_INLINES defined (e.g., when configuring with CC="gcc -O3"
CXX="g++ -O3").
-----
stdlib/inttypes.h | 48 ++++++++++++++++++++++++------------------------
1 file changed, 24 insertions(+), 24 deletions(-)
diff --git a/stdlib/inttypes.h b/stdlib/inttypes.h
index 685dfc1360..611a8b56c3 100644
--- a/stdlib/inttypes.h
+++ b/stdlib/inttypes.h
@@ -321,10 +321,10 @@ extern long int __strtol_internal (const char *__restrict __nptr,
__THROW __nonnull ((1)) __wur;
/* Like `strtol' but convert to `intmax_t'. */
__extern_inline intmax_t
-__NTH (strtoimax (const char *__restrict nptr, char **__restrict endptr,
- int base))
+__NTH (strtoimax (const char *__restrict __nptr, char **__restrict __endptr,
+ int __base))
{
- return __strtol_internal (nptr, endptr, base, 0);
+ return __strtol_internal (__nptr, __endptr, __base, 0);
}
extern unsigned long int __strtoul_internal (const char *__restrict __nptr,
@@ -333,10 +333,10 @@ extern unsigned long int __strtoul_internal (const char *__restrict __nptr,
__THROW __nonnull ((1)) __wur;
/* Like `strtoul' but convert to `uintmax_t'. */
__extern_inline uintmax_t
-__NTH (strtoumax (const char *__restrict nptr, char **__restrict endptr,
- int base))
+__NTH (strtoumax (const char *__restrict __nptr, char **__restrict __endptr,
+ int __base))
{
- return __strtoul_internal (nptr, endptr, base, 0);
+ return __strtoul_internal (__nptr, __endptr, __base, 0);
}
extern long int __wcstol_internal (const __gwchar_t * __restrict __nptr,
@@ -345,10 +345,10 @@ extern long int __wcstol_internal (const __gwchar_t * __restrict __nptr,
__THROW __nonnull ((1)) __wur;
/* Like `wcstol' but convert to `intmax_t'. */
__extern_inline intmax_t
-__NTH (wcstoimax (const __gwchar_t *__restrict nptr,
- __gwchar_t **__restrict endptr, int base))
+__NTH (wcstoimax (const __gwchar_t *__restrict __nptr,
+ __gwchar_t **__restrict __endptr, int __base))
{
- return __wcstol_internal (nptr, endptr, base, 0);
+ return __wcstol_internal (__nptr, __endptr, __base, 0);
}
extern unsigned long int __wcstoul_internal (const __gwchar_t *
@@ -359,10 +359,10 @@ extern unsigned long int __wcstoul_internal (const __gwchar_t *
__THROW __nonnull ((1)) __wur;
/* Like `wcstoul' but convert to `uintmax_t'. */
__extern_inline uintmax_t
-__NTH (wcstoumax (const __gwchar_t *__restrict nptr,
- __gwchar_t **__restrict endptr, int base))
+__NTH (wcstoumax (const __gwchar_t *__restrict __nptr,
+ __gwchar_t **__restrict __endptr, int __base))
{
- return __wcstoul_internal (nptr, endptr, base, 0);
+ return __wcstoul_internal (__nptr, __endptr, __base, 0);
}
# else /* __WORDSIZE == 32 */
@@ -374,10 +374,10 @@ extern long long int __strtoll_internal (const char *__restrict __nptr,
__THROW __nonnull ((1)) __wur;
/* Like `strtol' but convert to `intmax_t'. */
__extern_inline intmax_t
-__NTH (strtoimax (const char *__restrict nptr, char **__restrict endptr,
- int base))
+__NTH (strtoimax (const char *__restrict __nptr, char **__restrict __endptr,
+ int __base))
{
- return __strtoll_internal (nptr, endptr, base, 0);
+ return __strtoll_internal (__nptr, __endptr, __base, 0);
}
__extension__
@@ -390,10 +390,10 @@ extern unsigned long long int __strtoull_internal (const char *
__THROW __nonnull ((1)) __wur;
/* Like `strtoul' but convert to `uintmax_t'. */
__extern_inline uintmax_t
-__NTH (strtoumax (const char *__restrict nptr, char **__restrict endptr,
- int base))
+__NTH (strtoumax (const char *__restrict __nptr, char **__restrict __endptr,
+ int __base))
{
- return __strtoull_internal (nptr, endptr, base, 0);
+ return __strtoull_internal (__nptr, __endptr, __base, 0);
}
__extension__
@@ -403,10 +403,10 @@ extern long long int __wcstoll_internal (const __gwchar_t *__restrict __nptr,
__THROW __nonnull ((1)) __wur;
/* Like `wcstol' but convert to `intmax_t'. */
__extern_inline intmax_t
-__NTH (wcstoimax (const __gwchar_t *__restrict nptr,
- __gwchar_t **__restrict endptr, int base))
+__NTH (wcstoimax (const __gwchar_t *__restrict __nptr,
+ __gwchar_t **__restrict __endptr, int __base))
{
- return __wcstoll_internal (nptr, endptr, base, 0);
+ return __wcstoll_internal (__nptr, __endptr, __base, 0);
}
@@ -420,10 +420,10 @@ extern unsigned long long int __wcstoull_internal (const __gwchar_t *
__THROW __nonnull ((1)) __wur;
/* Like `wcstoul' but convert to `uintmax_t'. */
__extern_inline uintmax_t
-__NTH (wcstoumax (const __gwchar_t *__restrict nptr,
- __gwchar_t **__restrict endptr, int base))
+__NTH (wcstoumax (const __gwchar_t *__restrict __nptr,
+ __gwchar_t **__restrict __endptr, int __base))
{
- return __wcstoull_internal (nptr, endptr, base, 0);
+ return __wcstoull_internal (__nptr, __endptr, __base, 0);
}
# endif /* __WORDSIZE == 32 */
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] stdlib: Reduce namespace pollution in <inttypes.h>
2020-02-17 10:56 [PATCH] stdlib: Reduce namespace pollution in <inttypes.h> Florian Weimer
@ 2020-02-17 11:54 ` Andreas Schwab
2020-02-17 11:56 ` Florian Weimer
0 siblings, 1 reply; 4+ messages in thread
From: Andreas Schwab @ 2020-02-17 11:54 UTC (permalink / raw)
To: Florian Weimer; +Cc: libc-alpha
On Feb 17 2020, Florian Weimer wrote:
> This results in conform test failures if the tests are run
Did you mean "This fixes"?
Andreas.
--
Andreas Schwab, SUSE Labs, schwab@suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] stdlib: Reduce namespace pollution in <inttypes.h>
2020-02-17 11:54 ` Andreas Schwab
@ 2020-02-17 11:56 ` Florian Weimer
2020-02-17 18:35 ` Paul Eggert
0 siblings, 1 reply; 4+ messages in thread
From: Florian Weimer @ 2020-02-17 11:56 UTC (permalink / raw)
To: Andreas Schwab; +Cc: libc-alpha
* Andreas Schwab:
> On Feb 17 2020, Florian Weimer wrote:
>
>> This results in conform test failures if the tests are run
>
> Did you mean "This fixes"?
Yes, the namespace pollution results in test failures, and this patch
fixes them.
Thanks,
Florian
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] stdlib: Reduce namespace pollution in <inttypes.h>
2020-02-17 11:56 ` Florian Weimer
@ 2020-02-17 18:35 ` Paul Eggert
0 siblings, 0 replies; 4+ messages in thread
From: Paul Eggert @ 2020-02-17 18:35 UTC (permalink / raw)
To: Florian Weimer, Andreas Schwab; +Cc: libc-alpha
On 2/17/20 3:56 AM, Florian Weimer wrote:
> the namespace pollution results in test failures, and this patch
> fixes them.
This obvious patch looks good, with the commit-message fix Andreas suggested.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-02-17 18:35 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-17 10:56 [PATCH] stdlib: Reduce namespace pollution in <inttypes.h> Florian Weimer
2020-02-17 11:54 ` Andreas Schwab
2020-02-17 11:56 ` Florian Weimer
2020-02-17 18:35 ` Paul Eggert
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).