From 4531edcf0558c5901c1b2782e3f3ab6ca48231f2 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 15 Sep 2024 21:20:15 -0700 Subject: [PATCH] Port July changes for [[...]] to C17 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The July 30 changes to _GL_FUNCDECL_RPL etc. to support use of attributes in bracket syntax used a C23 preprocessor feature that is a common extension to C17 and earlier, but which doesn’t work when compiled with stricter C17-and-earlier compilers. The feature is using ‘#define f(a, ...) b’ and calling ‘f’ with only one arg. Port back to C17 and earlier. Problem discovered with IBM XL C/C++ for AIX, V12.1 (5765-J02, 5725-C72) on cfarm111. * lib/c++defs.h (_GL_FUNCDECL_RPL): Turn this into two macros _GL_FUNCDECL_RPL and _GL_FUNCATTR_RPL. The first macro is for functions without attributes, the second one for functions with attributes. All uses changed. (_GL_FUNCDECL_SYS): Likewise, turn this into _GL_FUNCDECL_SYS and _GL_FUNCATTR_SYS. --- ChangeLog | 18 +++++ lib/arpa_inet.in.h | 8 +- lib/c++defs.h | 41 ++++++---- lib/dirent.in.h | 32 ++++---- lib/error.in.h | 8 +- lib/fcntl.in.h | 8 +- lib/fnmatch.in.h | 4 +- lib/glob.in.h | 12 +-- lib/iconv.in.h | 2 +- lib/inttypes.in.h | 8 +- lib/locale.in.h | 6 +- lib/malloc.in.h | 10 +-- lib/math.in.h | 20 ++--- lib/mntent.in.h | 4 +- lib/monetary.in.h | 2 +- lib/netdb.in.h | 10 +-- lib/pthread.in.h | 176 +++++++++++++++++++++--------------------- lib/search.in.h | 16 ++-- lib/signal.in.h | 12 +-- lib/spawn.in.h | 92 +++++++++++----------- lib/stdio.in.h | 176 +++++++++++++++++++++--------------------- lib/stdlib.in.h | 170 ++++++++++++++++++++-------------------- lib/string.in.h | 96 +++++++++++------------ lib/sys_random.in.h | 4 +- lib/sys_resource.in.h | 2 +- lib/sys_socket.in.h | 20 ++--- lib/sys_stat.in.h | 40 +++++----- lib/sys_time.in.h | 4 +- lib/threads.in.h | 72 ++++++++--------- lib/time.in.h | 44 +++++------ lib/uchar.in.h | 24 +++--- lib/unistd.in.h | 136 ++++++++++++++++---------------- lib/utime.in.h | 4 +- lib/wchar.in.h | 76 +++++++++--------- lib/wctype.in.h | 8 +- 35 files changed, 696 insertions(+), 669 deletions(-) diff --git a/ChangeLog b/ChangeLog index eb6687af52..4262f8a990 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +2024-09-15 Paul Eggert + + Port July changes for [[...]] to C17 + + The July 30 changes to _GL_FUNCDECL_RPL etc. to support use of + attributes in bracket syntax used a C23 preprocessor feature that is + a common extension to C17 and earlier, but which doesn’t work when + compiled with stricter C17-and-earlier compilers. The feature is + using ‘#define f(a, ...) b’ and calling ‘f’ with only one arg. + Port back to C17 and earlier. Problem discovered with + IBM XL C/C++ for AIX, V12.1 (5765-J02, 5725-C72) on cfarm111. + * lib/c++defs.h (_GL_FUNCDECL_RPL): Turn this into two macros + _GL_FUNCDECL_RPL and _GL_FUNCATTR_RPL. The first macro is for + functions without attributes, the second one for functions with + attributes. All uses changed. + (_GL_FUNCDECL_SYS): Likewise, turn this into _GL_FUNCDECL_SYS + and _GL_FUNCATTR_SYS. + 2024-09-15 Bruno Haible unilbrk: Some more tweaks. diff --git a/lib/arpa_inet.in.h b/lib/arpa_inet.in.h index 16813d412a..fef5be5852 100644 --- a/lib/arpa_inet.in.h +++ b/lib/arpa_inet.in.h @@ -135,7 +135,7 @@ ntohl (uint32_t value) # undef inet_ntop # define inet_ntop rpl_inet_ntop # endif -_GL_FUNCDECL_RPL (inet_ntop, const char *, +_GL_FUNCATTR_RPL (inet_ntop, const char *, (int af, const void *restrict src, char *restrict dst, socklen_t cnt), _GL_ARG_NONNULL ((2, 3))); @@ -144,7 +144,7 @@ _GL_CXXALIAS_RPL (inet_ntop, const char *, char *restrict dst, socklen_t cnt)); # else # if !@HAVE_DECL_INET_NTOP@ -_GL_FUNCDECL_SYS (inet_ntop, const char *, +_GL_FUNCATTR_SYS (inet_ntop, const char *, (int af, const void *restrict src, char *restrict dst, socklen_t cnt), _GL_ARG_NONNULL ((2, 3))); @@ -172,14 +172,14 @@ _GL_WARN_ON_USE (inet_ntop, "inet_ntop is unportable - " # undef inet_pton # define inet_pton rpl_inet_pton # endif -_GL_FUNCDECL_RPL (inet_pton, int, +_GL_FUNCATTR_RPL (inet_pton, int, (int af, const char *restrict src, void *restrict dst), _GL_ARG_NONNULL ((2, 3))); _GL_CXXALIAS_RPL (inet_pton, int, (int af, const char *restrict src, void *restrict dst)); # else # if !@HAVE_DECL_INET_PTON@ -_GL_FUNCDECL_SYS (inet_pton, int, +_GL_FUNCATTR_SYS (inet_pton, int, (int af, const char *restrict src, void *restrict dst), _GL_ARG_NONNULL ((2, 3))); # endif diff --git a/lib/c++defs.h b/lib/c++defs.h index 7082af3fc2..fbc84a1ff4 100644 --- a/lib/c++defs.h +++ b/lib/c++defs.h @@ -104,39 +104,48 @@ # define _GL_EXTERN_C_FUNC #endif -/* _GL_FUNCDECL_RPL (func, rettype, parameters[, attributes]); +/* _GL_FUNCDECL_RPL (func, rettype, parameters); + _GL_FUNCATTR_RPL (func, rettype, parameters, attributes); declares a replacement function, named rpl_func, with the given prototype, - consisting of return type, parameters, and attributes. + consisting of return type and parameters. Use _GL_FUNCDECL_RPL if the + function lacks attributes, _GL_FUNCATTR_RPL if it has them. Example: - _GL_FUNCDECL_RPL (open, int, (const char *filename, int flags, ...), + _GL_FUNCATTR_RPL (open, int, (const char *filename, int flags, ...), _GL_ARG_NONNULL ((1))); Note: Attributes, such as _GL_ATTRIBUTE_DEPRECATED, are supported in front - of a _GL_FUNCDECL_RPL invocation only in C mode, not in C++ mode. (That's - because + of an invocation only in C mode, not in C++ mode. (That's because [[...]] extern "C" ; is invalid syntax in C++.) Note: The attribute _GL_ATTRIBUTE_NOTHROW, if needed, must be placed outside - of the _GL_FUNCDECL_RPL invocation, at the end of the declaration. + of the invocation, at the end of the declaration. */ -#define _GL_FUNCDECL_RPL(func,rettype,parameters,...) \ - _GL_FUNCDECL_RPL_1 (rpl_##func, rettype, parameters, __VA_ARGS__) -#define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters,...) \ - _GL_EXTERN_C_FUNC __VA_ARGS__ rettype rpl_func parameters +#define _GL_FUNCDECL_RPL(func,rettype,parameters) \ + _GL_FUNCDECL_RPL_1 (rpl_##func, rettype, parameters) +#define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters) \ + _GL_EXTERN_C_FUNC rettype rpl_func parameters +#define _GL_FUNCATTR_RPL(func,rettype,parameters,attrs) \ + _GL_FUNCATTR_RPL_1 (rpl_##func, rettype, parameters, attrs) +#define _GL_FUNCATTR_RPL_1(rpl_func,rettype,parameters,attrs) \ + _GL_EXTERN_C_FUNC attrs rettype rpl_func parameters -/* _GL_FUNCDECL_SYS (func, rettype, parameters[, attributes]); +/* _GL_FUNCDECL_SYS (func, rettype, parameters); + _GL_FUNCATTR_SYS (func, rettype, parameters, attributes); declares the system function, named func, with the given prototype, - consisting of return type, parameters, and attributes. + consisting of return type and parameters. Use _GL_FUNCDECL_SYS if the + function lacks attributes, _GL_FUNCATTR_SYS if it has them. Example: - _GL_FUNCDECL_SYS (open, int, (const char *filename, int flags, ...), + _GL_FUNCATTR_SYS (open, int, (const char *filename, int flags, ...), _GL_ARG_NONNULL ((1))); Note: The attribute _GL_ATTRIBUTE_NOTHROW, if needed, must be placed outside - of the _GL_FUNCDECL_SYS invocation, at the end of the declaration. + of the invocation, at the end of the declaration. */ -#define _GL_FUNCDECL_SYS(func,rettype,parameters,...) \ - _GL_EXTERN_C_FUNC __VA_ARGS__ rettype func parameters +#define _GL_FUNCDECL_SYS(func,rettype,parameters) \ + _GL_EXTERN_C_FUNC rettype func parameters +#define _GL_FUNCATTR_SYS(func,rettype,parameters,attrs) \ + _GL_EXTERN_C_FUNC attrs rettype func parameters /* _GL_CXXALIAS_RPL (func, rettype, parameters); declares a C++ alias called GNULIB_NAMESPACE::func diff --git a/lib/dirent.in.h b/lib/dirent.in.h index 7ba8fc64d8..b377134c87 100644 --- a/lib/dirent.in.h +++ b/lib/dirent.in.h @@ -122,11 +122,11 @@ typedef struct gl_directory DIR; # define closedir rpl_closedir # define GNULIB_defined_closedir 1 # endif -_GL_FUNCDECL_RPL (closedir, int, (DIR *dirp), _GL_ARG_NONNULL ((1))); +_GL_FUNCATTR_RPL (closedir, int, (DIR *dirp), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (closedir, int, (DIR *dirp)); # else # if !@HAVE_CLOSEDIR@ -_GL_FUNCDECL_SYS (closedir, int, (DIR *dirp), _GL_ARG_NONNULL ((1))); +_GL_FUNCATTR_SYS (closedir, int, (DIR *dirp), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (closedir, int, (DIR *dirp)); # endif @@ -146,14 +146,14 @@ _GL_WARN_ON_USE (closedir, "closedir is not portable - " # define opendir rpl_opendir # define GNULIB_defined_opendir 1 # endif -_GL_FUNCDECL_RPL (opendir, DIR *, +_GL_FUNCATTR_RPL (opendir, DIR *, (const char *dir_name), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC (closedir, 1)); _GL_CXXALIAS_RPL (opendir, DIR *, (const char *dir_name)); # else # if !@HAVE_OPENDIR@ || (__GNUC__ >= 11 && !defined __clang__) -_GL_FUNCDECL_SYS (opendir, DIR *, +_GL_FUNCATTR_SYS (opendir, DIR *, (const char *dir_name), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC (closedir, 1)); @@ -166,7 +166,7 @@ _GL_CXXALIASWARN (opendir); && (__GNUC__ >= 11 && !defined __clang__) && !defined opendir /* For -Wmismatched-dealloc: Associate opendir with closedir or rpl_closedir. */ -_GL_FUNCDECL_SYS (opendir, DIR *, +_GL_FUNCATTR_SYS (opendir, DIR *, (const char *dir_name), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC (closedir, 1)); @@ -186,11 +186,11 @@ _GL_WARN_ON_USE (opendir, "opendir is not portable - " # undef readdir # define readdir rpl_readdir # endif -_GL_FUNCDECL_RPL (readdir, struct dirent *, (DIR *dirp), _GL_ARG_NONNULL ((1))); +_GL_FUNCATTR_RPL (readdir, struct dirent *, (DIR *dirp), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (readdir, struct dirent *, (DIR *dirp)); # else # if !@HAVE_READDIR@ -_GL_FUNCDECL_SYS (readdir, struct dirent *, (DIR *dirp), _GL_ARG_NONNULL ((1))); +_GL_FUNCATTR_SYS (readdir, struct dirent *, (DIR *dirp), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (readdir, struct dirent *, (DIR *dirp)); # endif @@ -209,11 +209,11 @@ _GL_WARN_ON_USE (readdir, "readdir is not portable - " # undef rewinddir # define rewinddir rpl_rewinddir # endif -_GL_FUNCDECL_RPL (rewinddir, void, (DIR *dirp), _GL_ARG_NONNULL ((1))); +_GL_FUNCATTR_RPL (rewinddir, void, (DIR *dirp), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (rewinddir, void, (DIR *dirp)); # else # if !@HAVE_REWINDDIR@ -_GL_FUNCDECL_SYS (rewinddir, void, (DIR *dirp), _GL_ARG_NONNULL ((1))); +_GL_FUNCATTR_SYS (rewinddir, void, (DIR *dirp), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (rewinddir, void, (DIR *dirp)); # endif @@ -235,7 +235,7 @@ _GL_WARN_ON_USE (rewinddir, "rewinddir is not portable - " # undef dirfd # define dirfd rpl_dirfd # endif -_GL_FUNCDECL_RPL (dirfd, int, (DIR *), _GL_ARG_NONNULL ((1))); +_GL_FUNCATTR_RPL (dirfd, int, (DIR *), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (dirfd, int, (DIR *)); # else @@ -246,7 +246,7 @@ static inline int (dirfd) (DIR *dp) { return dirfd (dp); } # undef dirfd # endif # if !(@HAVE_DECL_DIRFD@ || defined dirfd) -_GL_FUNCDECL_SYS (dirfd, int, (DIR *), _GL_ARG_NONNULL ((1))); +_GL_FUNCATTR_SYS (dirfd, int, (DIR *), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (dirfd, int, (DIR *)); # endif @@ -270,14 +270,14 @@ _GL_WARN_ON_USE (dirfd, "dirfd is unportable - " # undef fdopendir # define fdopendir rpl_fdopendir # endif -_GL_FUNCDECL_RPL (fdopendir, DIR *, +_GL_FUNCATTR_RPL (fdopendir, DIR *, (int fd), _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC (closedir, 1)); _GL_CXXALIAS_RPL (fdopendir, DIR *, (int fd)); # else # if !@HAVE_FDOPENDIR@ || !@HAVE_DECL_FDOPENDIR@ \ || (__GNUC__ >= 11 && !defined __clang__) -_GL_FUNCDECL_SYS (fdopendir, DIR *, +_GL_FUNCATTR_SYS (fdopendir, DIR *, (int fd), _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC (closedir, 1)); # endif @@ -289,7 +289,7 @@ _GL_CXXALIASWARN (fdopendir); && (__GNUC__ >= 11 && !defined __clang__) && !defined fdopendir /* For -Wmismatched-dealloc: Associate fdopendir with closedir or rpl_closedir. */ -_GL_FUNCDECL_SYS (fdopendir, DIR *, +_GL_FUNCATTR_SYS (fdopendir, DIR *, (int fd), _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC (closedir, 1)); # endif @@ -308,7 +308,7 @@ _GL_WARN_ON_USE (fdopendir, "fdopendir is unportable - " sorted using qsort with CMP, and collected in a malloc'd array in *NAMELIST. Returns the number of entries selected, or -1 on error. */ # if !@HAVE_SCANDIR@ -_GL_FUNCDECL_SYS (scandir, int, +_GL_FUNCATTR_SYS (scandir, int, (const char *dir, struct dirent ***namelist, int (*filter) (const struct dirent *), int (*cmp) (const struct dirent **, const struct dirent **)), @@ -332,7 +332,7 @@ _GL_WARN_ON_USE (scandir, "scandir is unportable - " #if @GNULIB_ALPHASORT@ /* Compare two 'struct dirent' entries alphabetically. */ # if !@HAVE_ALPHASORT@ -_GL_FUNCDECL_SYS (alphasort, int, +_GL_FUNCATTR_SYS (alphasort, int, (const struct dirent **, const struct dirent **), _GL_ATTRIBUTE_PURE _GL_ARG_NONNULL ((1, 2))); diff --git a/lib/error.in.h b/lib/error.in.h index 4804c8c465..f8626dca93 100644 --- a/lib/error.in.h +++ b/lib/error.in.h @@ -94,7 +94,7 @@ extern "C" { # undef error # define error rpl_error # endif -_GL_FUNCDECL_RPL (error, void, +_GL_FUNCATTR_RPL (error, void, (int __status, int __errnum, const char *__format, ...), _GL_ATTRIBUTE_COLD _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_ERROR, 3, 4))); @@ -107,7 +107,7 @@ _GL_CXXALIAS_RPL (error, void, # endif #else # if ! @HAVE_ERROR@ -_GL_FUNCDECL_SYS (error, void, +_GL_FUNCATTR_SYS (error, void, (int __status, int __errnum, const char *__format, ...), _GL_ATTRIBUTE_COLD _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_ERROR, 3, 4))); @@ -150,7 +150,7 @@ _GL_CXXALIASWARN (error); # undef error_at_line # define error_at_line rpl_error_at_line # endif -_GL_FUNCDECL_RPL (error_at_line, void, +_GL_FUNCATTR_RPL (error_at_line, void, (int __status, int __errnum, const char *__filename, unsigned int __lineno, const char *__format, ...), _GL_ATTRIBUTE_COLD @@ -165,7 +165,7 @@ _GL_CXXALIAS_RPL (error_at_line, void, # endif #else # if ! @HAVE_ERROR_AT_LINE@ -_GL_FUNCDECL_SYS (error_at_line, void, +_GL_FUNCATTR_SYS (error_at_line, void, (int __status, int __errnum, const char *__filename, unsigned int __lineno, const char *__format, ...), _GL_ATTRIBUTE_COLD diff --git a/lib/fcntl.in.h b/lib/fcntl.in.h index 8b8274295a..99624d302f 100644 --- a/lib/fcntl.in.h +++ b/lib/fcntl.in.h @@ -100,7 +100,7 @@ # undef creat # define creat rpl_creat # endif -_GL_FUNCDECL_RPL (creat, int, (const char *filename, mode_t mode), +_GL_FUNCATTR_RPL (creat, int, (const char *filename, mode_t mode), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (creat, int, (const char *filename, mode_t mode)); # elif defined _WIN32 && !defined __CYGWIN__ @@ -170,7 +170,7 @@ _GL_WARN_ON_USE (fcntl, "fcntl is not always POSIX compliant - " # undef open # define open rpl_open # endif -_GL_FUNCDECL_RPL (open, int, (const char *filename, int flags, ...), +_GL_FUNCATTR_RPL (open, int, (const char *filename, int flags, ...), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (open, int, (const char *filename, int flags, ...)); # elif defined _WIN32 && !defined __CYGWIN__ @@ -216,14 +216,14 @@ _GL_CXXALIASWARN (open); # undef openat # define openat rpl_openat # endif -_GL_FUNCDECL_RPL (openat, int, +_GL_FUNCATTR_RPL (openat, int, (int fd, char const *file, int flags, /* mode_t mode */ ...), _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (openat, int, (int fd, char const *file, int flags, /* mode_t mode */ ...)); # else # if !@HAVE_OPENAT@ -_GL_FUNCDECL_SYS (openat, int, +_GL_FUNCATTR_SYS (openat, int, (int fd, char const *file, int flags, /* mode_t mode */ ...), _GL_ARG_NONNULL ((2))); # endif diff --git a/lib/fnmatch.in.h b/lib/fnmatch.in.h index 5482dba8c6..f8199ebe91 100644 --- a/lib/fnmatch.in.h +++ b/lib/fnmatch.in.h @@ -85,7 +85,7 @@ # define fnmatch rpl_fnmatch # endif # define GNULIB_defined_fnmatch_function 1 -_GL_FUNCDECL_RPL (fnmatch, int, +_GL_FUNCATTR_RPL (fnmatch, int, (const char *pattern, const char *name, int flags), _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (fnmatch, int, @@ -93,7 +93,7 @@ _GL_CXXALIAS_RPL (fnmatch, int, # else # if !@HAVE_FNMATCH@ # define GNULIB_defined_fnmatch_function 1 -_GL_FUNCDECL_SYS (fnmatch, int, +_GL_FUNCATTR_SYS (fnmatch, int, (const char *pattern, const char *name, int flags), _GL_ARG_NONNULL ((1, 2))); # endif diff --git a/lib/glob.in.h b/lib/glob.in.h index f92f409338..fd59128f17 100644 --- a/lib/glob.in.h +++ b/lib/glob.in.h @@ -107,7 +107,7 @@ typedef int (*_gl_glob_errfunc_fn) (const char *, int); #if @GNULIB_GLOB@ # if @REPLACE_GLOB@ -_GL_FUNCDECL_RPL (glob, int, (const char *_Restrict_ __pattern, int __flags, +_GL_FUNCATTR_RPL (glob, int, (const char *_Restrict_ __pattern, int __flags, _gl_glob_errfunc_fn __errfunc, glob_t *_Restrict_ __pglob), _GL_ARG_NONNULL ((1))); @@ -116,7 +116,7 @@ _GL_CXXALIAS_RPL (glob, int, (const char *_Restrict_ __pattern, int __flags, glob_t *_Restrict_ __pglob)); # else # if !@HAVE_GLOB@ -_GL_FUNCDECL_SYS (glob, int, (const char *_Restrict_ __pattern, int __flags, +_GL_FUNCATTR_SYS (glob, int, (const char *_Restrict_ __pattern, int __flags, _gl_glob_errfunc_fn __errfunc, glob_t *_Restrict_ __pglob), _GL_ARG_NONNULL ((1))); @@ -139,11 +139,11 @@ _GL_WARN_ON_USE (glob, #if @GNULIB_GLOB@ # if @REPLACE_GLOB@ -_GL_FUNCDECL_RPL (globfree, void, (glob_t *__pglob), _GL_ARG_NONNULL ((1))); +_GL_FUNCATTR_RPL (globfree, void, (glob_t *__pglob), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (globfree, void, (glob_t *__pglob)); # else # if !@HAVE_GLOB@ -_GL_FUNCDECL_SYS (globfree, void, (glob_t *__pglob), _GL_ARG_NONNULL ((1))); +_GL_FUNCATTR_SYS (globfree, void, (glob_t *__pglob), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (globfree, void, (glob_t *__pglob)); # endif @@ -159,12 +159,12 @@ _GL_WARN_ON_USE (globfree, #if @GNULIB_GLOB@ # if @REPLACE_GLOB_PATTERN_P@ -_GL_FUNCDECL_RPL (glob_pattern_p, int, (const char *__pattern, int __quote), +_GL_FUNCATTR_RPL (glob_pattern_p, int, (const char *__pattern, int __quote), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (glob_pattern_p, int, (const char *__pattern, int __quote)); # else # if !@HAVE_GLOB_PATTERN_P@ -_GL_FUNCDECL_SYS (glob_pattern_p, int, (const char *__pattern, int __quote), +_GL_FUNCATTR_SYS (glob_pattern_p, int, (const char *__pattern, int __quote), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (glob_pattern_p, int, (const char *__pattern, int __quote)); diff --git a/lib/iconv.in.h b/lib/iconv.in.h index da6dc2ebd6..1feb82482b 100644 --- a/lib/iconv.in.h +++ b/lib/iconv.in.h @@ -47,7 +47,7 @@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define iconv_open rpl_iconv_open # endif -_GL_FUNCDECL_RPL (iconv_open, iconv_t, +_GL_FUNCATTR_RPL (iconv_open, iconv_t, (const char *tocode, const char *fromcode), _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (iconv_open, iconv_t, diff --git a/lib/inttypes.in.h b/lib/inttypes.in.h index e9c80f3dca..ad3798cc34 100644 --- a/lib/inttypes.in.h +++ b/lib/inttypes.in.h @@ -969,7 +969,7 @@ _GL_WARN_ON_USE (imaxdiv, "imaxdiv is unportable - " # undef strtoimax # define strtoimax rpl_strtoimax # endif -_GL_FUNCDECL_RPL (strtoimax, intmax_t, +_GL_FUNCATTR_RPL (strtoimax, intmax_t, (const char *restrict, char **restrict, int), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (strtoimax, intmax_t, @@ -977,7 +977,7 @@ _GL_CXXALIAS_RPL (strtoimax, intmax_t, # else # if !@HAVE_DECL_STRTOIMAX@ # undef strtoimax -_GL_FUNCDECL_SYS (strtoimax, intmax_t, +_GL_FUNCATTR_SYS (strtoimax, intmax_t, (const char *restrict, char **restrict, int), _GL_ARG_NONNULL ((1))); # endif @@ -999,7 +999,7 @@ _GL_WARN_ON_USE (strtoimax, "strtoimax is unportable - " # undef strtoumax # define strtoumax rpl_strtoumax # endif -_GL_FUNCDECL_RPL (strtoumax, uintmax_t, +_GL_FUNCATTR_RPL (strtoumax, uintmax_t, (const char *restrict, char **restrict, int), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (strtoumax, uintmax_t, @@ -1007,7 +1007,7 @@ _GL_CXXALIAS_RPL (strtoumax, uintmax_t, # else # if !@HAVE_DECL_STRTOUMAX@ # undef strtoumax -_GL_FUNCDECL_SYS (strtoumax, uintmax_t, +_GL_FUNCATTR_SYS (strtoumax, uintmax_t, (const char *restrict, char **restrict, int), _GL_ARG_NONNULL ((1))); # endif diff --git a/lib/locale.in.h b/lib/locale.in.h index d025ef53ca..e8d08c9345 100644 --- a/lib/locale.in.h +++ b/lib/locale.in.h @@ -225,7 +225,7 @@ _GL_WARN_ON_USE (setlocale, "setlocale works differently on native Windows - " # define newlocale rpl_newlocale # define GNULIB_defined_newlocale 1 # endif -_GL_FUNCDECL_RPL (newlocale, locale_t, +_GL_FUNCATTR_RPL (newlocale, locale_t, (int category_mask, const char *name, locale_t base), _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (newlocale, locale_t, @@ -259,7 +259,7 @@ _GL_WARN_ON_USE (newlocale, "newlocale is not portable"); # define duplocale rpl_duplocale # define GNULIB_defined_duplocale 1 # endif -_GL_FUNCDECL_RPL (duplocale, locale_t, (locale_t locale), _GL_ARG_NONNULL ((1))); +_GL_FUNCATTR_RPL (duplocale, locale_t, (locale_t locale), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (duplocale, locale_t, (locale_t locale)); # else _GL_CXXALIAS_SYS (duplocale, locale_t, (locale_t locale)); @@ -288,7 +288,7 @@ _GL_WARN_ON_USE (duplocale, "duplocale is buggy on some glibc systems - " # define freelocale rpl_freelocale # define GNULIB_defined_freelocale 1 # endif -_GL_FUNCDECL_RPL (freelocale, void, (locale_t locale), _GL_ARG_NONNULL ((1))); +_GL_FUNCATTR_RPL (freelocale, void, (locale_t locale), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (freelocale, void, (locale_t locale)); # else # if @HAVE_FREELOCALE@ diff --git a/lib/malloc.in.h b/lib/malloc.in.h index a22a4a8a39..922d8ed388 100644 --- a/lib/malloc.in.h +++ b/lib/malloc.in.h @@ -141,7 +141,7 @@ _GL_EXTERN_C void free (void *); # undef memalign # define memalign rpl_memalign # endif -_GL_FUNCDECL_RPL (memalign, void *, +_GL_FUNCATTR_RPL (memalign, void *, (size_t alignment, size_t size), _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_NODISCARD); @@ -151,13 +151,13 @@ _GL_CXXALIAS_RPL (memalign, void *, (size_t alignment, size_t size)); # if __GNUC__ >= 11 && !defined __clang__ /* For -Wmismatched-dealloc: Associate memalign with free or rpl_free. */ # if __GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2 -_GL_FUNCDECL_SYS (memalign, void *, +_GL_FUNCATTR_SYS (memalign, void *, (size_t alignment, size_t size), _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_NODISCARD) _GL_ATTRIBUTE_NOTHROW; # else -_GL_FUNCDECL_SYS (memalign, void *, +_GL_FUNCATTR_SYS (memalign, void *, (size_t alignment, size_t size), _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_NODISCARD); @@ -173,12 +173,12 @@ _GL_CXXALIASWARN (memalign); # if (__GNUC__ >= 11 && !defined __clang__) && !defined memalign /* For -Wmismatched-dealloc: Associate memalign with free or rpl_free. */ # if __GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2 -_GL_FUNCDECL_SYS (memalign, void *, +_GL_FUNCATTR_SYS (memalign, void *, (size_t alignment, size_t size), _GL_ATTRIBUTE_DEALLOC_FREE) _GL_ATTRIBUTE_NOTHROW; # else -_GL_FUNCDECL_SYS (memalign, void *, +_GL_FUNCATTR_SYS (memalign, void *, (size_t alignment, size_t size), _GL_ATTRIBUTE_DEALLOC_FREE); # endif diff --git a/lib/math.in.h b/lib/math.in.h index 89bd9ae643..51818d1508 100644 --- a/lib/math.in.h +++ b/lib/math.in.h @@ -1143,12 +1143,12 @@ _GL_WARN_ON_USE (fmodl, "fmodl is unportable - " # undef frexpf # define frexpf rpl_frexpf # endif -_GL_FUNCDECL_RPL (frexpf, float, (float x, int *expptr), _GL_ARG_NONNULL ((2))); +_GL_FUNCATTR_RPL (frexpf, float, (float x, int *expptr), _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (frexpf, float, (float x, int *expptr)); # else # if !@HAVE_FREXPF@ # undef frexpf -_GL_FUNCDECL_SYS (frexpf, float, (float x, int *expptr), _GL_ARG_NONNULL ((2))); +_GL_FUNCATTR_SYS (frexpf, float, (float x, int *expptr), _GL_ARG_NONNULL ((2))); # endif _GL_CXXALIAS_SYS (frexpf, float, (float x, int *expptr)); # endif @@ -1176,7 +1176,7 @@ _GL_WARN_ON_USE (frexpf, "frexpf is unportable - " # undef frexp # define frexp rpl_frexp # endif -_GL_FUNCDECL_RPL (frexp, double, (double x, int *expptr), +_GL_FUNCATTR_RPL (frexp, double, (double x, int *expptr), _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (frexp, double, (double x, int *expptr)); # else @@ -1204,12 +1204,12 @@ _GL_WARN_ON_USE (frexp, "frexp is unportable - " # undef frexpl # define frexpl rpl_frexpl # endif -_GL_FUNCDECL_RPL (frexpl, long double, +_GL_FUNCATTR_RPL (frexpl, long double, (long double x, int *expptr), _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (frexpl, long double, (long double x, int *expptr)); #else # if !@HAVE_DECL_FREXPL@ -_GL_FUNCDECL_SYS (frexpl, long double, +_GL_FUNCATTR_SYS (frexpl, long double, (long double x, int *expptr), _GL_ARG_NONNULL ((2))); # endif # if @GNULIB_FREXPL@ @@ -1928,12 +1928,12 @@ _GL_WARN_ON_USE (logp1l, "logp1l is unportable - " # undef modff # define modff rpl_modff # endif -_GL_FUNCDECL_RPL (modff, float, (float x, float *iptr), _GL_ARG_NONNULL ((2))); +_GL_FUNCATTR_RPL (modff, float, (float x, float *iptr), _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (modff, float, (float x, float *iptr)); # else # if !@HAVE_MODFF@ # undef modff -_GL_FUNCDECL_SYS (modff, float, (float x, float *iptr), _GL_ARG_NONNULL ((2))); +_GL_FUNCATTR_SYS (modff, float, (float x, float *iptr), _GL_ARG_NONNULL ((2))); # endif _GL_CXXALIAS_SYS (modff, float, (float x, float *iptr)); # endif @@ -1952,7 +1952,7 @@ _GL_WARN_ON_USE (modff, "modff is unportable - " # undef modf # define modf rpl_modf # endif -_GL_FUNCDECL_RPL (modf, double, (double x, double *iptr), +_GL_FUNCATTR_RPL (modf, double, (double x, double *iptr), _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (modf, double, (double x, double *iptr)); # else @@ -1975,13 +1975,13 @@ _GL_WARN_ON_USE (modf, "modf has portability problems - " # undef modfl # define modfl rpl_modfl # endif -_GL_FUNCDECL_RPL (modfl, long double, (long double x, long double *iptr), +_GL_FUNCATTR_RPL (modfl, long double, (long double x, long double *iptr), _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (modfl, long double, (long double x, long double *iptr)); # else # if !@HAVE_MODFL@ # undef modfl -_GL_FUNCDECL_SYS (modfl, long double, (long double x, long double *iptr), +_GL_FUNCATTR_SYS (modfl, long double, (long double x, long double *iptr), _GL_ARG_NONNULL ((2))); # endif _GL_CXXALIAS_SYS (modfl, long double, (long double x, long double *iptr)); diff --git a/lib/mntent.in.h b/lib/mntent.in.h index c8750fec66..61693a8152 100644 --- a/lib/mntent.in.h +++ b/lib/mntent.in.h @@ -52,14 +52,14 @@ extern "C" { # undef hasmntopt # define hasmntopt rpl_hasmntopt # endif -_GL_FUNCDECL_RPL (hasmntopt, char *, +_GL_FUNCATTR_RPL (hasmntopt, char *, (const struct mntent *me, const char *option), _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (hasmntopt, char *, (const struct mntent *me, const char *option)); # else # if !@HAVE_HASMNTOPT@ -_GL_FUNCDECL_SYS (hasmntopt, char *, +_GL_FUNCATTR_SYS (hasmntopt, char *, (const struct mntent *me, const char *option), _GL_ARG_NONNULL ((1, 2))); # endif diff --git a/lib/monetary.in.h b/lib/monetary.in.h index 63732673cc..4093fae07c 100644 --- a/lib/monetary.in.h +++ b/lib/monetary.in.h @@ -86,7 +86,7 @@ extern "C" { # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define strfmon_l rpl_strfmon_l # endif -_GL_FUNCDECL_RPL (strfmon_l, ssize_t, +_GL_FUNCATTR_RPL (strfmon_l, ssize_t, (char *restrict s, size_t maxsize, locale_t locale, const char *restrict format, ...), _GL_ATTRIBUTE_FORMAT_STRFMON (4, 5) diff --git a/lib/netdb.in.h b/lib/netdb.in.h index 30f9abc09a..4f8316e92e 100644 --- a/lib/netdb.in.h +++ b/lib/netdb.in.h @@ -180,7 +180,7 @@ struct addrinfo # undef getaddrinfo # define getaddrinfo rpl_getaddrinfo # endif -_GL_FUNCDECL_RPL (getaddrinfo, int, +_GL_FUNCATTR_RPL (getaddrinfo, int, (const char *restrict nodename, const char *restrict servname, const struct addrinfo *restrict hints, @@ -193,7 +193,7 @@ _GL_CXXALIAS_RPL (getaddrinfo, int, struct addrinfo **restrict res)); # else # if !@HAVE_DECL_GETADDRINFO@ -_GL_FUNCDECL_SYS (getaddrinfo, int, +_GL_FUNCATTR_SYS (getaddrinfo, int, (const char *restrict nodename, const char *restrict servname, const struct addrinfo *restrict hints, @@ -216,12 +216,12 @@ _GL_CXXALIASWARN (getaddrinfo); # undef freeaddrinfo # define freeaddrinfo rpl_freeaddrinfo # endif -_GL_FUNCDECL_RPL (freeaddrinfo, void, (struct addrinfo *ai), +_GL_FUNCATTR_RPL (freeaddrinfo, void, (struct addrinfo *ai), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (freeaddrinfo, void, (struct addrinfo *ai)); # else # if !@HAVE_DECL_FREEADDRINFO@ -_GL_FUNCDECL_SYS (freeaddrinfo, void, (struct addrinfo *ai), +_GL_FUNCATTR_SYS (freeaddrinfo, void, (struct addrinfo *ai), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (freeaddrinfo, void, (struct addrinfo *ai)); @@ -252,7 +252,7 @@ _GL_CXXALIASWARN (gai_strerror); /* Convert socket address to printable node and service names. For more details, see the POSIX:2008 specification . */ -_GL_FUNCDECL_SYS (getnameinfo, int, +_GL_FUNCATTR_SYS (getnameinfo, int, (const struct sockaddr *restrict sa, socklen_t salen, char *restrict node, socklen_t nodelen, char *restrict service, socklen_t servicelen, diff --git a/lib/pthread.in.h b/lib/pthread.in.h index 4bf35b5051..4a44c9a998 100644 --- a/lib/pthread.in.h +++ b/lib/pthread.in.h @@ -496,7 +496,7 @@ typedef unsigned int pthread_barrierattr_t; # undef pthread_create # define pthread_create rpl_pthread_create # endif -_GL_FUNCDECL_RPL (pthread_create, int, +_GL_FUNCATTR_RPL (pthread_create, int, (pthread_t *restrict threadp, const pthread_attr_t *restrict attr, void * (*mainfunc) (void *), void *restrict arg), @@ -507,7 +507,7 @@ _GL_CXXALIAS_RPL (pthread_create, int, void * (*mainfunc) (void *), void *restrict arg)); # else # if !@HAVE_PTHREAD_CREATE@ -_GL_FUNCDECL_SYS (pthread_create, int, +_GL_FUNCATTR_SYS (pthread_create, int, (pthread_t *restrict threadp, const pthread_attr_t *restrict attr, void * (*mainfunc) (void *), void *restrict arg), @@ -535,12 +535,12 @@ _GL_WARN_ON_USE (pthread_create, "pthread_create is not portable - " # undef pthread_attr_init # define pthread_attr_init rpl_pthread_attr_init # endif -_GL_FUNCDECL_RPL (pthread_attr_init, int, (pthread_attr_t *attr), +_GL_FUNCATTR_RPL (pthread_attr_init, int, (pthread_attr_t *attr), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_attr_init, int, (pthread_attr_t *attr)); # else # if !@HAVE_PTHREAD_ATTR_INIT@ -_GL_FUNCDECL_SYS (pthread_attr_init, int, (pthread_attr_t *attr), +_GL_FUNCATTR_SYS (pthread_attr_init, int, (pthread_attr_t *attr), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_attr_init, int, (pthread_attr_t *attr)); @@ -562,14 +562,14 @@ _GL_WARN_ON_USE (pthread_attr_init, "pthread_attr_init is not portable - " # undef pthread_attr_getdetachstate # define pthread_attr_getdetachstate rpl_pthread_attr_getdetachstate # endif -_GL_FUNCDECL_RPL (pthread_attr_getdetachstate, int, +_GL_FUNCATTR_RPL (pthread_attr_getdetachstate, int, (const pthread_attr_t *attr, int *detachstatep), _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (pthread_attr_getdetachstate, int, (const pthread_attr_t *attr, int *detachstatep)); # else # if !@HAVE_PTHREAD_ATTR_GETDETACHSTATE@ -_GL_FUNCDECL_SYS (pthread_attr_getdetachstate, int, +_GL_FUNCATTR_SYS (pthread_attr_getdetachstate, int, (const pthread_attr_t *attr, int *detachstatep), _GL_ARG_NONNULL ((1, 2))); # endif @@ -593,14 +593,14 @@ _GL_WARN_ON_USE (pthread_attr_getdetachstate, "pthread_attr_getdetachstate is no # undef pthread_attr_setdetachstate # define pthread_attr_setdetachstate rpl_pthread_attr_setdetachstate # endif -_GL_FUNCDECL_RPL (pthread_attr_setdetachstate, int, +_GL_FUNCATTR_RPL (pthread_attr_setdetachstate, int, (pthread_attr_t *attr, int detachstate), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_attr_setdetachstate, int, (pthread_attr_t *attr, int detachstate)); # else # if !@HAVE_PTHREAD_ATTR_SETDETACHSTATE@ -_GL_FUNCDECL_SYS (pthread_attr_setdetachstate, int, +_GL_FUNCATTR_SYS (pthread_attr_setdetachstate, int, (pthread_attr_t *attr, int detachstate), _GL_ARG_NONNULL ((1))); # endif @@ -624,12 +624,12 @@ _GL_WARN_ON_USE (pthread_attr_setdetachstate, "pthread_attr_setdetachstate is no # undef pthread_attr_destroy # define pthread_attr_destroy rpl_pthread_attr_destroy # endif -_GL_FUNCDECL_RPL (pthread_attr_destroy, int, (pthread_attr_t *attr), +_GL_FUNCATTR_RPL (pthread_attr_destroy, int, (pthread_attr_t *attr), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_attr_destroy, int, (pthread_attr_t *attr)); # else # if !@HAVE_PTHREAD_ATTR_DESTROY@ -_GL_FUNCDECL_SYS (pthread_attr_destroy, int, (pthread_attr_t *attr), +_GL_FUNCATTR_SYS (pthread_attr_destroy, int, (pthread_attr_t *attr), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_attr_destroy, int, (pthread_attr_t *attr)); @@ -651,11 +651,11 @@ _GL_WARN_ON_USE (pthread_attr_destroy, "pthread_attr_destroy is not portable - " # undef pthread_self # define pthread_self rpl_pthread_self # endif -_GL_FUNCDECL_RPL (pthread_self, pthread_t, (void), _GL_ATTRIBUTE_PURE); +_GL_FUNCATTR_RPL (pthread_self, pthread_t, (void), _GL_ATTRIBUTE_PURE); _GL_CXXALIAS_RPL (pthread_self, pthread_t, (void)); # else # if !@HAVE_PTHREAD_SELF@ -_GL_FUNCDECL_SYS (pthread_self, pthread_t, (void), _GL_ATTRIBUTE_PURE); +_GL_FUNCATTR_SYS (pthread_self, pthread_t, (void), _GL_ATTRIBUTE_PURE); # endif _GL_CXXALIAS_SYS (pthread_self, pthread_t, (void)); # endif @@ -779,14 +779,14 @@ _GL_WARN_ON_USE (pthread_exit, "pthread_exit is not portable - " # undef pthread_once # define pthread_once rpl_pthread_once # endif -_GL_FUNCDECL_RPL (pthread_once, int, +_GL_FUNCATTR_RPL (pthread_once, int, (pthread_once_t *once_control, void (*initfunction) (void)), _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (pthread_once, int, (pthread_once_t *once_control, void (*initfunction) (void))); # else # if !@HAVE_PTHREAD_ONCE@ -_GL_FUNCDECL_SYS (pthread_once, int, +_GL_FUNCATTR_SYS (pthread_once, int, (pthread_once_t *once_control, void (*initfunction) (void)), _GL_ARG_NONNULL ((1, 2))); # endif @@ -813,7 +813,7 @@ _GL_WARN_ON_USE (pthread_once, "pthread_once is not portable - " # undef pthread_mutex_init # define pthread_mutex_init rpl_pthread_mutex_init # endif -_GL_FUNCDECL_RPL (pthread_mutex_init, int, +_GL_FUNCATTR_RPL (pthread_mutex_init, int, (pthread_mutex_t *restrict mutex, const pthread_mutexattr_t *restrict attr), _GL_ARG_NONNULL ((1))); @@ -822,7 +822,7 @@ _GL_CXXALIAS_RPL (pthread_mutex_init, int, const pthread_mutexattr_t *restrict attr)); # else # if !@HAVE_PTHREAD_MUTEX_INIT@ -_GL_FUNCDECL_SYS (pthread_mutex_init, int, +_GL_FUNCATTR_SYS (pthread_mutex_init, int, (pthread_mutex_t *restrict mutex, const pthread_mutexattr_t *restrict attr), _GL_ARG_NONNULL ((1))); @@ -848,12 +848,12 @@ _GL_WARN_ON_USE (pthread_mutex_init, "pthread_mutex_init is not portable - " # undef pthread_mutexattr_init # define pthread_mutexattr_init rpl_pthread_mutexattr_init # endif -_GL_FUNCDECL_RPL (pthread_mutexattr_init, int, (pthread_mutexattr_t *attr), +_GL_FUNCATTR_RPL (pthread_mutexattr_init, int, (pthread_mutexattr_t *attr), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_mutexattr_init, int, (pthread_mutexattr_t *attr)); # else # if !@HAVE_PTHREAD_MUTEXATTR_INIT@ -_GL_FUNCDECL_SYS (pthread_mutexattr_init, int, (pthread_mutexattr_t *attr), +_GL_FUNCATTR_SYS (pthread_mutexattr_init, int, (pthread_mutexattr_t *attr), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_mutexattr_init, int, (pthread_mutexattr_t *attr)); @@ -875,7 +875,7 @@ _GL_WARN_ON_USE (pthread_mutexattr_init, "pthread_mutexattr_init is not portable # undef pthread_mutexattr_gettype # define pthread_mutexattr_gettype rpl_pthread_mutexattr_gettype # endif -_GL_FUNCDECL_RPL (pthread_mutexattr_gettype, int, +_GL_FUNCATTR_RPL (pthread_mutexattr_gettype, int, (const pthread_mutexattr_t *restrict attr, int *restrict typep), _GL_ARG_NONNULL ((1, 2))); @@ -884,7 +884,7 @@ _GL_CXXALIAS_RPL (pthread_mutexattr_gettype, int, int *restrict typep)); # else # if !@HAVE_PTHREAD_MUTEXATTR_GETTYPE@ -_GL_FUNCDECL_SYS (pthread_mutexattr_gettype, int, +_GL_FUNCATTR_SYS (pthread_mutexattr_gettype, int, (const pthread_mutexattr_t *restrict attr, int *restrict typep), _GL_ARG_NONNULL ((1, 2))); @@ -912,13 +912,13 @@ _GL_WARN_ON_USE (pthread_mutexattr_gettype, "pthread_mutexattr_gettype is not po # undef pthread_mutexattr_settype # define pthread_mutexattr_settype rpl_pthread_mutexattr_settype # endif -_GL_FUNCDECL_RPL (pthread_mutexattr_settype, int, +_GL_FUNCATTR_RPL (pthread_mutexattr_settype, int, (pthread_mutexattr_t *attr, int type), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_mutexattr_settype, int, (pthread_mutexattr_t *attr, int type)); # else # if !@HAVE_PTHREAD_MUTEXATTR_SETTYPE@ -_GL_FUNCDECL_SYS (pthread_mutexattr_settype, int, +_GL_FUNCATTR_SYS (pthread_mutexattr_settype, int, (pthread_mutexattr_t *attr, int type), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_mutexattr_settype, int, @@ -941,7 +941,7 @@ _GL_WARN_ON_USE (pthread_mutexattr_settype, "pthread_mutexattr_settype is not po # undef pthread_mutexattr_getrobust # define pthread_mutexattr_getrobust rpl_pthread_mutexattr_getrobust # endif -_GL_FUNCDECL_RPL (pthread_mutexattr_getrobust, int, +_GL_FUNCATTR_RPL (pthread_mutexattr_getrobust, int, (const pthread_mutexattr_t *restrict attr, int *restrict robustp), _GL_ARG_NONNULL ((1, 2))); @@ -950,7 +950,7 @@ _GL_CXXALIAS_RPL (pthread_mutexattr_getrobust, int, int *restrict robustp)); # else # if !@HAVE_PTHREAD_MUTEXATTR_GETROBUST@ -_GL_FUNCDECL_SYS (pthread_mutexattr_getrobust, int, +_GL_FUNCATTR_SYS (pthread_mutexattr_getrobust, int, (const pthread_mutexattr_t *restrict attr, int *restrict robustp), _GL_ARG_NONNULL ((1, 2))); @@ -978,14 +978,14 @@ _GL_WARN_ON_USE (pthread_mutexattr_getrobust, "pthread_mutexattr_getrobust is no # undef pthread_mutexattr_setrobust # define pthread_mutexattr_setrobust rpl_pthread_mutexattr_setrobust # endif -_GL_FUNCDECL_RPL (pthread_mutexattr_setrobust, int, +_GL_FUNCATTR_RPL (pthread_mutexattr_setrobust, int, (pthread_mutexattr_t *attr, int robust), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_mutexattr_setrobust, int, (pthread_mutexattr_t *attr, int robust)); # else # if !@HAVE_PTHREAD_MUTEXATTR_SETROBUST@ -_GL_FUNCDECL_SYS (pthread_mutexattr_setrobust, int, +_GL_FUNCATTR_SYS (pthread_mutexattr_setrobust, int, (pthread_mutexattr_t *attr, int robust), _GL_ARG_NONNULL ((1))); # endif @@ -1009,12 +1009,12 @@ _GL_WARN_ON_USE (pthread_mutexattr_setrobust, "pthread_mutexattr_setrobust is no # undef pthread_mutexattr_destroy # define pthread_mutexattr_destroy rpl_pthread_mutexattr_destroy # endif -_GL_FUNCDECL_RPL (pthread_mutexattr_destroy, int, (pthread_mutexattr_t *attr), +_GL_FUNCATTR_RPL (pthread_mutexattr_destroy, int, (pthread_mutexattr_t *attr), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_mutexattr_destroy, int, (pthread_mutexattr_t *attr)); # else # if !@HAVE_PTHREAD_MUTEXATTR_DESTROY@ -_GL_FUNCDECL_SYS (pthread_mutexattr_destroy, int, (pthread_mutexattr_t *attr), +_GL_FUNCATTR_SYS (pthread_mutexattr_destroy, int, (pthread_mutexattr_t *attr), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_mutexattr_destroy, int, (pthread_mutexattr_t *attr)); @@ -1036,12 +1036,12 @@ _GL_WARN_ON_USE (pthread_mutexattr_destroy, "pthread_mutexattr_destroy is not po # undef pthread_mutex_lock # define pthread_mutex_lock rpl_pthread_mutex_lock # endif -_GL_FUNCDECL_RPL (pthread_mutex_lock, int, (pthread_mutex_t *mutex), +_GL_FUNCATTR_RPL (pthread_mutex_lock, int, (pthread_mutex_t *mutex), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_mutex_lock, int, (pthread_mutex_t *mutex)); # else # if !@HAVE_PTHREAD_MUTEX_LOCK@ -_GL_FUNCDECL_SYS (pthread_mutex_lock, int, (pthread_mutex_t *mutex), +_GL_FUNCATTR_SYS (pthread_mutex_lock, int, (pthread_mutex_t *mutex), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_mutex_lock, int, (pthread_mutex_t *mutex)); @@ -1063,12 +1063,12 @@ _GL_WARN_ON_USE (pthread_mutex_lock, "pthread_mutex_lock is not portable - " # undef pthread_mutex_trylock # define pthread_mutex_trylock rpl_pthread_mutex_trylock # endif -_GL_FUNCDECL_RPL (pthread_mutex_trylock, int, (pthread_mutex_t *mutex), +_GL_FUNCATTR_RPL (pthread_mutex_trylock, int, (pthread_mutex_t *mutex), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_mutex_trylock, int, (pthread_mutex_t *mutex)); # else # if !@HAVE_PTHREAD_MUTEX_TRYLOCK@ -_GL_FUNCDECL_SYS (pthread_mutex_trylock, int, (pthread_mutex_t *mutex), +_GL_FUNCATTR_SYS (pthread_mutex_trylock, int, (pthread_mutex_t *mutex), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_mutex_trylock, int, (pthread_mutex_t *mutex)); @@ -1090,7 +1090,7 @@ _GL_WARN_ON_USE (pthread_mutex_trylock, "pthread_mutex_trylock is not portable - # undef pthread_mutex_timedlock # define pthread_mutex_timedlock rpl_pthread_mutex_timedlock # endif -_GL_FUNCDECL_RPL (pthread_mutex_timedlock, int, +_GL_FUNCATTR_RPL (pthread_mutex_timedlock, int, (pthread_mutex_t *restrict mutex, const struct timespec *restrict abstime), _GL_ARG_NONNULL ((1, 2))); @@ -1099,7 +1099,7 @@ _GL_CXXALIAS_RPL (pthread_mutex_timedlock, int, const struct timespec *restrict abstime)); # else # if !@HAVE_PTHREAD_MUTEX_TIMEDLOCK@ -_GL_FUNCDECL_SYS (pthread_mutex_timedlock, int, +_GL_FUNCATTR_SYS (pthread_mutex_timedlock, int, (pthread_mutex_t *restrict mutex, const struct timespec *restrict abstime), _GL_ARG_NONNULL ((1, 2))); @@ -1125,12 +1125,12 @@ _GL_WARN_ON_USE (pthread_mutex_timedlock, "pthread_mutex_timedlock is not portab # undef pthread_mutex_unlock # define pthread_mutex_unlock rpl_pthread_mutex_unlock # endif -_GL_FUNCDECL_RPL (pthread_mutex_unlock, int, (pthread_mutex_t *mutex), +_GL_FUNCATTR_RPL (pthread_mutex_unlock, int, (pthread_mutex_t *mutex), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_mutex_unlock, int, (pthread_mutex_t *mutex)); # else # if !@HAVE_PTHREAD_MUTEX_UNLOCK@ -_GL_FUNCDECL_SYS (pthread_mutex_unlock, int, (pthread_mutex_t *mutex), +_GL_FUNCATTR_SYS (pthread_mutex_unlock, int, (pthread_mutex_t *mutex), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_mutex_unlock, int, (pthread_mutex_t *mutex)); @@ -1152,12 +1152,12 @@ _GL_WARN_ON_USE (pthread_mutex_unlock, "pthread_mutex_unlock is not portable - " # undef pthread_mutex_destroy # define pthread_mutex_destroy rpl_pthread_mutex_destroy # endif -_GL_FUNCDECL_RPL (pthread_mutex_destroy, int, (pthread_mutex_t *mutex), +_GL_FUNCATTR_RPL (pthread_mutex_destroy, int, (pthread_mutex_t *mutex), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_mutex_destroy, int, (pthread_mutex_t *mutex)); # else # if !@HAVE_PTHREAD_MUTEX_DESTROY@ -_GL_FUNCDECL_SYS (pthread_mutex_destroy, int, (pthread_mutex_t *mutex), +_GL_FUNCATTR_SYS (pthread_mutex_destroy, int, (pthread_mutex_t *mutex), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_mutex_destroy, int, (pthread_mutex_t *mutex)); @@ -1181,7 +1181,7 @@ _GL_WARN_ON_USE (pthread_mutex_destroy, "pthread_mutex_destroy is not portable - # undef pthread_rwlock_init # define pthread_rwlock_init rpl_pthread_rwlock_init # endif -_GL_FUNCDECL_RPL (pthread_rwlock_init, int, +_GL_FUNCATTR_RPL (pthread_rwlock_init, int, (pthread_rwlock_t *restrict lock, const pthread_rwlockattr_t *restrict attr), _GL_ARG_NONNULL ((1))); @@ -1190,7 +1190,7 @@ _GL_CXXALIAS_RPL (pthread_rwlock_init, int, const pthread_rwlockattr_t *restrict attr)); # else # if !@HAVE_PTHREAD_RWLOCK_INIT@ -_GL_FUNCDECL_SYS (pthread_rwlock_init, int, +_GL_FUNCATTR_SYS (pthread_rwlock_init, int, (pthread_rwlock_t *restrict lock, const pthread_rwlockattr_t *restrict attr), _GL_ARG_NONNULL ((1))); @@ -1216,12 +1216,12 @@ _GL_WARN_ON_USE (pthread_rwlock_init, "pthread_rwlock_init is not portable - " # undef pthread_rwlockattr_init # define pthread_rwlockattr_init rpl_pthread_rwlockattr_init # endif -_GL_FUNCDECL_RPL (pthread_rwlockattr_init, int, (pthread_rwlockattr_t *attr), +_GL_FUNCATTR_RPL (pthread_rwlockattr_init, int, (pthread_rwlockattr_t *attr), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_rwlockattr_init, int, (pthread_rwlockattr_t *attr)); # else # if !@HAVE_PTHREAD_RWLOCKATTR_INIT@ -_GL_FUNCDECL_SYS (pthread_rwlockattr_init, int, (pthread_rwlockattr_t *attr), +_GL_FUNCATTR_SYS (pthread_rwlockattr_init, int, (pthread_rwlockattr_t *attr), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_rwlockattr_init, int, (pthread_rwlockattr_t *attr)); @@ -1243,13 +1243,13 @@ _GL_WARN_ON_USE (pthread_rwlockattr_init, "pthread_rwlockattr_init is not portab # undef pthread_rwlockattr_destroy # define pthread_rwlockattr_destroy rpl_pthread_rwlockattr_destroy # endif -_GL_FUNCDECL_RPL (pthread_rwlockattr_destroy, int, +_GL_FUNCATTR_RPL (pthread_rwlockattr_destroy, int, (pthread_rwlockattr_t *attr), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_rwlockattr_destroy, int, (pthread_rwlockattr_t *attr)); # else # if !@HAVE_PTHREAD_RWLOCKATTR_DESTROY@ -_GL_FUNCDECL_SYS (pthread_rwlockattr_destroy, int, +_GL_FUNCATTR_SYS (pthread_rwlockattr_destroy, int, (pthread_rwlockattr_t *attr), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_rwlockattr_destroy, int, @@ -1272,12 +1272,12 @@ _GL_WARN_ON_USE (pthread_rwlockattr_destroy, "pthread_rwlockattr_destroy is not # undef pthread_rwlock_rdlock # define pthread_rwlock_rdlock rpl_pthread_rwlock_rdlock # endif -_GL_FUNCDECL_RPL (pthread_rwlock_rdlock, int, (pthread_rwlock_t *lock), +_GL_FUNCATTR_RPL (pthread_rwlock_rdlock, int, (pthread_rwlock_t *lock), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_rwlock_rdlock, int, (pthread_rwlock_t *lock)); # else # if !@HAVE_PTHREAD_RWLOCK_RDLOCK@ -_GL_FUNCDECL_SYS (pthread_rwlock_rdlock, int, (pthread_rwlock_t *lock), +_GL_FUNCATTR_SYS (pthread_rwlock_rdlock, int, (pthread_rwlock_t *lock), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_rwlock_rdlock, int, (pthread_rwlock_t *lock)); @@ -1299,12 +1299,12 @@ _GL_WARN_ON_USE (pthread_rwlock_rdlock, "pthread_rwlock_rdlock is not portable - # undef pthread_rwlock_wrlock # define pthread_rwlock_wrlock rpl_pthread_rwlock_wrlock # endif -_GL_FUNCDECL_RPL (pthread_rwlock_wrlock, int, (pthread_rwlock_t *lock), +_GL_FUNCATTR_RPL (pthread_rwlock_wrlock, int, (pthread_rwlock_t *lock), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_rwlock_wrlock, int, (pthread_rwlock_t *lock)); # else # if !@HAVE_PTHREAD_RWLOCK_WRLOCK@ -_GL_FUNCDECL_SYS (pthread_rwlock_wrlock, int, (pthread_rwlock_t *lock), +_GL_FUNCATTR_SYS (pthread_rwlock_wrlock, int, (pthread_rwlock_t *lock), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_rwlock_wrlock, int, (pthread_rwlock_t *lock)); @@ -1326,12 +1326,12 @@ _GL_WARN_ON_USE (pthread_rwlock_wrlock, "pthread_rwlock_wrlock is not portable - # undef pthread_rwlock_tryrdlock # define pthread_rwlock_tryrdlock rpl_pthread_rwlock_tryrdlock # endif -_GL_FUNCDECL_RPL (pthread_rwlock_tryrdlock, int, (pthread_rwlock_t *lock), +_GL_FUNCATTR_RPL (pthread_rwlock_tryrdlock, int, (pthread_rwlock_t *lock), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_rwlock_tryrdlock, int, (pthread_rwlock_t *lock)); # else # if !@HAVE_PTHREAD_RWLOCK_TRYRDLOCK@ -_GL_FUNCDECL_SYS (pthread_rwlock_tryrdlock, int, (pthread_rwlock_t *lock), +_GL_FUNCATTR_SYS (pthread_rwlock_tryrdlock, int, (pthread_rwlock_t *lock), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_rwlock_tryrdlock, int, (pthread_rwlock_t *lock)); @@ -1353,12 +1353,12 @@ _GL_WARN_ON_USE (pthread_rwlock_tryrdlock, "pthread_rwlock_tryrdlock is not port # undef pthread_rwlock_trywrlock # define pthread_rwlock_trywrlock rpl_pthread_rwlock_trywrlock # endif -_GL_FUNCDECL_RPL (pthread_rwlock_trywrlock, int, (pthread_rwlock_t *lock), +_GL_FUNCATTR_RPL (pthread_rwlock_trywrlock, int, (pthread_rwlock_t *lock), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_rwlock_trywrlock, int, (pthread_rwlock_t *lock)); # else # if !@HAVE_PTHREAD_RWLOCK_TRYWRLOCK@ -_GL_FUNCDECL_SYS (pthread_rwlock_trywrlock, int, (pthread_rwlock_t *lock), +_GL_FUNCATTR_SYS (pthread_rwlock_trywrlock, int, (pthread_rwlock_t *lock), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_rwlock_trywrlock, int, (pthread_rwlock_t *lock)); @@ -1380,7 +1380,7 @@ _GL_WARN_ON_USE (pthread_rwlock_trywrlock, "pthread_rwlock_trywrlock is not port # undef pthread_rwlock_timedrdlock # define pthread_rwlock_timedrdlock rpl_pthread_rwlock_timedrdlock # endif -_GL_FUNCDECL_RPL (pthread_rwlock_timedrdlock, int, +_GL_FUNCATTR_RPL (pthread_rwlock_timedrdlock, int, (pthread_rwlock_t *restrict lock, const struct timespec *restrict abstime), _GL_ARG_NONNULL ((1, 2))); @@ -1389,7 +1389,7 @@ _GL_CXXALIAS_RPL (pthread_rwlock_timedrdlock, int, const struct timespec *restrict abstime)); # else # if !@HAVE_PTHREAD_RWLOCK_TIMEDRDLOCK@ -_GL_FUNCDECL_SYS (pthread_rwlock_timedrdlock, int, +_GL_FUNCATTR_SYS (pthread_rwlock_timedrdlock, int, (pthread_rwlock_t *restrict lock, const struct timespec *restrict abstime), _GL_ARG_NONNULL ((1, 2))); @@ -1415,7 +1415,7 @@ _GL_WARN_ON_USE (pthread_rwlock_timedrdlock, "pthread_rwlock_timedrdlock is not # undef pthread_rwlock_timedwrlock # define pthread_rwlock_timedwrlock rpl_pthread_rwlock_timedwrlock # endif -_GL_FUNCDECL_RPL (pthread_rwlock_timedwrlock, int, +_GL_FUNCATTR_RPL (pthread_rwlock_timedwrlock, int, (pthread_rwlock_t *restrict lock, const struct timespec *restrict abstime), _GL_ARG_NONNULL ((1, 2))); @@ -1424,7 +1424,7 @@ _GL_CXXALIAS_RPL (pthread_rwlock_timedwrlock, int, const struct timespec *restrict abstime)); # else # if !@HAVE_PTHREAD_RWLOCK_TIMEDWRLOCK@ -_GL_FUNCDECL_SYS (pthread_rwlock_timedwrlock, int, +_GL_FUNCATTR_SYS (pthread_rwlock_timedwrlock, int, (pthread_rwlock_t *restrict lock, const struct timespec *restrict abstime), _GL_ARG_NONNULL ((1, 2))); @@ -1450,12 +1450,12 @@ _GL_WARN_ON_USE (pthread_rwlock_timedwrlock, "pthread_rwlock_timedwrlock is not # undef pthread_rwlock_unlock # define pthread_rwlock_unlock rpl_pthread_rwlock_unlock # endif -_GL_FUNCDECL_RPL (pthread_rwlock_unlock, int, (pthread_rwlock_t *lock), +_GL_FUNCATTR_RPL (pthread_rwlock_unlock, int, (pthread_rwlock_t *lock), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_rwlock_unlock, int, (pthread_rwlock_t *lock)); # else # if !@HAVE_PTHREAD_RWLOCK_UNLOCK@ -_GL_FUNCDECL_SYS (pthread_rwlock_unlock, int, (pthread_rwlock_t *lock), +_GL_FUNCATTR_SYS (pthread_rwlock_unlock, int, (pthread_rwlock_t *lock), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_rwlock_unlock, int, (pthread_rwlock_t *lock)); @@ -1477,12 +1477,12 @@ _GL_WARN_ON_USE (pthread_rwlock_unlock, "pthread_rwlock_unlock is not portable - # undef pthread_rwlock_destroy # define pthread_rwlock_destroy rpl_pthread_rwlock_destroy # endif -_GL_FUNCDECL_RPL (pthread_rwlock_destroy, int, (pthread_rwlock_t *lock), +_GL_FUNCATTR_RPL (pthread_rwlock_destroy, int, (pthread_rwlock_t *lock), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_rwlock_destroy, int, (pthread_rwlock_t *lock)); # else # if !@HAVE_PTHREAD_RWLOCK_DESTROY@ -_GL_FUNCDECL_SYS (pthread_rwlock_destroy, int, (pthread_rwlock_t *lock), +_GL_FUNCATTR_SYS (pthread_rwlock_destroy, int, (pthread_rwlock_t *lock), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_rwlock_destroy, int, (pthread_rwlock_t *lock)); @@ -1506,7 +1506,7 @@ _GL_WARN_ON_USE (pthread_rwlock_destroy, "pthread_rwlock_destroy is not portable # undef pthread_cond_init # define pthread_cond_init rpl_pthread_cond_init # endif -_GL_FUNCDECL_RPL (pthread_cond_init, int, +_GL_FUNCATTR_RPL (pthread_cond_init, int, (pthread_cond_t *restrict cond, const pthread_condattr_t *restrict attr), _GL_ARG_NONNULL ((1))); @@ -1515,7 +1515,7 @@ _GL_CXXALIAS_RPL (pthread_cond_init, int, const pthread_condattr_t *restrict attr)); # else # if !@HAVE_PTHREAD_COND_INIT@ -_GL_FUNCDECL_SYS (pthread_cond_init, int, +_GL_FUNCATTR_SYS (pthread_cond_init, int, (pthread_cond_t *restrict cond, const pthread_condattr_t *restrict attr), _GL_ARG_NONNULL ((1))); @@ -1541,12 +1541,12 @@ _GL_WARN_ON_USE (pthread_cond_init, "pthread_cond_init is not portable - " # undef pthread_condattr_init # define pthread_condattr_init rpl_pthread_condattr_init # endif -_GL_FUNCDECL_RPL (pthread_condattr_init, int, (pthread_condattr_t *attr), +_GL_FUNCATTR_RPL (pthread_condattr_init, int, (pthread_condattr_t *attr), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_condattr_init, int, (pthread_condattr_t *attr)); # else # if !@HAVE_PTHREAD_CONDATTR_INIT@ -_GL_FUNCDECL_SYS (pthread_condattr_init, int, (pthread_condattr_t *attr), +_GL_FUNCATTR_SYS (pthread_condattr_init, int, (pthread_condattr_t *attr), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_condattr_init, int, (pthread_condattr_t *attr)); @@ -1568,12 +1568,12 @@ _GL_WARN_ON_USE (pthread_condattr_init, "pthread_condattr_init is not portable - # undef pthread_condattr_destroy # define pthread_condattr_destroy rpl_pthread_condattr_destroy # endif -_GL_FUNCDECL_RPL (pthread_condattr_destroy, int, (pthread_condattr_t *attr), +_GL_FUNCATTR_RPL (pthread_condattr_destroy, int, (pthread_condattr_t *attr), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_condattr_destroy, int, (pthread_condattr_t *attr)); # else # if !@HAVE_PTHREAD_CONDATTR_DESTROY@ -_GL_FUNCDECL_SYS (pthread_condattr_destroy, int, (pthread_condattr_t *attr), +_GL_FUNCATTR_SYS (pthread_condattr_destroy, int, (pthread_condattr_t *attr), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_condattr_destroy, int, (pthread_condattr_t *attr)); @@ -1595,7 +1595,7 @@ _GL_WARN_ON_USE (pthread_condattr_destroy, "pthread_condattr_destroy is not port # undef pthread_cond_wait # define pthread_cond_wait rpl_pthread_cond_wait # endif -_GL_FUNCDECL_RPL (pthread_cond_wait, int, +_GL_FUNCATTR_RPL (pthread_cond_wait, int, (pthread_cond_t *restrict cond, pthread_mutex_t *restrict mutex), _GL_ARG_NONNULL ((1, 2))); @@ -1604,7 +1604,7 @@ _GL_CXXALIAS_RPL (pthread_cond_wait, int, pthread_mutex_t *restrict mutex)); # else # if !@HAVE_PTHREAD_COND_WAIT@ -_GL_FUNCDECL_SYS (pthread_cond_wait, int, +_GL_FUNCATTR_SYS (pthread_cond_wait, int, (pthread_cond_t *restrict cond, pthread_mutex_t *restrict mutex), _GL_ARG_NONNULL ((1, 2))); @@ -1630,7 +1630,7 @@ _GL_WARN_ON_USE (pthread_cond_wait, "pthread_cond_wait is not portable - " # undef pthread_cond_timedwait # define pthread_cond_timedwait rpl_pthread_cond_timedwait # endif -_GL_FUNCDECL_RPL (pthread_cond_timedwait, int, +_GL_FUNCATTR_RPL (pthread_cond_timedwait, int, (pthread_cond_t *restrict cond, pthread_mutex_t *restrict mutex, const struct timespec *restrict abstime), @@ -1641,7 +1641,7 @@ _GL_CXXALIAS_RPL (pthread_cond_timedwait, int, const struct timespec *restrict abstime)); # else # if !@HAVE_PTHREAD_COND_TIMEDWAIT@ -_GL_FUNCDECL_SYS (pthread_cond_timedwait, int, +_GL_FUNCATTR_SYS (pthread_cond_timedwait, int, (pthread_cond_t *restrict cond, pthread_mutex_t *restrict mutex, const struct timespec *restrict abstime), @@ -1669,12 +1669,12 @@ _GL_WARN_ON_USE (pthread_cond_timedwait, "pthread_cond_timedwait is not portable # undef pthread_cond_signal # define pthread_cond_signal rpl_pthread_cond_signal # endif -_GL_FUNCDECL_RPL (pthread_cond_signal, int, (pthread_cond_t *cond), +_GL_FUNCATTR_RPL (pthread_cond_signal, int, (pthread_cond_t *cond), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_cond_signal, int, (pthread_cond_t *cond)); # else # if !@HAVE_PTHREAD_COND_SIGNAL@ -_GL_FUNCDECL_SYS (pthread_cond_signal, int, (pthread_cond_t *cond), +_GL_FUNCATTR_SYS (pthread_cond_signal, int, (pthread_cond_t *cond), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_cond_signal, int, (pthread_cond_t *cond)); @@ -1696,12 +1696,12 @@ _GL_WARN_ON_USE (pthread_cond_signal, "pthread_cond_signal is not portable - " # undef pthread_cond_broadcast # define pthread_cond_broadcast rpl_pthread_cond_broadcast # endif -_GL_FUNCDECL_RPL (pthread_cond_broadcast, int, (pthread_cond_t *cond), +_GL_FUNCATTR_RPL (pthread_cond_broadcast, int, (pthread_cond_t *cond), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_cond_broadcast, int, (pthread_cond_t *cond)); # else # if !@HAVE_PTHREAD_COND_BROADCAST@ -_GL_FUNCDECL_SYS (pthread_cond_broadcast, int, (pthread_cond_t *cond), +_GL_FUNCATTR_SYS (pthread_cond_broadcast, int, (pthread_cond_t *cond), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_cond_broadcast, int, (pthread_cond_t *cond)); @@ -1723,12 +1723,12 @@ _GL_WARN_ON_USE (pthread_cond_broadcast, "pthread_cond_broadcast is not portable # undef pthread_cond_destroy # define pthread_cond_destroy rpl_pthread_cond_destroy # endif -_GL_FUNCDECL_RPL (pthread_cond_destroy, int, (pthread_cond_t *cond), +_GL_FUNCATTR_RPL (pthread_cond_destroy, int, (pthread_cond_t *cond), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_cond_destroy, int, (pthread_cond_t *cond)); # else # if !@HAVE_PTHREAD_COND_DESTROY@ -_GL_FUNCDECL_SYS (pthread_cond_destroy, int, (pthread_cond_t *cond), +_GL_FUNCATTR_SYS (pthread_cond_destroy, int, (pthread_cond_t *cond), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_cond_destroy, int, (pthread_cond_t *cond)); @@ -1752,14 +1752,14 @@ _GL_WARN_ON_USE (pthread_cond_destroy, "pthread_cond_destroy is not portable - " # undef pthread_key_create # define pthread_key_create rpl_pthread_key_create # endif -_GL_FUNCDECL_RPL (pthread_key_create, int, +_GL_FUNCATTR_RPL (pthread_key_create, int, (pthread_key_t *keyp, void (*destructor) (void *)), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_key_create, int, (pthread_key_t *keyp, void (*destructor) (void *))); # else # if !@HAVE_PTHREAD_KEY_CREATE@ -_GL_FUNCDECL_SYS (pthread_key_create, int, +_GL_FUNCATTR_SYS (pthread_key_create, int, (pthread_key_t *keyp, void (*destructor) (void *)), _GL_ARG_NONNULL ((1))); # endif @@ -1864,14 +1864,14 @@ _GL_WARN_ON_USE (pthread_key_delete, "pthread_key_delete is not portable - " # undef pthread_spin_init # define pthread_spin_init rpl_pthread_spin_init # endif -_GL_FUNCDECL_RPL (pthread_spin_init, int, +_GL_FUNCATTR_RPL (pthread_spin_init, int, (pthread_spinlock_t *lock, int shared_across_processes), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_spin_init, int, (pthread_spinlock_t *lock, int shared_across_processes)); # else # if !@HAVE_PTHREAD_SPIN_INIT@ -_GL_FUNCDECL_SYS (pthread_spin_init, int, +_GL_FUNCATTR_SYS (pthread_spin_init, int, (pthread_spinlock_t *lock, int shared_across_processes), _GL_ARG_NONNULL ((1))); # endif @@ -1895,12 +1895,12 @@ _GL_WARN_ON_USE (pthread_spin_init, "pthread_spin_init is not portable - " # undef pthread_spin_lock # define pthread_spin_lock rpl_pthread_spin_lock # endif -_GL_FUNCDECL_RPL (pthread_spin_lock, int, (pthread_spinlock_t *lock), +_GL_FUNCATTR_RPL (pthread_spin_lock, int, (pthread_spinlock_t *lock), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_spin_lock, int, (pthread_spinlock_t *lock)); # else # if !@HAVE_PTHREAD_SPIN_LOCK@ -_GL_FUNCDECL_SYS (pthread_spin_lock, int, (pthread_spinlock_t *lock), +_GL_FUNCATTR_SYS (pthread_spin_lock, int, (pthread_spinlock_t *lock), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_spin_lock, int, (pthread_spinlock_t *lock)); @@ -1922,12 +1922,12 @@ _GL_WARN_ON_USE (pthread_spin_lock, "pthread_spin_lock is not portable - " # undef pthread_spin_trylock # define pthread_spin_trylock rpl_pthread_spin_trylock # endif -_GL_FUNCDECL_RPL (pthread_spin_trylock, int, (pthread_spinlock_t *lock), +_GL_FUNCATTR_RPL (pthread_spin_trylock, int, (pthread_spinlock_t *lock), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_spin_trylock, int, (pthread_spinlock_t *lock)); # else # if !@HAVE_PTHREAD_SPIN_TRYLOCK@ -_GL_FUNCDECL_SYS (pthread_spin_trylock, int, (pthread_spinlock_t *lock), +_GL_FUNCATTR_SYS (pthread_spin_trylock, int, (pthread_spinlock_t *lock), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_spin_trylock, int, (pthread_spinlock_t *lock)); @@ -1949,12 +1949,12 @@ _GL_WARN_ON_USE (pthread_spin_trylock, "pthread_spin_trylock is not portable - " # undef pthread_spin_unlock # define pthread_spin_unlock rpl_pthread_spin_unlock # endif -_GL_FUNCDECL_RPL (pthread_spin_unlock, int, (pthread_spinlock_t *lock), +_GL_FUNCATTR_RPL (pthread_spin_unlock, int, (pthread_spinlock_t *lock), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_spin_unlock, int, (pthread_spinlock_t *lock)); # else # if !@HAVE_PTHREAD_SPIN_UNLOCK@ -_GL_FUNCDECL_SYS (pthread_spin_unlock, int, (pthread_spinlock_t *lock), +_GL_FUNCATTR_SYS (pthread_spin_unlock, int, (pthread_spinlock_t *lock), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_spin_unlock, int, (pthread_spinlock_t *lock)); @@ -1976,12 +1976,12 @@ _GL_WARN_ON_USE (pthread_spin_unlock, "pthread_spin_unlock is not portable - " # undef pthread_spin_destroy # define pthread_spin_destroy rpl_pthread_spin_destroy # endif -_GL_FUNCDECL_RPL (pthread_spin_destroy, int, (pthread_spinlock_t *lock), +_GL_FUNCATTR_RPL (pthread_spin_destroy, int, (pthread_spinlock_t *lock), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (pthread_spin_destroy, int, (pthread_spinlock_t *lock)); # else # if !@HAVE_PTHREAD_SPIN_DESTROY@ -_GL_FUNCDECL_SYS (pthread_spin_destroy, int, (pthread_spinlock_t *lock), +_GL_FUNCATTR_SYS (pthread_spin_destroy, int, (pthread_spinlock_t *lock), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pthread_spin_destroy, int, (pthread_spinlock_t *lock)); diff --git a/lib/search.in.h b/lib/search.in.h index d9cde67062..90854e724e 100644 --- a/lib/search.in.h +++ b/lib/search.in.h @@ -147,7 +147,7 @@ typedef void (*_gl_search_action_fn) (const void *, VISIT, int); If one is found, it is returned. Otherwise, a new element equal to KEY is inserted in the tree and is returned. */ # if @REPLACE_TSEARCH@ -_GL_FUNCDECL_RPL (tsearch, void *, +_GL_FUNCATTR_RPL (tsearch, void *, (const void *key, void **vrootp, _gl_search_compar_fn compar), _GL_ARG_NONNULL ((1, 2, 3))); @@ -156,7 +156,7 @@ _GL_CXXALIAS_RPL (tsearch, void *, _gl_search_compar_fn compar)); # else # if !@HAVE_TSEARCH@ -_GL_FUNCDECL_SYS (tsearch, void *, +_GL_FUNCATTR_SYS (tsearch, void *, (const void *key, void **vrootp, _gl_search_compar_fn compar), _GL_ARG_NONNULL ((1, 2, 3))); @@ -172,7 +172,7 @@ _GL_CXXALIASWARN (tsearch); /* Searches an element in the tree *VROOTP that compares equal to KEY. If one is found, it is returned. Otherwise, NULL is returned. */ # if @REPLACE_TSEARCH@ -_GL_FUNCDECL_RPL (tfind, void *, +_GL_FUNCATTR_RPL (tfind, void *, (const void *key, void *const *vrootp, _gl_search_compar_fn compar), _GL_ARG_NONNULL ((1, 2, 3))); @@ -181,7 +181,7 @@ _GL_CXXALIAS_RPL (tfind, void *, _gl_search_compar_fn compar)); # else # if !@HAVE_TSEARCH@ -_GL_FUNCDECL_SYS (tfind, void *, +_GL_FUNCATTR_SYS (tfind, void *, (const void *key, void *const *vrootp, _gl_search_compar_fn compar), _GL_ARG_NONNULL ((1, 2, 3))); @@ -200,7 +200,7 @@ _GL_CXXALIASWARN (tfind); If one is found, it is removed from the tree, and its parent node is returned. Otherwise, NULL is returned. */ # if @REPLACE_TSEARCH@ -_GL_FUNCDECL_RPL (tdelete, void *, +_GL_FUNCATTR_RPL (tdelete, void *, (const void *restrict key, void **restrict vrootp, _gl_search_compar_fn compar), _GL_ARG_NONNULL ((1, 2, 3))); @@ -209,7 +209,7 @@ _GL_CXXALIAS_RPL (tdelete, void *, _gl_search_compar_fn compar)); # else # if !@HAVE_TSEARCH@ -_GL_FUNCDECL_SYS (tdelete, void *, +_GL_FUNCATTR_SYS (tdelete, void *, (const void *restrict key, void **restrict vrootp, _gl_search_compar_fn compar), _GL_ARG_NONNULL ((1, 2, 3))); @@ -234,14 +234,14 @@ _GL_CXXALIASWARN (tdelete); 2. an indicator which visit of the node this is, 3. the level of the node in the tree (0 for the root). */ # if @REPLACE_TWALK@ -_GL_FUNCDECL_RPL (twalk, void, +_GL_FUNCATTR_RPL (twalk, void, (const void *vroot, _gl_search_action_fn action), _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (twalk, void, (const void *vroot, _gl_search_action_fn action)); # else # if !@HAVE_TWALK@ -_GL_FUNCDECL_SYS (twalk, void, +_GL_FUNCATTR_SYS (twalk, void, (const void *vroot, _gl_search_action_fn action), _GL_ARG_NONNULL ((2))); # endif diff --git a/lib/signal.in.h b/lib/signal.in.h index a0effa21ba..1d198283c0 100644 --- a/lib/signal.in.h +++ b/lib/signal.in.h @@ -284,7 +284,7 @@ typedef int verify_NSIG_constraint[NSIG <= 32 ? 1 : -1]; # undef sigismember # endif # else -_GL_FUNCDECL_SYS (sigismember, int, (const sigset_t *set, int sig), +_GL_FUNCATTR_SYS (sigismember, int, (const sigset_t *set, int sig), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (sigismember, int, (const sigset_t *set, int sig)); @@ -297,7 +297,7 @@ _GL_CXXALIASWARN (sigismember); # undef sigemptyset # endif # else -_GL_FUNCDECL_SYS (sigemptyset, int, (sigset_t *set), _GL_ARG_NONNULL ((1))); +_GL_FUNCATTR_SYS (sigemptyset, int, (sigset_t *set), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (sigemptyset, int, (sigset_t *set)); _GL_CXXALIASWARN (sigemptyset); @@ -309,7 +309,7 @@ _GL_CXXALIASWARN (sigemptyset); # undef sigaddset # endif # else -_GL_FUNCDECL_SYS (sigaddset, int, (sigset_t *set, int sig), +_GL_FUNCATTR_SYS (sigaddset, int, (sigset_t *set, int sig), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (sigaddset, int, (sigset_t *set, int sig)); @@ -322,7 +322,7 @@ _GL_CXXALIASWARN (sigaddset); # undef sigdelset # endif # else -_GL_FUNCDECL_SYS (sigdelset, int, (sigset_t *set, int sig), +_GL_FUNCATTR_SYS (sigdelset, int, (sigset_t *set, int sig), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (sigdelset, int, (sigset_t *set, int sig)); @@ -335,14 +335,14 @@ _GL_CXXALIASWARN (sigdelset); # undef sigfillset # endif # else -_GL_FUNCDECL_SYS (sigfillset, int, (sigset_t *set), _GL_ARG_NONNULL ((1))); +_GL_FUNCATTR_SYS (sigfillset, int, (sigset_t *set), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (sigfillset, int, (sigset_t *set)); _GL_CXXALIASWARN (sigfillset); /* Return the set of those blocked signals that are pending. */ # if !@HAVE_POSIX_SIGNALBLOCKING@ -_GL_FUNCDECL_SYS (sigpending, int, (sigset_t *set), _GL_ARG_NONNULL ((1))); +_GL_FUNCATTR_SYS (sigpending, int, (sigset_t *set), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (sigpending, int, (sigset_t *set)); _GL_CXXALIASWARN (sigpending); diff --git a/lib/spawn.in.h b/lib/spawn.in.h index 5f42407d87..b4923e1968 100644 --- a/lib/spawn.in.h +++ b/lib/spawn.in.h @@ -204,7 +204,7 @@ typedef int verify_POSIX_SPAWN_USEVFORK_no_overlap # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define posix_spawn rpl_posix_spawn # endif -_GL_FUNCDECL_RPL (posix_spawn, int, +_GL_FUNCATTR_RPL (posix_spawn, int, (pid_t *_Restrict_ __pid, const char *_Restrict_ __path, const posix_spawn_file_actions_t *_Restrict_ __file_actions, @@ -221,7 +221,7 @@ _GL_CXXALIAS_RPL (posix_spawn, int, char *const envp[_Restrict_arr_])); # else # if !@HAVE_POSIX_SPAWN@ -_GL_FUNCDECL_SYS (posix_spawn, int, +_GL_FUNCATTR_SYS (posix_spawn, int, (pid_t *_Restrict_ __pid, const char *_Restrict_ __path, const posix_spawn_file_actions_t *_Restrict_ __file_actions, @@ -258,7 +258,7 @@ _GL_WARN_ON_USE (posix_spawn, "posix_spawn is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define posix_spawnp rpl_posix_spawnp # endif -_GL_FUNCDECL_RPL (posix_spawnp, int, +_GL_FUNCATTR_RPL (posix_spawnp, int, (pid_t *__pid, const char *__file, const posix_spawn_file_actions_t *__file_actions, const posix_spawnattr_t *__attrp, @@ -271,7 +271,7 @@ _GL_CXXALIAS_RPL (posix_spawnp, int, char *const argv[], char *const envp[])); # else # if !@HAVE_POSIX_SPAWN@ -_GL_FUNCDECL_SYS (posix_spawnp, int, +_GL_FUNCATTR_SYS (posix_spawnp, int, (pid_t *__pid, const char *__file, const posix_spawn_file_actions_t *__file_actions, const posix_spawnattr_t *__attrp, @@ -302,12 +302,12 @@ _GL_WARN_ON_USE (posix_spawnp, "posix_spawnp is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define posix_spawnattr_init rpl_posix_spawnattr_init # endif -_GL_FUNCDECL_RPL (posix_spawnattr_init, int, (posix_spawnattr_t *__attr), +_GL_FUNCATTR_RPL (posix_spawnattr_init, int, (posix_spawnattr_t *__attr), _GL_ARG_NONNULL ((1))) __THROW; _GL_CXXALIAS_RPL (posix_spawnattr_init, int, (posix_spawnattr_t *__attr)); # else # if !@HAVE_POSIX_SPAWN@ -_GL_FUNCDECL_SYS (posix_spawnattr_init, int, (posix_spawnattr_t *__attr), +_GL_FUNCATTR_SYS (posix_spawnattr_init, int, (posix_spawnattr_t *__attr), _GL_ARG_NONNULL ((1))) __THROW; # endif _GL_CXXALIAS_SYS (posix_spawnattr_init, int, (posix_spawnattr_t *__attr)); @@ -329,12 +329,12 @@ _GL_WARN_ON_USE (posix_spawnattr_init, "posix_spawnattr_init is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define posix_spawnattr_destroy rpl_posix_spawnattr_destroy # endif -_GL_FUNCDECL_RPL (posix_spawnattr_destroy, int, (posix_spawnattr_t *__attr), +_GL_FUNCATTR_RPL (posix_spawnattr_destroy, int, (posix_spawnattr_t *__attr), _GL_ARG_NONNULL ((1))) __THROW; _GL_CXXALIAS_RPL (posix_spawnattr_destroy, int, (posix_spawnattr_t *__attr)); # else # if !@HAVE_POSIX_SPAWN@ -_GL_FUNCDECL_SYS (posix_spawnattr_destroy, int, (posix_spawnattr_t *__attr), +_GL_FUNCATTR_SYS (posix_spawnattr_destroy, int, (posix_spawnattr_t *__attr), _GL_ARG_NONNULL ((1))) __THROW; # endif _GL_CXXALIAS_SYS (posix_spawnattr_destroy, int, (posix_spawnattr_t *__attr)); @@ -358,7 +358,7 @@ _GL_WARN_ON_USE (posix_spawnattr_destroy, # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define posix_spawnattr_getsigdefault rpl_posix_spawnattr_getsigdefault # endif -_GL_FUNCDECL_RPL (posix_spawnattr_getsigdefault, int, +_GL_FUNCATTR_RPL (posix_spawnattr_getsigdefault, int, (const posix_spawnattr_t *_Restrict_ __attr, sigset_t *_Restrict_ __sigdefault), _GL_ARG_NONNULL ((1, 2))) __THROW; @@ -367,7 +367,7 @@ _GL_CXXALIAS_RPL (posix_spawnattr_getsigdefault, int, sigset_t *_Restrict_ __sigdefault)); # else # if !@HAVE_POSIX_SPAWN@ -_GL_FUNCDECL_SYS (posix_spawnattr_getsigdefault, int, +_GL_FUNCATTR_SYS (posix_spawnattr_getsigdefault, int, (const posix_spawnattr_t *_Restrict_ __attr, sigset_t *_Restrict_ __sigdefault), _GL_ARG_NONNULL ((1, 2))) __THROW; @@ -394,7 +394,7 @@ _GL_WARN_ON_USE (posix_spawnattr_getsigdefault, # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define posix_spawnattr_setsigdefault rpl_posix_spawnattr_setsigdefault # endif -_GL_FUNCDECL_RPL (posix_spawnattr_setsigdefault, int, +_GL_FUNCATTR_RPL (posix_spawnattr_setsigdefault, int, (posix_spawnattr_t *_Restrict_ __attr, const sigset_t *_Restrict_ __sigdefault), _GL_ARG_NONNULL ((1, 2))) __THROW; @@ -403,7 +403,7 @@ _GL_CXXALIAS_RPL (posix_spawnattr_setsigdefault, int, const sigset_t *_Restrict_ __sigdefault)); # else # if !@HAVE_POSIX_SPAWN@ -_GL_FUNCDECL_SYS (posix_spawnattr_setsigdefault, int, +_GL_FUNCATTR_SYS (posix_spawnattr_setsigdefault, int, (posix_spawnattr_t *_Restrict_ __attr, const sigset_t *_Restrict_ __sigdefault), _GL_ARG_NONNULL ((1, 2))) __THROW; @@ -430,7 +430,7 @@ _GL_WARN_ON_USE (posix_spawnattr_setsigdefault, # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define posix_spawnattr_getsigmask rpl_posix_spawnattr_getsigmask # endif -_GL_FUNCDECL_RPL (posix_spawnattr_getsigmask, int, +_GL_FUNCATTR_RPL (posix_spawnattr_getsigmask, int, (const posix_spawnattr_t *_Restrict_ __attr, sigset_t *_Restrict_ __sigmask), _GL_ARG_NONNULL ((1, 2))) __THROW; @@ -439,7 +439,7 @@ _GL_CXXALIAS_RPL (posix_spawnattr_getsigmask, int, sigset_t *_Restrict_ __sigmask)); # else # if !@HAVE_POSIX_SPAWN@ -_GL_FUNCDECL_SYS (posix_spawnattr_getsigmask, int, +_GL_FUNCATTR_SYS (posix_spawnattr_getsigmask, int, (const posix_spawnattr_t *_Restrict_ __attr, sigset_t *_Restrict_ __sigmask), _GL_ARG_NONNULL ((1, 2))) __THROW; @@ -466,7 +466,7 @@ _GL_WARN_ON_USE (posix_spawnattr_getsigmask, # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define posix_spawnattr_setsigmask rpl_posix_spawnattr_setsigmask # endif -_GL_FUNCDECL_RPL (posix_spawnattr_setsigmask, int, +_GL_FUNCATTR_RPL (posix_spawnattr_setsigmask, int, (posix_spawnattr_t *_Restrict_ __attr, const sigset_t *_Restrict_ __sigmask), _GL_ARG_NONNULL ((1, 2))) __THROW; @@ -475,7 +475,7 @@ _GL_CXXALIAS_RPL (posix_spawnattr_setsigmask, int, const sigset_t *_Restrict_ __sigmask)); # else # if !@HAVE_POSIX_SPAWN@ -_GL_FUNCDECL_SYS (posix_spawnattr_setsigmask, int, +_GL_FUNCATTR_SYS (posix_spawnattr_setsigmask, int, (posix_spawnattr_t *_Restrict_ __attr, const sigset_t *_Restrict_ __sigmask), _GL_ARG_NONNULL ((1, 2))) __THROW; @@ -502,7 +502,7 @@ _GL_WARN_ON_USE (posix_spawnattr_setsigmask, # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define posix_spawnattr_getflags rpl_posix_spawnattr_getflags # endif -_GL_FUNCDECL_RPL (posix_spawnattr_getflags, int, +_GL_FUNCATTR_RPL (posix_spawnattr_getflags, int, (const posix_spawnattr_t *_Restrict_ __attr, short int *_Restrict_ __flags), _GL_ARG_NONNULL ((1, 2))) __THROW; @@ -511,7 +511,7 @@ _GL_CXXALIAS_RPL (posix_spawnattr_getflags, int, short int *_Restrict_ __flags)); # else # if !@HAVE_POSIX_SPAWN@ -_GL_FUNCDECL_SYS (posix_spawnattr_getflags, int, +_GL_FUNCATTR_SYS (posix_spawnattr_getflags, int, (const posix_spawnattr_t *_Restrict_ __attr, short int *_Restrict_ __flags), _GL_ARG_NONNULL ((1, 2))) __THROW; @@ -538,14 +538,14 @@ _GL_WARN_ON_USE (posix_spawnattr_getflags, # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define posix_spawnattr_setflags rpl_posix_spawnattr_setflags # endif -_GL_FUNCDECL_RPL (posix_spawnattr_setflags, int, +_GL_FUNCATTR_RPL (posix_spawnattr_setflags, int, (posix_spawnattr_t *__attr, short int __flags), _GL_ARG_NONNULL ((1))) __THROW; _GL_CXXALIAS_RPL (posix_spawnattr_setflags, int, (posix_spawnattr_t *__attr, short int __flags)); # else # if !@HAVE_POSIX_SPAWN@ -_GL_FUNCDECL_SYS (posix_spawnattr_setflags, int, +_GL_FUNCATTR_SYS (posix_spawnattr_setflags, int, (posix_spawnattr_t *__attr, short int __flags), _GL_ARG_NONNULL ((1))) __THROW; # endif @@ -570,7 +570,7 @@ _GL_WARN_ON_USE (posix_spawnattr_setflags, # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define posix_spawnattr_getpgroup rpl_posix_spawnattr_getpgroup # endif -_GL_FUNCDECL_RPL (posix_spawnattr_getpgroup, int, +_GL_FUNCATTR_RPL (posix_spawnattr_getpgroup, int, (const posix_spawnattr_t *_Restrict_ __attr, pid_t *_Restrict_ __pgroup), _GL_ARG_NONNULL ((1, 2))) __THROW; @@ -579,7 +579,7 @@ _GL_CXXALIAS_RPL (posix_spawnattr_getpgroup, int, pid_t *_Restrict_ __pgroup)); # else # if !@HAVE_POSIX_SPAWN@ -_GL_FUNCDECL_SYS (posix_spawnattr_getpgroup, int, +_GL_FUNCATTR_SYS (posix_spawnattr_getpgroup, int, (const posix_spawnattr_t *_Restrict_ __attr, pid_t *_Restrict_ __pgroup), _GL_ARG_NONNULL ((1, 2))) __THROW; @@ -606,14 +606,14 @@ _GL_WARN_ON_USE (posix_spawnattr_getpgroup, # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define posix_spawnattr_setpgroup rpl_posix_spawnattr_setpgroup # endif -_GL_FUNCDECL_RPL (posix_spawnattr_setpgroup, int, +_GL_FUNCATTR_RPL (posix_spawnattr_setpgroup, int, (posix_spawnattr_t *__attr, pid_t __pgroup), _GL_ARG_NONNULL ((1))) __THROW; _GL_CXXALIAS_RPL (posix_spawnattr_setpgroup, int, (posix_spawnattr_t *__attr, pid_t __pgroup)); # else # if !@HAVE_POSIX_SPAWN@ -_GL_FUNCDECL_SYS (posix_spawnattr_setpgroup, int, +_GL_FUNCATTR_SYS (posix_spawnattr_setpgroup, int, (posix_spawnattr_t *__attr, pid_t __pgroup), _GL_ARG_NONNULL ((1))) __THROW; # endif @@ -638,7 +638,7 @@ _GL_WARN_ON_USE (posix_spawnattr_setpgroup, # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define posix_spawnattr_getschedpolicy rpl_posix_spawnattr_getschedpolicy # endif -_GL_FUNCDECL_RPL (posix_spawnattr_getschedpolicy, int, +_GL_FUNCATTR_RPL (posix_spawnattr_getschedpolicy, int, (const posix_spawnattr_t *_Restrict_ __attr, int *_Restrict_ __schedpolicy), _GL_ARG_NONNULL ((1, 2))) __THROW; @@ -647,7 +647,7 @@ _GL_CXXALIAS_RPL (posix_spawnattr_getschedpolicy, int, int *_Restrict_ __schedpolicy)); # else # if !@HAVE_POSIX_SPAWN@ || POSIX_SPAWN_SETSCHEDULER == 0 -_GL_FUNCDECL_SYS (posix_spawnattr_getschedpolicy, int, +_GL_FUNCATTR_SYS (posix_spawnattr_getschedpolicy, int, (const posix_spawnattr_t *_Restrict_ __attr, int *_Restrict_ __schedpolicy), _GL_ARG_NONNULL ((1, 2))) __THROW; @@ -674,14 +674,14 @@ _GL_WARN_ON_USE (posix_spawnattr_getschedpolicy, # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define posix_spawnattr_setschedpolicy rpl_posix_spawnattr_setschedpolicy # endif -_GL_FUNCDECL_RPL (posix_spawnattr_setschedpolicy, int, +_GL_FUNCATTR_RPL (posix_spawnattr_setschedpolicy, int, (posix_spawnattr_t *__attr, int __schedpolicy), _GL_ARG_NONNULL ((1))) __THROW; _GL_CXXALIAS_RPL (posix_spawnattr_setschedpolicy, int, (posix_spawnattr_t *__attr, int __schedpolicy)); # else # if !@HAVE_POSIX_SPAWN@ || POSIX_SPAWN_SETSCHEDULER == 0 -_GL_FUNCDECL_SYS (posix_spawnattr_setschedpolicy, int, +_GL_FUNCATTR_SYS (posix_spawnattr_setschedpolicy, int, (posix_spawnattr_t *__attr, int __schedpolicy), _GL_ARG_NONNULL ((1))) __THROW; # endif @@ -706,7 +706,7 @@ _GL_WARN_ON_USE (posix_spawnattr_setschedpolicy, # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define posix_spawnattr_getschedparam rpl_posix_spawnattr_getschedparam # endif -_GL_FUNCDECL_RPL (posix_spawnattr_getschedparam, int, +_GL_FUNCATTR_RPL (posix_spawnattr_getschedparam, int, (const posix_spawnattr_t *_Restrict_ __attr, struct sched_param *_Restrict_ __schedparam), _GL_ARG_NONNULL ((1, 2))) __THROW; @@ -715,7 +715,7 @@ _GL_CXXALIAS_RPL (posix_spawnattr_getschedparam, int, struct sched_param *_Restrict_ __schedparam)); # else # if !@HAVE_POSIX_SPAWN@ || POSIX_SPAWN_SETSCHEDPARAM == 0 -_GL_FUNCDECL_SYS (posix_spawnattr_getschedparam, int, +_GL_FUNCATTR_SYS (posix_spawnattr_getschedparam, int, (const posix_spawnattr_t *_Restrict_ __attr, struct sched_param *_Restrict_ __schedparam), _GL_ARG_NONNULL ((1, 2))) __THROW; @@ -742,7 +742,7 @@ _GL_WARN_ON_USE (posix_spawnattr_getschedparam, # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define posix_spawnattr_setschedparam rpl_posix_spawnattr_setschedparam # endif -_GL_FUNCDECL_RPL (posix_spawnattr_setschedparam, int, +_GL_FUNCATTR_RPL (posix_spawnattr_setschedparam, int, (posix_spawnattr_t *_Restrict_ __attr, const struct sched_param *_Restrict_ __schedparam), _GL_ARG_NONNULL ((1, 2))) __THROW; @@ -751,7 +751,7 @@ _GL_CXXALIAS_RPL (posix_spawnattr_setschedparam, int, const struct sched_param *_Restrict_ __schedparam)); # else # if !@HAVE_POSIX_SPAWN@ || POSIX_SPAWN_SETSCHEDPARAM == 0 -_GL_FUNCDECL_SYS (posix_spawnattr_setschedparam, int, +_GL_FUNCATTR_SYS (posix_spawnattr_setschedparam, int, (posix_spawnattr_t *_Restrict_ __attr, const struct sched_param *_Restrict_ __schedparam), _GL_ARG_NONNULL ((1, 2))) __THROW; @@ -779,14 +779,14 @@ _GL_WARN_ON_USE (posix_spawnattr_setschedparam, # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define posix_spawn_file_actions_init rpl_posix_spawn_file_actions_init # endif -_GL_FUNCDECL_RPL (posix_spawn_file_actions_init, int, +_GL_FUNCATTR_RPL (posix_spawn_file_actions_init, int, (posix_spawn_file_actions_t *__file_actions), _GL_ARG_NONNULL ((1))) __THROW; _GL_CXXALIAS_RPL (posix_spawn_file_actions_init, int, (posix_spawn_file_actions_t *__file_actions)); # else # if !@HAVE_POSIX_SPAWN@ -_GL_FUNCDECL_SYS (posix_spawn_file_actions_init, int, +_GL_FUNCATTR_SYS (posix_spawn_file_actions_init, int, (posix_spawn_file_actions_t *__file_actions), _GL_ARG_NONNULL ((1))) __THROW; # endif @@ -811,14 +811,14 @@ _GL_WARN_ON_USE (posix_spawn_file_actions_init, # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define posix_spawn_file_actions_destroy rpl_posix_spawn_file_actions_destroy # endif -_GL_FUNCDECL_RPL (posix_spawn_file_actions_destroy, int, +_GL_FUNCATTR_RPL (posix_spawn_file_actions_destroy, int, (posix_spawn_file_actions_t *__file_actions), _GL_ARG_NONNULL ((1))) __THROW; _GL_CXXALIAS_RPL (posix_spawn_file_actions_destroy, int, (posix_spawn_file_actions_t *__file_actions)); # else # if !@HAVE_POSIX_SPAWN@ -_GL_FUNCDECL_SYS (posix_spawn_file_actions_destroy, int, +_GL_FUNCATTR_SYS (posix_spawn_file_actions_destroy, int, (posix_spawn_file_actions_t *__file_actions), _GL_ARG_NONNULL ((1))) __THROW; # endif @@ -844,7 +844,7 @@ _GL_WARN_ON_USE (posix_spawn_file_actions_destroy, # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define posix_spawn_file_actions_addopen rpl_posix_spawn_file_actions_addopen # endif -_GL_FUNCDECL_RPL (posix_spawn_file_actions_addopen, int, +_GL_FUNCATTR_RPL (posix_spawn_file_actions_addopen, int, (posix_spawn_file_actions_t *_Restrict_ __file_actions, int __fd, const char *_Restrict_ __path, int __oflag, mode_t __mode), @@ -855,7 +855,7 @@ _GL_CXXALIAS_RPL (posix_spawn_file_actions_addopen, int, const char *_Restrict_ __path, int __oflag, mode_t __mode)); # else # if !@HAVE_POSIX_SPAWN@ -_GL_FUNCDECL_SYS (posix_spawn_file_actions_addopen, int, +_GL_FUNCATTR_SYS (posix_spawn_file_actions_addopen, int, (posix_spawn_file_actions_t *_Restrict_ __file_actions, int __fd, const char *_Restrict_ __path, int __oflag, mode_t __mode), @@ -885,14 +885,14 @@ _GL_WARN_ON_USE (posix_spawn_file_actions_addopen, # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define posix_spawn_file_actions_addclose rpl_posix_spawn_file_actions_addclose # endif -_GL_FUNCDECL_RPL (posix_spawn_file_actions_addclose, int, +_GL_FUNCATTR_RPL (posix_spawn_file_actions_addclose, int, (posix_spawn_file_actions_t *__file_actions, int __fd), _GL_ARG_NONNULL ((1))) __THROW; _GL_CXXALIAS_RPL (posix_spawn_file_actions_addclose, int, (posix_spawn_file_actions_t *__file_actions, int __fd)); # else # if !@HAVE_POSIX_SPAWN@ -_GL_FUNCDECL_SYS (posix_spawn_file_actions_addclose, int, +_GL_FUNCATTR_SYS (posix_spawn_file_actions_addclose, int, (posix_spawn_file_actions_t *__file_actions, int __fd), _GL_ARG_NONNULL ((1))) __THROW; # endif @@ -918,7 +918,7 @@ _GL_WARN_ON_USE (posix_spawn_file_actions_addclose, # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define posix_spawn_file_actions_adddup2 rpl_posix_spawn_file_actions_adddup2 # endif -_GL_FUNCDECL_RPL (posix_spawn_file_actions_adddup2, int, +_GL_FUNCATTR_RPL (posix_spawn_file_actions_adddup2, int, (posix_spawn_file_actions_t *__file_actions, int __fd, int __newfd), _GL_ARG_NONNULL ((1))) __THROW; @@ -927,7 +927,7 @@ _GL_CXXALIAS_RPL (posix_spawn_file_actions_adddup2, int, int __fd, int __newfd)); # else # if !@HAVE_POSIX_SPAWN@ -_GL_FUNCDECL_SYS (posix_spawn_file_actions_adddup2, int, +_GL_FUNCATTR_SYS (posix_spawn_file_actions_adddup2, int, (posix_spawn_file_actions_t *__file_actions, int __fd, int __newfd), _GL_ARG_NONNULL ((1))) __THROW; @@ -955,7 +955,7 @@ _GL_WARN_ON_USE (posix_spawn_file_actions_adddup2, # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define posix_spawn_file_actions_addchdir rpl_posix_spawn_file_actions_addchdir # endif -_GL_FUNCDECL_RPL (posix_spawn_file_actions_addchdir, int, +_GL_FUNCATTR_RPL (posix_spawn_file_actions_addchdir, int, (posix_spawn_file_actions_t *_Restrict_ __file_actions, const char *_Restrict_ __path), _GL_ARG_NONNULL ((1, 2))) __THROW; @@ -964,7 +964,7 @@ _GL_CXXALIAS_RPL (posix_spawn_file_actions_addchdir, int, const char *_Restrict_ __path)); # else # if !@HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR@ -_GL_FUNCDECL_SYS (posix_spawn_file_actions_addchdir, int, +_GL_FUNCATTR_SYS (posix_spawn_file_actions_addchdir, int, (posix_spawn_file_actions_t *_Restrict_ __file_actions, const char *_Restrict_ __path), _GL_ARG_NONNULL ((1, 2))) __THROW; @@ -992,7 +992,7 @@ _GL_WARN_ON_USE (posix_spawn_file_actions_addchdir, # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define posix_spawn_file_actions_addfchdir rpl_posix_spawn_file_actions_addfchdir # endif -_GL_FUNCDECL_RPL (posix_spawn_file_actions_addfchdir, int, +_GL_FUNCATTR_RPL (posix_spawn_file_actions_addfchdir, int, (posix_spawn_file_actions_t *_Restrict_ __file_actions, int __fd), _GL_ARG_NONNULL ((1))) __THROW; @@ -1001,7 +1001,7 @@ _GL_CXXALIAS_RPL (posix_spawn_file_actions_addfchdir, int, int __fd)); # else # if !@HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDFCHDIR@ -_GL_FUNCDECL_SYS (posix_spawn_file_actions_addfchdir, int, +_GL_FUNCATTR_SYS (posix_spawn_file_actions_addfchdir, int, (posix_spawn_file_actions_t *_Restrict_ __file_actions, int __fd), _GL_ARG_NONNULL ((1))) __THROW; diff --git a/lib/stdio.in.h b/lib/stdio.in.h index 36fd6a72ce..5e967f6a35 100644 --- a/lib/stdio.in.h +++ b/lib/stdio.in.h @@ -288,7 +288,7 @@ Therefore, if the format string is valid and does not use %ls/%lc directives nor widths, the only possible failure codes are ENOMEM and the possible failure codes from write(), excluding EINTR. */ -_GL_FUNCDECL_SYS (dzprintf, off64_t, +_GL_FUNCATTR_SYS (dzprintf, off64_t, (int fd, const char *restrict format, ...), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3) _GL_ARG_NONNULL ((2))); @@ -304,13 +304,13 @@ _GL_CXXALIAS_SYS (dzprintf, off64_t, # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define dprintf rpl_dprintf # endif -_GL_FUNCDECL_RPL (dprintf, int, (int fd, const char *restrict format, ...), +_GL_FUNCATTR_RPL (dprintf, int, (int fd, const char *restrict format, ...), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3) _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (dprintf, int, (int fd, const char *restrict format, ...)); # else # if !@HAVE_DPRINTF@ -_GL_FUNCDECL_SYS (dprintf, int, (int fd, const char *restrict format, ...), +_GL_FUNCATTR_SYS (dprintf, int, (int fd, const char *restrict format, ...), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3) _GL_ARG_NONNULL ((2))); # endif @@ -333,7 +333,7 @@ _GL_WARN_ON_USE (dprintf, "dprintf is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define fclose rpl_fclose # endif -_GL_FUNCDECL_RPL (fclose, int, (FILE *stream), _GL_ARG_NONNULL ((1))); +_GL_FUNCATTR_RPL (fclose, int, (FILE *stream), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (fclose, int, (FILE *stream)); # else _GL_CXXALIAS_SYS (fclose, int, (FILE *stream)); @@ -379,7 +379,7 @@ _GL_CXXALIASWARN (fcloseall); # undef fdopen # define fdopen rpl_fdopen # endif -_GL_FUNCDECL_RPL (fdopen, FILE *, +_GL_FUNCATTR_RPL (fdopen, FILE *, (int fd, const char *mode), _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1) _GL_ATTRIBUTE_MALLOC @@ -395,14 +395,14 @@ _GL_CXXALIAS_MDA (fdopen, FILE *, (int fd, const char *mode)); # if __GNUC__ >= 11 && !defined __clang__ /* For -Wmismatched-dealloc: Associate fdopen with fclose or rpl_fclose. */ # if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 -_GL_FUNCDECL_SYS (fdopen, FILE *, +_GL_FUNCATTR_SYS (fdopen, FILE *, (int fd, const char *mode), _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_NODISCARD) _GL_ATTRIBUTE_NOTHROW; # else -_GL_FUNCDECL_SYS (fdopen, FILE *, +_GL_FUNCATTR_SYS (fdopen, FILE *, (int fd, const char *mode), _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1) _GL_ATTRIBUTE_MALLOC @@ -416,13 +416,13 @@ _GL_CXXALIASWARN (fdopen); # if @GNULIB_FCLOSE@ && (__GNUC__ >= 11 && !defined __clang__) && !defined fdopen /* For -Wmismatched-dealloc: Associate fdopen with fclose or rpl_fclose. */ # if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 -_GL_FUNCDECL_SYS (fdopen, FILE *, +_GL_FUNCATTR_SYS (fdopen, FILE *, (int fd, const char *mode), _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1) _GL_ATTRIBUTE_MALLOC) _GL_ATTRIBUTE_NOTHROW; # else -_GL_FUNCDECL_SYS (fdopen, FILE *, +_GL_FUNCATTR_SYS (fdopen, FILE *, (int fd, const char *mode), _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1) _GL_ATTRIBUTE_MALLOC); @@ -482,7 +482,7 @@ _GL_WARN_ON_USE (fflush, "fflush is not always POSIX compliant - " # undef fgetc # define fgetc rpl_fgetc # endif -_GL_FUNCDECL_RPL (fgetc, int, (FILE *stream), _GL_ARG_NONNULL ((1))); +_GL_FUNCATTR_RPL (fgetc, int, (FILE *stream), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (fgetc, int, (FILE *stream)); # else _GL_CXXALIAS_SYS (fgetc, int, (FILE *stream)); @@ -498,7 +498,7 @@ _GL_CXXALIASWARN (fgetc); # undef fgets # define fgets rpl_fgets # endif -_GL_FUNCDECL_RPL (fgets, char *, +_GL_FUNCATTR_RPL (fgets, char *, (char *restrict s, int n, FILE *restrict stream), _GL_ARG_NONNULL ((1, 3)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (fgets, char *, @@ -535,7 +535,7 @@ _GL_CXXALIASWARN (fileno); # undef fopen # define fopen rpl_fopen # endif -_GL_FUNCDECL_RPL (fopen, FILE *, +_GL_FUNCATTR_RPL (fopen, FILE *, (const char *restrict filename, const char *restrict mode), _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_NODISCARD); @@ -544,7 +544,7 @@ _GL_CXXALIAS_RPL (fopen, FILE *, # else # if __GNUC__ >= 11 && !defined __clang__ /* For -Wmismatched-dealloc: Associate fopen with fclose or rpl_fclose. */ -_GL_FUNCDECL_SYS (fopen, FILE *, +_GL_FUNCATTR_SYS (fopen, FILE *, (const char *restrict filename, const char *restrict mode), _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1) _GL_ATTRIBUTE_NODISCARD); @@ -558,7 +558,7 @@ _GL_CXXALIASWARN (fopen); #else # if @GNULIB_FCLOSE@ && (__GNUC__ >= 11 && !defined __clang__) && !defined fopen /* For -Wmismatched-dealloc: Associate fopen with fclose or rpl_fclose. */ -_GL_FUNCDECL_SYS (fopen, FILE *, +_GL_FUNCATTR_SYS (fopen, FILE *, (const char *restrict filename, const char *restrict mode), _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)); # endif @@ -578,7 +578,7 @@ _GL_WARN_ON_USE (fopen, "fopen on native Windows platforms is not POSIX complian Therefore, if the format string is valid and does not use %ls/%lc directives nor widths, the only possible failure causes are ENOMEM and the possible failure causes from fwrite(). */ -_GL_FUNCDECL_SYS (fzprintf, off64_t, +_GL_FUNCATTR_SYS (fzprintf, off64_t, (FILE *restrict fp, const char *restrict format, ...), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3) _GL_ARG_NONNULL ((1, 2))); @@ -597,12 +597,12 @@ _GL_CXXALIAS_SYS (fzprintf, off64_t, # endif # define GNULIB_overrides_fprintf 1 # if @GNULIB_FPRINTF_POSIX@ || @GNULIB_VFPRINTF_POSIX@ -_GL_FUNCDECL_RPL (fprintf, int, +_GL_FUNCATTR_RPL (fprintf, int, (FILE *restrict fp, const char *restrict format, ...), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3) _GL_ARG_NONNULL ((1, 2))); # else -_GL_FUNCDECL_RPL (fprintf, int, +_GL_FUNCATTR_RPL (fprintf, int, (FILE *restrict fp, const char *restrict format, ...), _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM (2, 3) _GL_ARG_NONNULL ((1, 2))); @@ -638,11 +638,11 @@ _GL_WARN_ON_USE (fprintf, "fprintf is not always POSIX compliant - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define fpurge rpl_fpurge # endif -_GL_FUNCDECL_RPL (fpurge, int, (FILE *gl_stream), _GL_ARG_NONNULL ((1))); +_GL_FUNCATTR_RPL (fpurge, int, (FILE *gl_stream), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (fpurge, int, (FILE *gl_stream)); # else # if !@HAVE_DECL_FPURGE@ -_GL_FUNCDECL_SYS (fpurge, int, (FILE *gl_stream), _GL_ARG_NONNULL ((1))); +_GL_FUNCATTR_SYS (fpurge, int, (FILE *gl_stream), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (fpurge, int, (FILE *gl_stream)); # endif @@ -663,7 +663,7 @@ _GL_WARN_ON_USE (fpurge, "fpurge is not always present - " # undef fputc # define fputc rpl_fputc # endif -_GL_FUNCDECL_RPL (fputc, int, (int c, FILE *stream), _GL_ARG_NONNULL ((2))); +_GL_FUNCATTR_RPL (fputc, int, (int c, FILE *stream), _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (fputc, int, (int c, FILE *stream)); # else _GL_CXXALIAS_SYS (fputc, int, (int c, FILE *stream)); @@ -679,7 +679,7 @@ _GL_CXXALIASWARN (fputc); # undef fputs # define fputs rpl_fputs # endif -_GL_FUNCDECL_RPL (fputs, int, +_GL_FUNCATTR_RPL (fputs, int, (const char *restrict string, FILE *restrict stream), _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (fputs, int, @@ -699,7 +699,7 @@ _GL_CXXALIASWARN (fputs); # undef fread # define fread rpl_fread # endif -_GL_FUNCDECL_RPL (fread, size_t, +_GL_FUNCATTR_RPL (fread, size_t, (void *restrict ptr, size_t s, size_t n, FILE *restrict stream), _GL_ARG_NONNULL ((4)) _GL_ATTRIBUTE_NODISCARD); @@ -722,7 +722,7 @@ _GL_CXXALIASWARN (fread); # undef freopen # define freopen rpl_freopen # endif -_GL_FUNCDECL_RPL (freopen, FILE *, +_GL_FUNCATTR_RPL (freopen, FILE *, (const char *restrict filename, const char *restrict mode, FILE *restrict stream), _GL_ARG_NONNULL ((2, 3)) _GL_ATTRIBUTE_NODISCARD); @@ -751,7 +751,7 @@ _GL_WARN_ON_USE (freopen, # undef fscanf # define fscanf rpl_fscanf # endif -_GL_FUNCDECL_RPL (fscanf, int, +_GL_FUNCATTR_RPL (fscanf, int, (FILE *restrict stream, const char *restrict format, ...), _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM (2, 3) _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_NODISCARD); @@ -808,7 +808,7 @@ _GL_CXXALIASWARN (fscanf); # undef fseek # define fseek rpl_fseek # endif -_GL_FUNCDECL_RPL (fseek, int, (FILE *fp, long offset, int whence), +_GL_FUNCATTR_RPL (fseek, int, (FILE *fp, long offset, int whence), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (fseek, int, (FILE *fp, long offset, int whence)); # else @@ -831,12 +831,12 @@ _GL_CXXALIASWARN (fseek); # undef fseeko # define fseeko rpl_fseeko # endif -_GL_FUNCDECL_RPL (fseeko, int, (FILE *fp, off_t offset, int whence), +_GL_FUNCATTR_RPL (fseeko, int, (FILE *fp, off_t offset, int whence), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (fseeko, int, (FILE *fp, off_t offset, int whence)); # else # if ! @HAVE_DECL_FSEEKO@ -_GL_FUNCDECL_SYS (fseeko, int, (FILE *fp, off_t offset, int whence), +_GL_FUNCATTR_SYS (fseeko, int, (FILE *fp, off_t offset, int whence), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (fseeko, int, (FILE *fp, off_t offset, int whence)); @@ -874,7 +874,7 @@ _GL_WARN_ON_USE (fseek, "fseek cannot handle files larger than 4 GB " # undef ftell # define ftell rpl_ftell # endif -_GL_FUNCDECL_RPL (ftell, long, (FILE *fp), +_GL_FUNCATTR_RPL (ftell, long, (FILE *fp), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (ftell, long, (FILE *fp)); # else @@ -895,12 +895,12 @@ _GL_CXXALIASWARN (ftell); # undef ftello # define ftello rpl_ftello # endif -_GL_FUNCDECL_RPL (ftello, off_t, (FILE *fp), +_GL_FUNCATTR_RPL (ftello, off_t, (FILE *fp), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (ftello, off_t, (FILE *fp)); # else # if ! @HAVE_DECL_FTELLO@ -_GL_FUNCDECL_SYS (ftello, off_t, (FILE *fp), +_GL_FUNCATTR_SYS (ftello, off_t, (FILE *fp), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); # endif _GL_CXXALIAS_SYS (ftello, off_t, (FILE *fp)); @@ -932,7 +932,7 @@ _GL_WARN_ON_USE (ftell, "ftell cannot handle files larger than 4 GB " # undef fwrite # define fwrite rpl_fwrite # endif -_GL_FUNCDECL_RPL (fwrite, size_t, +_GL_FUNCATTR_RPL (fwrite, size_t, (const void *restrict ptr, size_t s, size_t n, FILE *restrict stream), _GL_ARG_NONNULL ((1, 4))); @@ -978,7 +978,7 @@ _GL_CXXALIASWARN (fwrite); # undef getc # define getc rpl_fgetc # endif -_GL_FUNCDECL_RPL (fgetc, int, (FILE *stream), _GL_ARG_NONNULL ((1))); +_GL_FUNCATTR_RPL (fgetc, int, (FILE *stream), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL_1 (getc, rpl_fgetc, int, (FILE *stream)); # else _GL_CXXALIAS_SYS (getc, int, (FILE *stream)); @@ -1016,7 +1016,7 @@ _GL_CXXALIASWARN (getchar); # undef getdelim # define getdelim rpl_getdelim # endif -_GL_FUNCDECL_RPL (getdelim, ssize_t, +_GL_FUNCATTR_RPL (getdelim, ssize_t, (char **restrict lineptr, size_t *restrict linesize, int delimiter, FILE *restrict stream), @@ -1027,7 +1027,7 @@ _GL_CXXALIAS_RPL (getdelim, ssize_t, FILE *restrict stream)); # else # if !@HAVE_DECL_GETDELIM@ -_GL_FUNCDECL_SYS (getdelim, ssize_t, +_GL_FUNCATTR_SYS (getdelim, ssize_t, (char **restrict lineptr, size_t *restrict linesize, int delimiter, FILE *restrict stream), @@ -1061,7 +1061,7 @@ _GL_WARN_ON_USE (getdelim, "getdelim is unportable - " # undef getline # define getline rpl_getline # endif -_GL_FUNCDECL_RPL (getline, ssize_t, +_GL_FUNCATTR_RPL (getline, ssize_t, (char **restrict lineptr, size_t *restrict linesize, FILE *restrict stream), _GL_ARG_NONNULL ((1, 2, 3)) _GL_ATTRIBUTE_NODISCARD); @@ -1070,7 +1070,7 @@ _GL_CXXALIAS_RPL (getline, ssize_t, FILE *restrict stream)); # else # if !@HAVE_DECL_GETLINE@ -_GL_FUNCDECL_SYS (getline, ssize_t, +_GL_FUNCATTR_SYS (getline, ssize_t, (char **restrict lineptr, size_t *restrict linesize, FILE *restrict stream), _GL_ARG_NONNULL ((1, 2, 3)) _GL_ATTRIBUTE_NODISCARD); @@ -1134,13 +1134,13 @@ struct obstack; Therefore, if the format string is valid and does not use %ls/%lc directives nor widths, the only possible failure code is through obstack_alloc_failed_handler. */ -_GL_FUNCDECL_SYS (obstack_zprintf, ptrdiff_t, +_GL_FUNCATTR_SYS (obstack_zprintf, ptrdiff_t, (struct obstack *obs, const char *format, ...), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3) _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_SYS (obstack_zprintf, ptrdiff_t, (struct obstack *obs, const char *format, ...)); -_GL_FUNCDECL_SYS (obstack_vzprintf, ptrdiff_t, +_GL_FUNCATTR_SYS (obstack_vzprintf, ptrdiff_t, (struct obstack *obs, const char *format, va_list args), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0) _GL_ARG_NONNULL ((1, 2))); @@ -1159,7 +1159,7 @@ struct obstack; # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define obstack_printf rpl_obstack_printf # endif -_GL_FUNCDECL_RPL (obstack_printf, int, +_GL_FUNCATTR_RPL (obstack_printf, int, (struct obstack *obs, const char *format, ...), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3) _GL_ARG_NONNULL ((1, 2))); @@ -1167,7 +1167,7 @@ _GL_CXXALIAS_RPL (obstack_printf, int, (struct obstack *obs, const char *format, ...)); # else # if !@HAVE_DECL_OBSTACK_PRINTF@ -_GL_FUNCDECL_SYS (obstack_printf, int, +_GL_FUNCATTR_SYS (obstack_printf, int, (struct obstack *obs, const char *format, ...), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3) _GL_ARG_NONNULL ((1, 2))); @@ -1180,7 +1180,7 @@ _GL_CXXALIASWARN (obstack_printf); # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define obstack_vprintf rpl_obstack_vprintf # endif -_GL_FUNCDECL_RPL (obstack_vprintf, int, +_GL_FUNCATTR_RPL (obstack_vprintf, int, (struct obstack *obs, const char *format, va_list args), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0) _GL_ARG_NONNULL ((1, 2))); @@ -1188,7 +1188,7 @@ _GL_CXXALIAS_RPL (obstack_vprintf, int, (struct obstack *obs, const char *format, va_list args)); # else # if !@HAVE_DECL_OBSTACK_PRINTF@ -_GL_FUNCDECL_SYS (obstack_vprintf, int, +_GL_FUNCATTR_SYS (obstack_vprintf, int, (struct obstack *obs, const char *format, va_list args), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0) _GL_ARG_NONNULL ((1, 2))); @@ -1201,7 +1201,7 @@ _GL_CXXALIASWARN (obstack_vprintf); #if @GNULIB_PCLOSE@ # if !@HAVE_PCLOSE@ -_GL_FUNCDECL_SYS (pclose, int, (FILE *stream), _GL_ARG_NONNULL ((1))); +_GL_FUNCATTR_SYS (pclose, int, (FILE *stream), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (pclose, int, (FILE *stream)); _GL_CXXALIASWARN (pclose); @@ -1242,14 +1242,14 @@ _GL_WARN_ON_USE (perror, "perror is not always POSIX compliant - " # undef popen # define popen rpl_popen # endif -_GL_FUNCDECL_RPL (popen, FILE *, +_GL_FUNCATTR_RPL (popen, FILE *, (const char *cmd, const char *mode), _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (pclose, 1) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (popen, FILE *, (const char *cmd, const char *mode)); # else # if !@HAVE_POPEN@ || (__GNUC__ >= 11 && !defined __clang__) -_GL_FUNCDECL_SYS (popen, FILE *, +_GL_FUNCATTR_SYS (popen, FILE *, (const char *cmd, const char *mode), _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (pclose, 1) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_NODISCARD); @@ -1261,7 +1261,7 @@ _GL_CXXALIASWARN (popen); # if @GNULIB_PCLOSE@ \ && (__GNUC__ >= 11 && !defined __clang__) && !defined popen /* For -Wmismatched-dealloc: Associate popen with pclose or rpl_pclose. */ -_GL_FUNCDECL_SYS (popen, FILE *, +_GL_FUNCATTR_SYS (popen, FILE *, (const char *cmd, const char *mode), _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (pclose, 1) _GL_ATTRIBUTE_MALLOC); @@ -1283,7 +1283,7 @@ _GL_WARN_ON_USE (popen, "popen is buggy on some platforms - " Therefore, if the format string is valid and does not use %ls/%lc directives nor widths, the only possible failure causes are ENOMEM and the possible failure causes from fwrite(). */ -_GL_FUNCDECL_SYS (zprintf, off64_t, (const char *restrict format, ...), +_GL_FUNCATTR_SYS (zprintf, off64_t, (const char *restrict format, ...), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (1, 2) _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_SYS (zprintf, off64_t, (const char *restrict format, ...)); @@ -1301,14 +1301,14 @@ _GL_CXXALIAS_SYS (zprintf, off64_t, (const char *restrict format, ...)); # define printf __printf__ # endif # if @GNULIB_PRINTF_POSIX@ || @GNULIB_VFPRINTF_POSIX@ -_GL_FUNCDECL_RPL_1 (__printf__, int, +_GL_FUNCATTR_RPL_1 (__printf__, int, (const char *restrict format, ...) __asm__ (@ASM_SYMBOL_PREFIX@ _GL_STDIO_MACROEXPAND_AND_STRINGIZE(rpl_printf)), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (1, 2) _GL_ARG_NONNULL ((1))); # else -_GL_FUNCDECL_RPL_1 (__printf__, int, +_GL_FUNCATTR_RPL_1 (__printf__, int, (const char *restrict format, ...) __asm__ (@ASM_SYMBOL_PREFIX@ _GL_STDIO_MACROEXPAND_AND_STRINGIZE(rpl_printf)), @@ -1320,7 +1320,7 @@ _GL_CXXALIAS_RPL_1 (printf, __printf__, int, (const char *format, ...)); # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define printf rpl_printf # endif -_GL_FUNCDECL_RPL (printf, int, +_GL_FUNCATTR_RPL (printf, int, (const char *restrict format, ...), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (1, 2) _GL_ARG_NONNULL ((1))); @@ -1350,7 +1350,7 @@ _GL_WARN_ON_USE (printf, "printf is not always POSIX compliant - " # undef putc # define putc rpl_fputc # endif -_GL_FUNCDECL_RPL (fputc, int, (int c, FILE *stream), _GL_ARG_NONNULL ((2))); +_GL_FUNCATTR_RPL (fputc, int, (int c, FILE *stream), _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL_1 (putc, rpl_fputc, int, (int c, FILE *stream)); # else _GL_CXXALIAS_SYS (putc, int, (int c, FILE *stream)); @@ -1382,7 +1382,7 @@ _GL_CXXALIASWARN (putchar); # undef puts # define puts rpl_puts # endif -_GL_FUNCDECL_RPL (puts, int, (const char *string), _GL_ARG_NONNULL ((1))); +_GL_FUNCATTR_RPL (puts, int, (const char *string), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (puts, int, (const char *string)); # else _GL_CXXALIAS_SYS (puts, int, (const char *string)); @@ -1422,7 +1422,7 @@ _GL_CXXALIASWARN (putw); # undef remove # define remove rpl_remove # endif -_GL_FUNCDECL_RPL (remove, int, (const char *name), _GL_ARG_NONNULL ((1))); +_GL_FUNCATTR_RPL (remove, int, (const char *name), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (remove, int, (const char *name)); # else _GL_CXXALIAS_SYS (remove, int, (const char *name)); @@ -1443,7 +1443,7 @@ _GL_WARN_ON_USE (remove, "remove cannot handle directories on some platforms - " # undef rename # define rename rpl_rename # endif -_GL_FUNCDECL_RPL (rename, int, +_GL_FUNCATTR_RPL (rename, int, (const char *old_filename, const char *new_filename), _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (rename, int, @@ -1468,14 +1468,14 @@ _GL_WARN_ON_USE (rename, "rename is buggy on some platforms - " # undef renameat # define renameat rpl_renameat # endif -_GL_FUNCDECL_RPL (renameat, int, +_GL_FUNCATTR_RPL (renameat, int, (int fd1, char const *file1, int fd2, char const *file2), _GL_ARG_NONNULL ((2, 4))); _GL_CXXALIAS_RPL (renameat, int, (int fd1, char const *file1, int fd2, char const *file2)); # else # if !@HAVE_RENAMEAT@ -_GL_FUNCDECL_SYS (renameat, int, +_GL_FUNCATTR_SYS (renameat, int, (int fd1, char const *file1, int fd2, char const *file2), _GL_ARG_NONNULL ((2, 4))); # endif @@ -1499,7 +1499,7 @@ _GL_WARN_ON_USE (renameat, "renameat is not portable - " /* Don't break __attribute__((format(scanf,M,N))). */ # define scanf __scanf__ # endif -_GL_FUNCDECL_RPL_1 (__scanf__, int, +_GL_FUNCATTR_RPL_1 (__scanf__, int, (const char *restrict format, ...) __asm__ (@ASM_SYMBOL_PREFIX@ _GL_STDIO_MACROEXPAND_AND_STRINGIZE(rpl_scanf)), @@ -1511,7 +1511,7 @@ _GL_CXXALIAS_RPL_1 (scanf, __scanf__, int, (const char *restrict format, ...)); # undef scanf # define scanf rpl_scanf # endif -_GL_FUNCDECL_RPL (scanf, int, (const char *restrict format, ...), +_GL_FUNCATTR_RPL (scanf, int, (const char *restrict format, ...), _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM (1, 2) _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (scanf, int, (const char *restrict format, ...)); @@ -1533,7 +1533,7 @@ _GL_CXXALIASWARN (scanf); Failure code EOVERFLOW can only occur when a width > INT_MAX is used. Therefore, if the format string is valid and does not use %ls/%lc directives nor widths, the only possible failure code is ENOMEM. */ -_GL_FUNCDECL_SYS (snzprintf, ptrdiff_t, +_GL_FUNCATTR_SYS (snzprintf, ptrdiff_t, (char *restrict str, size_t size, const char *restrict format, ...), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (3, 4) @@ -1554,7 +1554,7 @@ _GL_CXXALIAS_SYS (snzprintf, ptrdiff_t, # define snprintf rpl_snprintf # endif # define GNULIB_overrides_snprintf 1 -_GL_FUNCDECL_RPL (snprintf, int, +_GL_FUNCATTR_RPL (snprintf, int, (char *restrict str, size_t size, const char *restrict format, ...), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (3, 4) @@ -1564,7 +1564,7 @@ _GL_CXXALIAS_RPL (snprintf, int, const char *restrict format, ...)); # else # if !@HAVE_DECL_SNPRINTF@ -_GL_FUNCDECL_SYS (snprintf, int, +_GL_FUNCATTR_SYS (snprintf, int, (char *restrict str, size_t size, const char *restrict format, ...), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (3, 4) @@ -1592,7 +1592,7 @@ _GL_WARN_ON_USE (snprintf, "snprintf is unportable - " Failure code EOVERFLOW can only occur when a width > INT_MAX is used. Therefore, if the format string is valid and does not use %ls/%lc directives nor widths, the only possible failure code is ENOMEM. */ -_GL_FUNCDECL_SYS (szprintf, ptrdiff_t, +_GL_FUNCATTR_SYS (szprintf, ptrdiff_t, (char *restrict str, const char *restrict format, ...), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3) @@ -1620,7 +1620,7 @@ _GL_CXXALIAS_SYS (szprintf, ptrdiff_t, # define sprintf rpl_sprintf # endif # define GNULIB_overrides_sprintf 1 -_GL_FUNCDECL_RPL (sprintf, int, +_GL_FUNCATTR_RPL (sprintf, int, (char *restrict str, const char *restrict format, ...), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3) _GL_ARG_NONNULL ((1, 2))); @@ -1662,7 +1662,7 @@ _GL_CXXALIASWARN (tempnam); # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define tmpfile rpl_tmpfile # endif -_GL_FUNCDECL_RPL (tmpfile, FILE *, (void), +_GL_FUNCATTR_RPL (tmpfile, FILE *, (void), _GL_ATTRIBUTE_DEALLOC (fclose, 1) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_NODISCARD); @@ -1670,7 +1670,7 @@ _GL_CXXALIAS_RPL (tmpfile, FILE *, (void)); # else # if __GNUC__ >= 11 && !defined __clang__ /* For -Wmismatched-dealloc: Associate tmpfile with fclose or rpl_fclose. */ -_GL_FUNCDECL_SYS (tmpfile, FILE *, (void), +_GL_FUNCATTR_SYS (tmpfile, FILE *, (void), _GL_ATTRIBUTE_DEALLOC (fclose, 1) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_NODISCARD); @@ -1684,7 +1684,7 @@ _GL_CXXALIASWARN (tmpfile); # if @GNULIB_FCLOSE@ \ && (__GNUC__ >= 11 && !defined __clang__) && !defined tmpfile /* For -Wmismatched-dealloc: Associate tmpfile with fclose or rpl_fclose. */ -_GL_FUNCDECL_SYS (tmpfile, FILE *, (void), +_GL_FUNCATTR_SYS (tmpfile, FILE *, (void), _GL_ATTRIBUTE_DEALLOC (fclose, 1) _GL_ATTRIBUTE_MALLOC); # endif @@ -1706,14 +1706,14 @@ _GL_WARN_ON_USE (tmpfile, "tmpfile is not usable on mingw - " Failure code EOVERFLOW can only occur when a width > INT_MAX is used. Therefore, if the format string is valid and does not use %ls/%lc directives nor widths, the only possible failure code is ENOMEM. */ -_GL_FUNCDECL_SYS (aszprintf, ptrdiff_t, +_GL_FUNCATTR_SYS (aszprintf, ptrdiff_t, (char **result, const char *format, ...), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3) _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_SYS (aszprintf, ptrdiff_t, (char **result, const char *format, ...)); -_GL_FUNCDECL_SYS (vaszprintf, ptrdiff_t, +_GL_FUNCATTR_SYS (vaszprintf, ptrdiff_t, (char **result, const char *format, va_list args), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0) _GL_ARG_NONNULL ((1, 2)) @@ -1732,7 +1732,7 @@ _GL_CXXALIAS_SYS (vaszprintf, ptrdiff_t, # define asprintf rpl_asprintf # endif # define GNULIB_overrides_asprintf -_GL_FUNCDECL_RPL (asprintf, int, +_GL_FUNCATTR_RPL (asprintf, int, (char **result, const char *format, ...), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3) _GL_ARG_NONNULL ((1, 2)) @@ -1741,7 +1741,7 @@ _GL_CXXALIAS_RPL (asprintf, int, (char **result, const char *format, ...)); # else # if !@HAVE_VASPRINTF@ -_GL_FUNCDECL_SYS (asprintf, int, +_GL_FUNCATTR_SYS (asprintf, int, (char **result, const char *format, ...), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3) _GL_ARG_NONNULL ((1, 2)) @@ -1756,7 +1756,7 @@ _GL_CXXALIASWARN (asprintf); # define vasprintf rpl_vasprintf # endif # define GNULIB_overrides_vasprintf 1 -_GL_FUNCDECL_RPL (vasprintf, int, +_GL_FUNCATTR_RPL (vasprintf, int, (char **result, const char *format, va_list args), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0) _GL_ARG_NONNULL ((1, 2)) @@ -1765,7 +1765,7 @@ _GL_CXXALIAS_RPL (vasprintf, int, (char **result, const char *format, va_list args)); # else # if !@HAVE_VASPRINTF@ -_GL_FUNCDECL_SYS (vasprintf, int, +_GL_FUNCATTR_SYS (vasprintf, int, (char **result, const char *format, va_list args), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0) _GL_ARG_NONNULL ((1, 2)) @@ -1785,7 +1785,7 @@ _GL_CXXALIASWARN (vasprintf); Therefore, if the format string is valid and does not use %ls/%lc directives nor widths, the only possible failure codes are ENOMEM and the possible failure codes from write(), excluding EINTR. */ -_GL_FUNCDECL_SYS (vdzprintf, off64_t, +_GL_FUNCATTR_SYS (vdzprintf, off64_t, (int fd, const char *restrict format, va_list args), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0) _GL_ARG_NONNULL ((2))); @@ -1801,7 +1801,7 @@ _GL_CXXALIAS_SYS (vdzprintf, off64_t, # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define vdprintf rpl_vdprintf # endif -_GL_FUNCDECL_RPL (vdprintf, int, +_GL_FUNCATTR_RPL (vdprintf, int, (int fd, const char *restrict format, va_list args), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0) _GL_ARG_NONNULL ((2))); @@ -1809,7 +1809,7 @@ _GL_CXXALIAS_RPL (vdprintf, int, (int fd, const char *restrict format, va_list args)); # else # if !@HAVE_VDPRINTF@ -_GL_FUNCDECL_SYS (vdprintf, int, +_GL_FUNCATTR_SYS (vdprintf, int, (int fd, const char *restrict format, va_list args), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0) _GL_ARG_NONNULL ((2))); @@ -1838,7 +1838,7 @@ _GL_WARN_ON_USE (vdprintf, "vdprintf is unportable - " Therefore, if the format string is valid and does not use %ls/%lc directives nor widths, the only possible failure causes are ENOMEM and the possible failure causes from fwrite(). */ -_GL_FUNCDECL_SYS (vfzprintf, off64_t, +_GL_FUNCATTR_SYS (vfzprintf, off64_t, (FILE *restrict fp, const char *restrict format, va_list args), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0) @@ -1859,13 +1859,13 @@ _GL_CXXALIAS_SYS (vfzprintf, off64_t, # endif # define GNULIB_overrides_vfprintf 1 # if @GNULIB_VFPRINTF_POSIX@ -_GL_FUNCDECL_RPL (vfprintf, int, +_GL_FUNCATTR_RPL (vfprintf, int, (FILE *restrict fp, const char *restrict format, va_list args), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0) _GL_ARG_NONNULL ((1, 2))); # else -_GL_FUNCDECL_RPL (vfprintf, int, +_GL_FUNCATTR_RPL (vfprintf, int, (FILE *restrict fp, const char *restrict format, va_list args), _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM (2, 0) @@ -1902,7 +1902,7 @@ _GL_WARN_ON_USE (vfprintf, "vfprintf is not always POSIX compliant - " # undef vfscanf # define vfscanf rpl_vfscanf # endif -_GL_FUNCDECL_RPL (vfscanf, int, +_GL_FUNCATTR_RPL (vfscanf, int, (FILE *restrict stream, const char *restrict format, va_list args), _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM (2, 0) @@ -1928,7 +1928,7 @@ _GL_CXXALIASWARN (vfscanf); Therefore, if the format string is valid and does not use %ls/%lc directives nor widths, the only possible failure causes are ENOMEM and the possible failure causes from fwrite(). */ -_GL_FUNCDECL_SYS (vzprintf, off64_t, +_GL_FUNCATTR_SYS (vzprintf, off64_t, (const char *restrict format, va_list args), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (1, 0) _GL_ARG_NONNULL ((1))); @@ -1947,11 +1947,11 @@ _GL_CXXALIAS_SYS (vzprintf, off64_t, # endif # define GNULIB_overrides_vprintf 1 # if @GNULIB_VPRINTF_POSIX@ || @GNULIB_VFPRINTF_POSIX@ -_GL_FUNCDECL_RPL (vprintf, int, (const char *restrict format, va_list args), +_GL_FUNCATTR_RPL (vprintf, int, (const char *restrict format, va_list args), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (1, 0) _GL_ARG_NONNULL ((1))); # else -_GL_FUNCDECL_RPL (vprintf, int, (const char *restrict format, va_list args), +_GL_FUNCATTR_RPL (vprintf, int, (const char *restrict format, va_list args), _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM (1, 0) _GL_ARG_NONNULL ((1))); # endif @@ -1983,7 +1983,7 @@ _GL_WARN_ON_USE (vprintf, "vprintf is not always POSIX compliant - " # undef vscanf # define vscanf rpl_vscanf # endif -_GL_FUNCDECL_RPL (vscanf, int, (const char *restrict format, va_list args), +_GL_FUNCATTR_RPL (vscanf, int, (const char *restrict format, va_list args), _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM (1, 0) _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (vscanf, int, (const char *restrict format, va_list args)); @@ -2004,7 +2004,7 @@ _GL_CXXALIASWARN (vscanf); Failure code EOVERFLOW can only occur when a width > INT_MAX is used. Therefore, if the format string is valid and does not use %ls/%lc directives nor widths, the only possible failure code is ENOMEM. */ -_GL_FUNCDECL_SYS (vsnzprintf, ptrdiff_t, +_GL_FUNCATTR_SYS (vsnzprintf, ptrdiff_t, (char *restrict str, size_t size, const char *restrict format, va_list args), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (3, 0) @@ -2025,7 +2025,7 @@ _GL_CXXALIAS_SYS (vsnzprintf, ptrdiff_t, # define vsnprintf rpl_vsnprintf # endif # define GNULIB_overrides_vsnprintf 1 -_GL_FUNCDECL_RPL (vsnprintf, int, +_GL_FUNCATTR_RPL (vsnprintf, int, (char *restrict str, size_t size, const char *restrict format, va_list args), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (3, 0) @@ -2035,7 +2035,7 @@ _GL_CXXALIAS_RPL (vsnprintf, int, const char *restrict format, va_list args)); # else # if !@HAVE_DECL_VSNPRINTF@ -_GL_FUNCDECL_SYS (vsnprintf, int, +_GL_FUNCATTR_SYS (vsnprintf, int, (char *restrict str, size_t size, const char *restrict format, va_list args), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (3, 0) @@ -2063,7 +2063,7 @@ _GL_WARN_ON_USE (vsnprintf, "vsnprintf is unportable - " Failure code EOVERFLOW can only occur when a width > INT_MAX is used. Therefore, if the format string is valid and does not use %ls/%lc directives nor widths, the only possible failure code is ENOMEM. */ -_GL_FUNCDECL_SYS (vszprintf, ptrdiff_t, +_GL_FUNCATTR_SYS (vszprintf, ptrdiff_t, (char *restrict str, const char *restrict format, va_list args), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0) @@ -2082,7 +2082,7 @@ _GL_CXXALIAS_SYS (vszprintf, ptrdiff_t, # define vsprintf rpl_vsprintf # endif # define GNULIB_overrides_vsprintf 1 -_GL_FUNCDECL_RPL (vsprintf, int, +_GL_FUNCATTR_RPL (vsprintf, int, (char *restrict str, const char *restrict format, va_list args), _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0) diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h index 1ec96c8b24..d4607db732 100644 --- a/lib/stdlib.in.h +++ b/lib/stdlib.in.h @@ -293,7 +293,7 @@ _GL_WARN_ON_USE (free, "free is not future POSIX compliant everywhere - " # undef aligned_alloc # define aligned_alloc rpl_aligned_alloc # endif -_GL_FUNCDECL_RPL (aligned_alloc, void *, +_GL_FUNCATTR_RPL (aligned_alloc, void *, (size_t alignment, size_t size), _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_NODISCARD); @@ -303,13 +303,13 @@ _GL_CXXALIAS_RPL (aligned_alloc, void *, (size_t alignment, size_t size)); # if __GNUC__ >= 11 && !defined __clang__ /* For -Wmismatched-dealloc: Associate aligned_alloc with free or rpl_free. */ # if __GLIBC__ + (__GLIBC_MINOR__ >= 16) > 2 -_GL_FUNCDECL_SYS (aligned_alloc, void *, +_GL_FUNCATTR_SYS (aligned_alloc, void *, (size_t alignment, size_t size), _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_NODISCARD) _GL_ATTRIBUTE_NOTHROW; # else -_GL_FUNCDECL_SYS (aligned_alloc, void *, +_GL_FUNCATTR_SYS (aligned_alloc, void *, (size_t alignment, size_t size), _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_NODISCARD); @@ -326,12 +326,12 @@ _GL_CXXALIASWARN (aligned_alloc); && (__GNUC__ >= 11 && !defined __clang__) && !defined aligned_alloc /* For -Wmismatched-dealloc: Associate aligned_alloc with free or rpl_free. */ # if __GLIBC__ + (__GLIBC_MINOR__ >= 16) > 2 -_GL_FUNCDECL_SYS (aligned_alloc, void *, +_GL_FUNCATTR_SYS (aligned_alloc, void *, (size_t alignment, size_t size), _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE) _GL_ATTRIBUTE_NOTHROW; # else -_GL_FUNCDECL_SYS (aligned_alloc, void *, +_GL_FUNCATTR_SYS (aligned_alloc, void *, (size_t alignment, size_t size), _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); # endif @@ -349,7 +349,7 @@ _GL_WARN_ON_USE (aligned_alloc, "aligned_alloc is not portable - " /* Parse a signed decimal integer. Returns the value of the integer. Errors are not detected. */ # if !@HAVE_ATOLL@ -_GL_FUNCDECL_SYS (atoll, long long, +_GL_FUNCATTR_SYS (atoll, long long, (const char *string), _GL_ATTRIBUTE_PURE _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); @@ -371,7 +371,7 @@ _GL_WARN_ON_USE (atoll, "atoll is unportable - " # undef calloc # define calloc rpl_calloc # endif -_GL_FUNCDECL_RPL (calloc, void *, +_GL_FUNCATTR_RPL (calloc, void *, (size_t nmemb, size_t size), _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_NODISCARD); @@ -380,13 +380,13 @@ _GL_CXXALIAS_RPL (calloc, void *, (size_t nmemb, size_t size)); # if __GNUC__ >= 11 && !defined __clang__ /* For -Wmismatched-dealloc: Associate calloc with free or rpl_free. */ # if __GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2 -_GL_FUNCDECL_SYS (calloc, void *, +_GL_FUNCATTR_SYS (calloc, void *, (size_t nmemb, size_t size), _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_NODISCARD) _GL_ATTRIBUTE_NOTHROW; # else -_GL_FUNCDECL_SYS (calloc, void *, +_GL_FUNCATTR_SYS (calloc, void *, (size_t nmemb, size_t size), _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_NODISCARD); @@ -402,12 +402,12 @@ _GL_CXXALIASWARN (calloc); && (__GNUC__ >= 11 && !defined __clang__) && !defined calloc /* For -Wmismatched-dealloc: Associate calloc with free or rpl_free. */ # if __GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2 -_GL_FUNCDECL_SYS (calloc, void *, +_GL_FUNCATTR_SYS (calloc, void *, (size_t nmemb, size_t size), _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE) _GL_ATTRIBUTE_NOTHROW; # else -_GL_FUNCDECL_SYS (calloc, void *, +_GL_FUNCATTR_SYS (calloc, void *, (size_t nmemb, size_t size), _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); # endif @@ -425,7 +425,7 @@ _GL_WARN_ON_USE (calloc, "calloc is not POSIX compliant everywhere - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define canonicalize_file_name rpl_canonicalize_file_name # endif -_GL_FUNCDECL_RPL (canonicalize_file_name, char *, +_GL_FUNCATTR_RPL (canonicalize_file_name, char *, (const char *name), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE @@ -434,14 +434,14 @@ _GL_CXXALIAS_RPL (canonicalize_file_name, char *, (const char *name)); # else # if !@HAVE_CANONICALIZE_FILE_NAME@ || (__GNUC__ >= 11 && !defined __clang__) # if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 -_GL_FUNCDECL_SYS (canonicalize_file_name, char *, +_GL_FUNCATTR_SYS (canonicalize_file_name, char *, (const char *name), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_NODISCARD) _GL_ATTRIBUTE_NOTHROW; # else -_GL_FUNCDECL_SYS (canonicalize_file_name, char *, +_GL_FUNCATTR_SYS (canonicalize_file_name, char *, (const char *name), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE @@ -461,13 +461,13 @@ _GL_CXXALIASWARN (canonicalize_file_name); /* For -Wmismatched-dealloc: Associate canonicalize_file_name with free or rpl_free. */ # if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 -_GL_FUNCDECL_SYS (canonicalize_file_name, char *, +_GL_FUNCATTR_SYS (canonicalize_file_name, char *, (const char *name), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE) _GL_ATTRIBUTE_NOTHROW; # else -_GL_FUNCDECL_SYS (canonicalize_file_name, char *, +_GL_FUNCATTR_SYS (canonicalize_file_name, char *, (const char *name), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); @@ -560,12 +560,12 @@ _GL_CXXALIASWARN (gcvt); # undef getloadavg # define getloadavg rpl_getloadavg # endif -_GL_FUNCDECL_RPL (getloadavg, int, (double loadavg[], int nelem), +_GL_FUNCATTR_RPL (getloadavg, int, (double loadavg[], int nelem), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (getloadavg, int, (double loadavg[], int nelem)); # else # if !@HAVE_DECL_GETLOADAVG@ -_GL_FUNCDECL_SYS (getloadavg, int, (double loadavg[], int nelem), +_GL_FUNCATTR_SYS (getloadavg, int, (double loadavg[], int nelem), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (getloadavg, int, (double loadavg[], int nelem)); @@ -590,7 +590,7 @@ _GL_WARN_ON_USE (getloadavg, "getloadavg is not portable - " # define getprogname rpl_getprogname # endif # if @HAVE_DECL_PROGRAM_INVOCATION_NAME@ -_GL_FUNCDECL_RPL (getprogname, const char *, (void), _GL_ATTRIBUTE_PURE); +_GL_FUNCATTR_RPL (getprogname, const char *, (void), _GL_ATTRIBUTE_PURE); # else _GL_FUNCDECL_RPL (getprogname, const char *, (void)); # endif @@ -598,7 +598,7 @@ _GL_CXXALIAS_RPL (getprogname, const char *, (void)); # else # if !@HAVE_GETPROGNAME@ # if @HAVE_DECL_PROGRAM_INVOCATION_NAME@ -_GL_FUNCDECL_SYS (getprogname, const char *, (void), _GL_ATTRIBUTE_PURE); +_GL_FUNCATTR_SYS (getprogname, const char *, (void), _GL_ATTRIBUTE_PURE); # else _GL_FUNCDECL_SYS (getprogname, const char *, (void)); # endif @@ -633,14 +633,14 @@ _GL_WARN_ON_USE (getprogname, "getprogname is unportable - " # undef getsubopt # define getsubopt rpl_getsubopt # endif -_GL_FUNCDECL_RPL (getsubopt, int, +_GL_FUNCATTR_RPL (getsubopt, int, (char **optionp, char *const *tokens, char **valuep), _GL_ARG_NONNULL ((1, 2, 3)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (getsubopt, int, (char **optionp, char *const *tokens, char **valuep)); # else # if !@HAVE_GETSUBOPT@ -_GL_FUNCDECL_SYS (getsubopt, int, +_GL_FUNCATTR_SYS (getsubopt, int, (char **optionp, char *const *tokens, char **valuep), _GL_ARG_NONNULL ((1, 2, 3)) _GL_ATTRIBUTE_NODISCARD); # endif @@ -686,7 +686,7 @@ _GL_WARN_ON_USE (grantpt, "grantpt is not portable - " # undef malloc # define malloc rpl_malloc # endif -_GL_FUNCDECL_RPL (malloc, void *, +_GL_FUNCATTR_RPL (malloc, void *, (size_t size), _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_NODISCARD); @@ -695,13 +695,13 @@ _GL_CXXALIAS_RPL (malloc, void *, (size_t size)); # if __GNUC__ >= 11 && !defined __clang__ /* For -Wmismatched-dealloc: Associate malloc with free or rpl_free. */ # if __GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2 -_GL_FUNCDECL_SYS (malloc, void *, +_GL_FUNCATTR_SYS (malloc, void *, (size_t size), _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_NODISCARD) _GL_ATTRIBUTE_NOTHROW; # else -_GL_FUNCDECL_SYS (malloc, void *, +_GL_FUNCATTR_SYS (malloc, void *, (size_t size), _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_NODISCARD); @@ -717,12 +717,12 @@ _GL_CXXALIASWARN (malloc); && (__GNUC__ >= 11 && !defined __clang__) && !defined malloc /* For -Wmismatched-dealloc: Associate malloc with free or rpl_free. */ # if __GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2 -_GL_FUNCDECL_SYS (malloc, void *, +_GL_FUNCATTR_SYS (malloc, void *, (size_t size), _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE) _GL_ATTRIBUTE_NOTHROW; # else -_GL_FUNCDECL_SYS (malloc, void *, +_GL_FUNCATTR_SYS (malloc, void *, (size_t size), _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); # endif @@ -757,7 +757,7 @@ int gl_MB_CUR_MAX (void) # undef mbstowcs # define mbstowcs rpl_mbstowcs # endif -_GL_FUNCDECL_RPL (mbstowcs, size_t, +_GL_FUNCATTR_RPL (mbstowcs, size_t, (wchar_t *restrict dest, const char *restrict src, size_t len), _GL_ARG_NONNULL ((2))); @@ -817,7 +817,7 @@ _GL_WARN_ON_USE (mbtowc, "mbtowc is not portable - " Returns TEMPLATE, or a null pointer if it cannot get a unique name. The directory is created mode 700. */ # if !@HAVE_MKDTEMP@ -_GL_FUNCDECL_SYS (mkdtemp, char *, +_GL_FUNCATTR_SYS (mkdtemp, char *, (char * /*template*/), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); # endif @@ -849,12 +849,12 @@ _GL_WARN_ON_USE (mkdtemp, "mkdtemp is unportable - " # undef mkostemp # define mkostemp rpl_mkostemp # endif -_GL_FUNCDECL_RPL (mkostemp, int, (char * /*template*/, int /*flags*/), +_GL_FUNCATTR_RPL (mkostemp, int, (char * /*template*/, int /*flags*/), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (mkostemp, int, (char * /*template*/, int /*flags*/)); # else # if !@HAVE_MKOSTEMP@ -_GL_FUNCDECL_SYS (mkostemp, int, (char * /*template*/, int /*flags*/), +_GL_FUNCATTR_SYS (mkostemp, int, (char * /*template*/, int /*flags*/), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); # endif _GL_CXXALIAS_SYS (mkostemp, int, (char * /*template*/, int /*flags*/)); @@ -889,14 +889,14 @@ _GL_WARN_ON_USE (mkostemp, "mkostemp is unportable - " # undef mkostemps # define mkostemps rpl_mkostemps # endif -_GL_FUNCDECL_RPL (mkostemps, int, +_GL_FUNCATTR_RPL (mkostemps, int, (char * /*template*/, int /*suffixlen*/, int /*flags*/), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (mkostemps, int, (char * /*template*/, int /*suffixlen*/, int /*flags*/)); # else # if !@HAVE_MKOSTEMPS@ -_GL_FUNCDECL_SYS (mkostemps, int, +_GL_FUNCATTR_SYS (mkostemps, int, (char * /*template*/, int /*suffixlen*/, int /*flags*/), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); # endif @@ -928,12 +928,12 @@ _GL_WARN_ON_USE (mkostemps, "mkostemps is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define mkstemp rpl_mkstemp # endif -_GL_FUNCDECL_RPL (mkstemp, int, (char * /*template*/), +_GL_FUNCATTR_RPL (mkstemp, int, (char * /*template*/), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (mkstemp, int, (char * /*template*/)); # else # if ! @HAVE_MKSTEMP@ -_GL_FUNCDECL_SYS (mkstemp, int, (char * /*template*/), +_GL_FUNCATTR_SYS (mkstemp, int, (char * /*template*/), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); # endif _GL_CXXALIAS_SYS (mkstemp, int, (char * /*template*/)); @@ -959,7 +959,7 @@ _GL_WARN_ON_USE (mkstemp, "mkstemp is unportable - " Returns the open file descriptor if successful, otherwise -1 and errno set. */ # if !@HAVE_MKSTEMPS@ -_GL_FUNCDECL_SYS (mkstemps, int, (char * /*template*/, int /*suffixlen*/), +_GL_FUNCATTR_SYS (mkstemps, int, (char * /*template*/, int /*suffixlen*/), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); # endif _GL_CXXALIAS_SYS (mkstemps, int, (char * /*template*/, int /*suffixlen*/)); @@ -995,7 +995,7 @@ _GL_CXXALIASWARN (mktemp); # undef posix_memalign # define posix_memalign rpl_posix_memalign # endif -_GL_FUNCDECL_RPL (posix_memalign, int, +_GL_FUNCATTR_RPL (posix_memalign, int, (void **memptr, size_t alignment, size_t size), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (posix_memalign, int, @@ -1025,11 +1025,11 @@ _GL_WARN_ON_USE (posix_memalign, "posix_memalign is not portable - " # undef posix_openpt # define posix_openpt rpl_posix_openpt # endif -_GL_FUNCDECL_RPL (posix_openpt, int, (int flags), _GL_ATTRIBUTE_NODISCARD); +_GL_FUNCATTR_RPL (posix_openpt, int, (int flags), _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (posix_openpt, int, (int flags)); # else # if !@HAVE_POSIX_OPENPT@ -_GL_FUNCDECL_SYS (posix_openpt, int, (int flags), _GL_ATTRIBUTE_NODISCARD); +_GL_FUNCATTR_SYS (posix_openpt, int, (int flags), _GL_ATTRIBUTE_NODISCARD); # endif _GL_CXXALIAS_SYS (posix_openpt, int, (int flags)); # endif @@ -1052,11 +1052,11 @@ _GL_WARN_ON_USE (posix_openpt, "posix_openpt is not portable - " # undef ptsname # define ptsname rpl_ptsname # endif -_GL_FUNCDECL_RPL (ptsname, char *, (int fd), _GL_ATTRIBUTE_NODISCARD); +_GL_FUNCATTR_RPL (ptsname, char *, (int fd), _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (ptsname, char *, (int fd)); # else # if !@HAVE_PTSNAME@ -_GL_FUNCDECL_SYS (ptsname, char *, (int fd), _GL_ATTRIBUTE_NODISCARD); +_GL_FUNCATTR_SYS (ptsname, char *, (int fd), _GL_ATTRIBUTE_NODISCARD); # endif _GL_CXXALIAS_SYS (ptsname, char *, (int fd)); # endif @@ -1104,7 +1104,7 @@ _GL_WARN_ON_USE (ptsname_r, "ptsname_r is not portable - " # undef putenv # define putenv rpl_putenv # endif -_GL_FUNCDECL_RPL (putenv, int, (char *string), _GL_ARG_NONNULL ((1))); +_GL_FUNCATTR_RPL (putenv, int, (char *string), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (putenv, int, (char *string)); # elif defined _WIN32 && !defined __CYGWIN__ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) @@ -1161,7 +1161,7 @@ typedef int (*_gl_qsort_r_compar_fn) (void const *, void const *, void *); # undef qsort_r # define qsort_r rpl_qsort_r # endif -_GL_FUNCDECL_RPL (qsort_r, void, (void *base, size_t nmemb, size_t size, +_GL_FUNCATTR_RPL (qsort_r, void, (void *base, size_t nmemb, size_t size, _gl_qsort_r_compar_fn compare, void *arg), _GL_ARG_NONNULL ((1, 4))); @@ -1170,7 +1170,7 @@ _GL_CXXALIAS_RPL (qsort_r, void, (void *base, size_t nmemb, size_t size, void *arg)); # else # if !@HAVE_QSORT_R@ -_GL_FUNCDECL_SYS (qsort_r, void, (void *base, size_t nmemb, size_t size, +_GL_FUNCATTR_SYS (qsort_r, void, (void *base, size_t nmemb, size_t size, _gl_qsort_r_compar_fn compare, void *arg), _GL_ARG_NONNULL ((1, 4))); @@ -1275,14 +1275,14 @@ _GL_WARN_ON_USE (srandom, "srandom is unportable - " # undef initstate # define initstate rpl_initstate # endif -_GL_FUNCDECL_RPL (initstate, char *, +_GL_FUNCATTR_RPL (initstate, char *, (unsigned int seed, char *buf, size_t buf_size), _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (initstate, char *, (unsigned int seed, char *buf, size_t buf_size)); # else # if !@HAVE_INITSTATE@ || !@HAVE_DECL_INITSTATE@ -_GL_FUNCDECL_SYS (initstate, char *, +_GL_FUNCATTR_SYS (initstate, char *, (unsigned int seed, char *buf, size_t buf_size), _GL_ARG_NONNULL ((2))); # endif @@ -1308,11 +1308,11 @@ _GL_WARN_ON_USE (initstate, "initstate is unportable - " # undef setstate # define setstate rpl_setstate # endif -_GL_FUNCDECL_RPL (setstate, char *, (char *arg_state), _GL_ARG_NONNULL ((1))); +_GL_FUNCATTR_RPL (setstate, char *, (char *arg_state), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (setstate, char *, (char *arg_state)); # else # if !@HAVE_SETSTATE@ || !@HAVE_DECL_SETSTATE@ -_GL_FUNCDECL_SYS (setstate, char *, (char *arg_state), _GL_ARG_NONNULL ((1))); +_GL_FUNCATTR_SYS (setstate, char *, (char *arg_state), _GL_ARG_NONNULL ((1))); # endif /* Need to cast, because on Mac OS X 10.13, HP-UX, Solaris the first parameter is const char *arg_state. */ @@ -1336,12 +1336,12 @@ _GL_WARN_ON_USE (setstate, "setstate is unportable - " # undef random_r # define random_r rpl_random_r # endif -_GL_FUNCDECL_RPL (random_r, int, (struct random_data *buf, int32_t *result), +_GL_FUNCATTR_RPL (random_r, int, (struct random_data *buf, int32_t *result), _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (random_r, int, (struct random_data *buf, int32_t *result)); # else # if !@HAVE_RANDOM_R@ -_GL_FUNCDECL_SYS (random_r, int, (struct random_data *buf, int32_t *result), +_GL_FUNCATTR_SYS (random_r, int, (struct random_data *buf, int32_t *result), _GL_ARG_NONNULL ((1, 2))); # endif _GL_CXXALIAS_SYS (random_r, int, (struct random_data *buf, int32_t *result)); @@ -1361,14 +1361,14 @@ _GL_WARN_ON_USE (random_r, "random_r is unportable - " # undef srandom_r # define srandom_r rpl_srandom_r # endif -_GL_FUNCDECL_RPL (srandom_r, int, +_GL_FUNCATTR_RPL (srandom_r, int, (unsigned int seed, struct random_data *rand_state), _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (srandom_r, int, (unsigned int seed, struct random_data *rand_state)); # else # if !@HAVE_RANDOM_R@ -_GL_FUNCDECL_SYS (srandom_r, int, +_GL_FUNCATTR_SYS (srandom_r, int, (unsigned int seed, struct random_data *rand_state), _GL_ARG_NONNULL ((2))); # endif @@ -1390,7 +1390,7 @@ _GL_WARN_ON_USE (srandom_r, "srandom_r is unportable - " # undef initstate_r # define initstate_r rpl_initstate_r # endif -_GL_FUNCDECL_RPL (initstate_r, int, +_GL_FUNCATTR_RPL (initstate_r, int, (unsigned int seed, char *buf, size_t buf_size, struct random_data *rand_state), _GL_ARG_NONNULL ((2, 4))); @@ -1399,7 +1399,7 @@ _GL_CXXALIAS_RPL (initstate_r, int, struct random_data *rand_state)); # else # if !@HAVE_RANDOM_R@ -_GL_FUNCDECL_SYS (initstate_r, int, +_GL_FUNCATTR_SYS (initstate_r, int, (unsigned int seed, char *buf, size_t buf_size, struct random_data *rand_state), _GL_ARG_NONNULL ((2, 4))); @@ -1425,14 +1425,14 @@ _GL_WARN_ON_USE (initstate_r, "initstate_r is unportable - " # undef setstate_r # define setstate_r rpl_setstate_r # endif -_GL_FUNCDECL_RPL (setstate_r, int, +_GL_FUNCATTR_RPL (setstate_r, int, (char *arg_state, struct random_data *rand_state), _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (setstate_r, int, (char *arg_state, struct random_data *rand_state)); # else # if !@HAVE_RANDOM_R@ -_GL_FUNCDECL_SYS (setstate_r, int, +_GL_FUNCATTR_SYS (setstate_r, int, (char *arg_state, struct random_data *rand_state), _GL_ARG_NONNULL ((1, 2))); # endif @@ -1459,7 +1459,7 @@ _GL_WARN_ON_USE (setstate_r, "setstate_r is unportable - " # undef realloc # define realloc rpl_realloc # endif -_GL_FUNCDECL_RPL (realloc, void *, +_GL_FUNCATTR_RPL (realloc, void *, (void *ptr, size_t size), _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (realloc, void *, (void *ptr, size_t size)); @@ -1467,12 +1467,12 @@ _GL_CXXALIAS_RPL (realloc, void *, (void *ptr, size_t size)); # if __GNUC__ >= 11 && !defined __clang__ /* For -Wmismatched-dealloc: Associate realloc with free or rpl_free. */ # if __GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2 -_GL_FUNCDECL_SYS (realloc, void *, +_GL_FUNCATTR_SYS (realloc, void *, (void *ptr, size_t size), _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_NODISCARD) _GL_ATTRIBUTE_NOTHROW; # else -_GL_FUNCDECL_SYS (realloc, void *, +_GL_FUNCATTR_SYS (realloc, void *, (void *ptr, size_t size), _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_NODISCARD); # endif @@ -1487,12 +1487,12 @@ _GL_CXXALIASWARN (realloc); && (__GNUC__ >= 11 && !defined __clang__) && !defined realloc /* For -Wmismatched-dealloc: Associate realloc with free or rpl_free. */ # if __GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2 -_GL_FUNCDECL_SYS (realloc, void *, +_GL_FUNCATTR_SYS (realloc, void *, (void *ptr, size_t size), _GL_ATTRIBUTE_DEALLOC_FREE) _GL_ATTRIBUTE_NOTHROW; # else -_GL_FUNCDECL_SYS (realloc, void *, +_GL_FUNCATTR_SYS (realloc, void *, (void *ptr, size_t size), _GL_ATTRIBUTE_DEALLOC_FREE); # endif @@ -1512,14 +1512,14 @@ _GL_WARN_ON_USE (realloc, "realloc is not POSIX compliant everywhere - " # undef reallocarray # define reallocarray rpl_reallocarray # endif -_GL_FUNCDECL_RPL (reallocarray, void *, +_GL_FUNCATTR_RPL (reallocarray, void *, (void *ptr, size_t nmemb, size_t size), _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (reallocarray, void *, (void *ptr, size_t nmemb, size_t size)); # else # if ! @HAVE_REALLOCARRAY@ -_GL_FUNCDECL_SYS (reallocarray, void *, +_GL_FUNCATTR_SYS (reallocarray, void *, (void *ptr, size_t nmemb, size_t size), _GL_ATTRIBUTE_NODISCARD); # endif @@ -1542,14 +1542,14 @@ _GL_WARN_ON_USE (reallocarray, "reallocarray is not portable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define realpath rpl_realpath # endif -_GL_FUNCDECL_RPL (realpath, char *, +_GL_FUNCATTR_RPL (realpath, char *, (const char *restrict name, char *restrict resolved), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (realpath, char *, (const char *restrict name, char *restrict resolved)); # else # if !@HAVE_REALPATH@ -_GL_FUNCDECL_SYS (realpath, char *, +_GL_FUNCATTR_SYS (realpath, char *, (const char *restrict name, char *restrict resolved), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); # endif @@ -1569,7 +1569,7 @@ _GL_WARN_ON_USE (realpath, "realpath is unportable - use gnulib module " /* Test a user response to a question. Return 1 if it is affirmative, 0 if it is negative, or -1 if not clear. */ # if !@HAVE_RPMATCH@ -_GL_FUNCDECL_SYS (rpmatch, int, (const char *response), +_GL_FUNCATTR_SYS (rpmatch, int, (const char *response), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); # endif _GL_CXXALIAS_SYS (rpmatch, int, (const char *response)); @@ -1585,7 +1585,7 @@ _GL_WARN_ON_USE (rpmatch, "rpmatch is unportable - " #if @GNULIB_SECURE_GETENV@ /* Look up NAME in the environment, returning 0 in insecure situations. */ # if !@HAVE_SECURE_GETENV@ -_GL_FUNCDECL_SYS (secure_getenv, char *, +_GL_FUNCATTR_SYS (secure_getenv, char *, (char const *name), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); # endif @@ -1607,14 +1607,14 @@ _GL_WARN_ON_USE (secure_getenv, "secure_getenv is unportable - " # undef setenv # define setenv rpl_setenv # endif -_GL_FUNCDECL_RPL (setenv, int, +_GL_FUNCATTR_RPL (setenv, int, (const char *name, const char *value, int replace), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (setenv, int, (const char *name, const char *value, int replace)); # else # if !@HAVE_DECL_SETENV@ -_GL_FUNCDECL_SYS (setenv, int, +_GL_FUNCATTR_SYS (setenv, int, (const char *name, const char *value, int replace), _GL_ARG_NONNULL ((1))); # endif @@ -1652,14 +1652,14 @@ _GL_EXTERN_C void print_stack_trace (void); # define strtod rpl_strtod # endif # define GNULIB_defined_strtod_function 1 -_GL_FUNCDECL_RPL (strtod, double, +_GL_FUNCATTR_RPL (strtod, double, (const char *restrict str, char **restrict endp), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (strtod, double, (const char *restrict str, char **restrict endp)); # else # if !@HAVE_STRTOD@ -_GL_FUNCDECL_SYS (strtod, double, +_GL_FUNCATTR_SYS (strtod, double, (const char *restrict str, char **restrict endp), _GL_ARG_NONNULL ((1))); # endif @@ -1684,14 +1684,14 @@ _GL_WARN_ON_USE (strtod, "strtod is unportable - " # define strtof rpl_strtof # endif # define GNULIB_defined_strtof_function 1 -_GL_FUNCDECL_RPL (strtof, float, +_GL_FUNCATTR_RPL (strtof, float, (const char *restrict str, char **restrict endp), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (strtof, float, (const char *restrict str, char **restrict endp)); # else # if !@HAVE_STRTOF@ -_GL_FUNCDECL_SYS (strtof, float, +_GL_FUNCATTR_SYS (strtof, float, (const char *restrict str, char **restrict endp), _GL_ARG_NONNULL ((1))); # endif @@ -1716,14 +1716,14 @@ _GL_WARN_ON_USE (strtof, "strtof is unportable - " # define strtold rpl_strtold # endif # define GNULIB_defined_strtold_function 1 -_GL_FUNCDECL_RPL (strtold, long double, +_GL_FUNCATTR_RPL (strtold, long double, (const char *restrict str, char **restrict endp), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (strtold, long double, (const char *restrict str, char **restrict endp)); # else # if !@HAVE_STRTOLD@ -_GL_FUNCDECL_SYS (strtold, long double, +_GL_FUNCATTR_SYS (strtold, long double, (const char *restrict str, char **restrict endp), _GL_ARG_NONNULL ((1))); # endif @@ -1753,7 +1753,7 @@ _GL_WARN_ON_USE (strtold, "strtold is unportable - " # define strtol rpl_strtol # endif # define GNULIB_defined_strtol_function 1 -_GL_FUNCDECL_RPL (strtol, long, +_GL_FUNCATTR_RPL (strtol, long, (const char *restrict string, char **restrict endptr, int base), _GL_ARG_NONNULL ((1))); @@ -1762,7 +1762,7 @@ _GL_CXXALIAS_RPL (strtol, long, int base)); # else # if !@HAVE_STRTOL@ -_GL_FUNCDECL_SYS (strtol, long, +_GL_FUNCATTR_SYS (strtol, long, (const char *restrict string, char **restrict endptr, int base), _GL_ARG_NONNULL ((1))); @@ -1796,7 +1796,7 @@ _GL_WARN_ON_USE (strtol, "strtol is unportable - " # define strtoll rpl_strtoll # endif # define GNULIB_defined_strtoll_function 1 -_GL_FUNCDECL_RPL (strtoll, long long, +_GL_FUNCATTR_RPL (strtoll, long long, (const char *restrict string, char **restrict endptr, int base), _GL_ARG_NONNULL ((1))); @@ -1805,7 +1805,7 @@ _GL_CXXALIAS_RPL (strtoll, long long, int base)); # else # if !@HAVE_STRTOLL@ -_GL_FUNCDECL_SYS (strtoll, long long, +_GL_FUNCATTR_SYS (strtoll, long long, (const char *restrict string, char **restrict endptr, int base), _GL_ARG_NONNULL ((1))); @@ -1836,7 +1836,7 @@ _GL_WARN_ON_USE (strtoll, "strtoll is unportable - " # define strtoul rpl_strtoul # endif # define GNULIB_defined_strtoul_function 1 -_GL_FUNCDECL_RPL (strtoul, unsigned long, +_GL_FUNCATTR_RPL (strtoul, unsigned long, (const char *restrict string, char **restrict endptr, int base), _GL_ARG_NONNULL ((1))); @@ -1845,7 +1845,7 @@ _GL_CXXALIAS_RPL (strtoul, unsigned long, int base)); # else # if !@HAVE_STRTOUL@ -_GL_FUNCDECL_SYS (strtoul, unsigned long, +_GL_FUNCATTR_SYS (strtoul, unsigned long, (const char *restrict string, char **restrict endptr, int base), _GL_ARG_NONNULL ((1))); @@ -1879,7 +1879,7 @@ _GL_WARN_ON_USE (strtoul, "strtoul is unportable - " # define strtoull rpl_strtoull # endif # define GNULIB_defined_strtoull_function 1 -_GL_FUNCDECL_RPL (strtoull, unsigned long long, +_GL_FUNCATTR_RPL (strtoull, unsigned long long, (const char *restrict string, char **restrict endptr, int base), _GL_ARG_NONNULL ((1))); @@ -1888,7 +1888,7 @@ _GL_CXXALIAS_RPL (strtoull, unsigned long long, int base)); # else # if !@HAVE_STRTOULL@ -_GL_FUNCDECL_SYS (strtoull, unsigned long long, +_GL_FUNCATTR_SYS (strtoull, unsigned long long, (const char *restrict string, char **restrict endptr, int base), _GL_ARG_NONNULL ((1))); @@ -1929,11 +1929,11 @@ _GL_WARN_ON_USE (unlockpt, "unlockpt is not portable - " # undef unsetenv # define unsetenv rpl_unsetenv # endif -_GL_FUNCDECL_RPL (unsetenv, int, (const char *name), _GL_ARG_NONNULL ((1))); +_GL_FUNCATTR_RPL (unsetenv, int, (const char *name), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (unsetenv, int, (const char *name)); # else # if !@HAVE_DECL_UNSETENV@ -_GL_FUNCDECL_SYS (unsetenv, int, (const char *name), _GL_ARG_NONNULL ((1))); +_GL_FUNCATTR_SYS (unsetenv, int, (const char *name), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (unsetenv, int, (const char *name)); # endif diff --git a/lib/string.in.h b/lib/string.in.h index a588e7e2c2..2f671bae07 100644 --- a/lib/string.in.h +++ b/lib/string.in.h @@ -197,7 +197,7 @@ _GL_EXTERN_C void free (void *); this function, even if the block is dead after the call. */ #if @GNULIB_EXPLICIT_BZERO@ # if ! @HAVE_EXPLICIT_BZERO@ -_GL_FUNCDECL_SYS (explicit_bzero, void, +_GL_FUNCATTR_SYS (explicit_bzero, void, (void *__dest, size_t __n), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (explicit_bzero, void, (void *__dest, size_t __n)); @@ -274,7 +274,7 @@ _GL_CXXALIASWARN (memccpy); # undef memchr # define memchr rpl_memchr # endif -_GL_FUNCDECL_RPL (memchr, void *, (void const *__s, int __c, size_t __n), +_GL_FUNCATTR_RPL (memchr, void *, (void const *__s, int __c, size_t __n), _GL_ATTRIBUTE_PURE _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (memchr, void *, (void const *__s, int __c, size_t __n)); @@ -311,7 +311,7 @@ _GL_WARN_ON_USE (memchr, "memchr has platform-specific bugs - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define memmem rpl_memmem # endif -_GL_FUNCDECL_RPL (memmem, void *, +_GL_FUNCATTR_RPL (memmem, void *, (void const *__haystack, size_t __haystack_len, void const *__needle, size_t __needle_len), _GL_ATTRIBUTE_PURE @@ -321,7 +321,7 @@ _GL_CXXALIAS_RPL (memmem, void *, void const *__needle, size_t __needle_len)); # else # if ! @HAVE_DECL_MEMMEM@ -_GL_FUNCDECL_SYS (memmem, void *, +_GL_FUNCATTR_SYS (memmem, void *, (void const *__haystack, size_t __haystack_len, void const *__needle, size_t __needle_len), _GL_ATTRIBUTE_PURE @@ -349,7 +349,7 @@ _GL_WARN_ON_USE (memmem, "memmem is unportable and often quadratic - " # undef mempcpy # define mempcpy rpl_mempcpy # endif -_GL_FUNCDECL_RPL (mempcpy, void *, +_GL_FUNCATTR_RPL (mempcpy, void *, (void *restrict __dest, void const *restrict __src, size_t __n), _GL_ARG_NONNULL ((1, 2))); @@ -358,7 +358,7 @@ _GL_CXXALIAS_RPL (mempcpy, void *, size_t __n)); # else # if !@HAVE_MEMPCPY@ -_GL_FUNCDECL_SYS (mempcpy, void *, +_GL_FUNCATTR_SYS (mempcpy, void *, (void *restrict __dest, void const *restrict __src, size_t __n), _GL_ARG_NONNULL ((1, 2))); @@ -381,7 +381,7 @@ _GL_WARN_ON_USE (mempcpy, "mempcpy is unportable - " /* Search backwards through a block for a byte (specified as an int). */ #if @GNULIB_MEMRCHR@ # if ! @HAVE_DECL_MEMRCHR@ -_GL_FUNCDECL_SYS (memrchr, void *, (void const *, int, size_t), +_GL_FUNCATTR_SYS (memrchr, void *, (void const *, int, size_t), _GL_ATTRIBUTE_PURE _GL_ARG_NONNULL ((1))); # endif @@ -419,12 +419,12 @@ _GL_WARN_ON_USE (memrchr, "memrchr is unportable - " # undef memset_explicit # define memset_explicit rpl_memset_explicit # endif -_GL_FUNCDECL_RPL (memset_explicit, void *, +_GL_FUNCATTR_RPL (memset_explicit, void *, (void *__dest, int __c, size_t __n), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (memset_explicit, void *, (void *__dest, int __c, size_t __n)); # else # if !@HAVE_MEMSET_EXPLICIT@ -_GL_FUNCDECL_SYS (memset_explicit, void *, +_GL_FUNCATTR_SYS (memset_explicit, void *, (void *__dest, int __c, size_t __n), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (memset_explicit, void *, (void *__dest, int __c, size_t __n)); @@ -443,7 +443,7 @@ _GL_WARN_ON_USE (memset_explicit, "memset_explicit is unportable - " occur within N bytes. */ #if @GNULIB_RAWMEMCHR@ # if ! @HAVE_RAWMEMCHR@ -_GL_FUNCDECL_SYS (rawmemchr, void *, (void const *__s, int __c_in), +_GL_FUNCATTR_SYS (rawmemchr, void *, (void const *__s, int __c_in), _GL_ATTRIBUTE_PURE _GL_ARG_NONNULL ((1))); # endif @@ -480,14 +480,14 @@ _GL_WARN_ON_USE (rawmemchr, "rawmemchr is unportable - " # undef stpcpy # define stpcpy rpl_stpcpy # endif -_GL_FUNCDECL_RPL (stpcpy, char *, +_GL_FUNCATTR_RPL (stpcpy, char *, (char *restrict __dst, char const *restrict __src), _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (stpcpy, char *, (char *restrict __dst, char const *restrict __src)); # else # if !@HAVE_STPCPY@ -_GL_FUNCDECL_SYS (stpcpy, char *, +_GL_FUNCATTR_SYS (stpcpy, char *, (char *restrict __dst, char const *restrict __src), _GL_ARG_NONNULL ((1, 2))); # endif @@ -513,7 +513,7 @@ _GL_WARN_ON_USE (stpcpy, "stpcpy is unportable - " # undef stpncpy # define stpncpy rpl_stpncpy # endif -_GL_FUNCDECL_RPL (stpncpy, char *, +_GL_FUNCATTR_RPL (stpncpy, char *, (char *restrict __dst, char const *restrict __src, size_t __n), _GL_ARG_NONNULL ((1, 2))); @@ -522,7 +522,7 @@ _GL_CXXALIAS_RPL (stpncpy, char *, size_t __n)); # else # if ! @HAVE_STPNCPY@ -_GL_FUNCDECL_SYS (stpncpy, char *, +_GL_FUNCATTR_SYS (stpncpy, char *, (char *restrict __dst, char const *restrict __src, size_t __n), _GL_ARG_NONNULL ((1, 2))); @@ -560,14 +560,14 @@ _GL_WARN_ON_USE_CXX (strchr, # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define strchrnul rpl_strchrnul # endif -_GL_FUNCDECL_RPL (strchrnul, char *, (const char *__s, int __c_in), +_GL_FUNCATTR_RPL (strchrnul, char *, (const char *__s, int __c_in), _GL_ATTRIBUTE_PURE _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (strchrnul, char *, (const char *str, int ch)); # else # if ! @HAVE_STRCHRNUL@ -_GL_FUNCDECL_SYS (strchrnul, char *, (char const *__s, int __c_in), +_GL_FUNCATTR_SYS (strchrnul, char *, (char const *__s, int __c_in), _GL_ATTRIBUTE_PURE _GL_ARG_NONNULL ((1))); # endif @@ -605,7 +605,7 @@ _GL_WARN_ON_USE (strchrnul, "strchrnul is unportable - " # undef strdup # define strdup rpl_strdup # endif -_GL_FUNCDECL_RPL (strdup, char *, +_GL_FUNCATTR_RPL (strdup, char *, (char const *__s), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); @@ -624,13 +624,13 @@ _GL_CXXALIAS_MDA (strdup, char *, (char const *__s)); # if (!@HAVE_DECL_STRDUP@ || (__GNUC__ >= 11 && !defined __clang__)) \ && !defined strdup # if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 -_GL_FUNCDECL_SYS (strdup, char *, +_GL_FUNCATTR_SYS (strdup, char *, (char const *__s), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE) _GL_ATTRIBUTE_NOTHROW; # else -_GL_FUNCDECL_SYS (strdup, char *, +_GL_FUNCATTR_SYS (strdup, char *, (char const *__s), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); @@ -643,13 +643,13 @@ _GL_CXXALIASWARN (strdup); # if (__GNUC__ >= 11 && !defined __clang__) && !defined strdup /* For -Wmismatched-dealloc: Associate strdup with free or rpl_free. */ # if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 -_GL_FUNCDECL_SYS (strdup, char *, +_GL_FUNCATTR_SYS (strdup, char *, (char const *__s), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE) _GL_ATTRIBUTE_NOTHROW; # else -_GL_FUNCDECL_SYS (strdup, char *, +_GL_FUNCATTR_SYS (strdup, char *, (char const *__s), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); @@ -688,7 +688,7 @@ _GL_CXXALIASWARN (strdup); # undef strncat # define strncat rpl_strncat # endif -_GL_FUNCDECL_RPL (strncat, char *, +_GL_FUNCATTR_RPL (strncat, char *, (char *restrict dest, const char *restrict src, size_t n), _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (strncat, char *, @@ -715,7 +715,7 @@ _GL_WARN_ON_USE (strncat, "strncat is unportable - " # undef strndup # define strndup rpl_strndup # endif -_GL_FUNCDECL_RPL (strndup, char *, +_GL_FUNCATTR_RPL (strndup, char *, (char const *__s, size_t __n), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); @@ -724,13 +724,13 @@ _GL_CXXALIAS_RPL (strndup, char *, (char const *__s, size_t __n)); # if !@HAVE_DECL_STRNDUP@ \ || ((__GNUC__ >= 11 && !defined __clang__) && !defined strndup) # if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 -_GL_FUNCDECL_SYS (strndup, char *, +_GL_FUNCATTR_SYS (strndup, char *, (char const *__s, size_t __n), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE) _GL_ATTRIBUTE_NOTHROW; # else -_GL_FUNCDECL_SYS (strndup, char *, +_GL_FUNCATTR_SYS (strndup, char *, (char const *__s, size_t __n), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); @@ -743,13 +743,13 @@ _GL_CXXALIASWARN (strndup); # if (__GNUC__ >= 11 && !defined __clang__) && !defined strndup /* For -Wmismatched-dealloc: Associate strndup with free or rpl_free. */ # if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 -_GL_FUNCDECL_SYS (strndup, char *, +_GL_FUNCATTR_SYS (strndup, char *, (char const *__s, size_t __n), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE) _GL_ATTRIBUTE_NOTHROW; # else -_GL_FUNCDECL_SYS (strndup, char *, +_GL_FUNCATTR_SYS (strndup, char *, (char const *__s, size_t __n), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); @@ -773,13 +773,13 @@ _GL_WARN_ON_USE (strndup, "strndup is unportable - " # undef strnlen # define strnlen rpl_strnlen # endif -_GL_FUNCDECL_RPL (strnlen, size_t, (char const *__s, size_t __maxlen), +_GL_FUNCATTR_RPL (strnlen, size_t, (char const *__s, size_t __maxlen), _GL_ATTRIBUTE_PURE _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (strnlen, size_t, (char const *__s, size_t __maxlen)); # else # if ! @HAVE_DECL_STRNLEN@ -_GL_FUNCDECL_SYS (strnlen, size_t, (char const *__s, size_t __maxlen), +_GL_FUNCATTR_SYS (strnlen, size_t, (char const *__s, size_t __maxlen), _GL_ATTRIBUTE_PURE _GL_ARG_NONNULL ((1))); # endif @@ -809,7 +809,7 @@ _GL_WARN_ON_USE (strcspn, "strcspn cannot work correctly on character strings " /* Find the first occurrence in S of any character in ACCEPT. */ #if @GNULIB_STRPBRK@ # if ! @HAVE_STRPBRK@ -_GL_FUNCDECL_SYS (strpbrk, char *, (char const *__s, char const *__accept), +_GL_FUNCATTR_SYS (strpbrk, char *, (char const *__s, char const *__accept), _GL_ATTRIBUTE_PURE _GL_ARG_NONNULL ((1, 2))); # endif @@ -893,7 +893,7 @@ _GL_WARN_ON_USE_CXX (strrchr, See also strtok_r(). */ #if @GNULIB_STRSEP@ # if ! @HAVE_STRSEP@ -_GL_FUNCDECL_SYS (strsep, char *, +_GL_FUNCATTR_SYS (strsep, char *, (char **restrict __stringp, char const *restrict __delim), _GL_ARG_NONNULL ((1, 2))); # endif @@ -919,7 +919,7 @@ _GL_WARN_ON_USE (strsep, "strsep is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define strstr rpl_strstr # endif -_GL_FUNCDECL_RPL (strstr, char *, (const char *haystack, const char *needle), +_GL_FUNCATTR_RPL (strstr, char *, (const char *haystack, const char *needle), _GL_ATTRIBUTE_PURE _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (strstr, char *, (const char *haystack, const char *needle)); @@ -964,7 +964,7 @@ _GL_WARN_ON_USE (strstr, "strstr is quadratic on many systems, and cannot " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define strcasestr rpl_strcasestr # endif -_GL_FUNCDECL_RPL (strcasestr, char *, +_GL_FUNCATTR_RPL (strcasestr, char *, (const char *haystack, const char *needle), _GL_ATTRIBUTE_PURE _GL_ARG_NONNULL ((1, 2))); @@ -972,7 +972,7 @@ _GL_CXXALIAS_RPL (strcasestr, char *, (const char *haystack, const char *needle)); # else # if ! @HAVE_STRCASESTR@ -_GL_FUNCDECL_SYS (strcasestr, char *, +_GL_FUNCATTR_SYS (strcasestr, char *, (const char *haystack, const char *needle), _GL_ATTRIBUTE_PURE _GL_ARG_NONNULL ((1, 2))); @@ -1038,7 +1038,7 @@ _GL_WARN_ON_USE (strcasestr, "strcasestr does work correctly on character " # undef strtok_r # define strtok_r rpl_strtok_r # endif -_GL_FUNCDECL_RPL (strtok_r, char *, +_GL_FUNCATTR_RPL (strtok_r, char *, (char *restrict s, char const *restrict delim, char **restrict save_ptr), _GL_ARG_NONNULL ((2, 3))); @@ -1050,7 +1050,7 @@ _GL_CXXALIAS_RPL (strtok_r, char *, # undef strtok_r # endif # if ! @HAVE_DECL_STRTOK_R@ -_GL_FUNCDECL_SYS (strtok_r, char *, +_GL_FUNCATTR_SYS (strtok_r, char *, (char *restrict s, char const *restrict delim, char **restrict save_ptr), _GL_ARG_NONNULL ((2, 3))); @@ -1087,12 +1087,12 @@ _GL_WARN_ON_USE (strtok_r, "strtok_r is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define mbslen rpl_mbslen # endif -_GL_FUNCDECL_RPL (mbslen, size_t, (const char *string), +_GL_FUNCATTR_RPL (mbslen, size_t, (const char *string), _GL_ATTRIBUTE_PURE _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (mbslen, size_t, (const char *string)); # else -_GL_FUNCDECL_SYS (mbslen, size_t, (const char *string), +_GL_FUNCATTR_SYS (mbslen, size_t, (const char *string), _GL_ATTRIBUTE_PURE _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_SYS (mbslen, size_t, (const char *string)); @@ -1119,12 +1119,12 @@ _GL_EXTERN_C size_t mbsnlen (const char *string, size_t len) # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define mbschr rpl_mbschr /* avoid collision with HP-UX function */ # endif -_GL_FUNCDECL_RPL (mbschr, char *, (const char *string, int c), +_GL_FUNCATTR_RPL (mbschr, char *, (const char *string, int c), _GL_ATTRIBUTE_PURE _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (mbschr, char *, (const char *string, int c)); # else -_GL_FUNCDECL_SYS (mbschr, char *, (const char *string, int c), +_GL_FUNCATTR_SYS (mbschr, char *, (const char *string, int c), _GL_ATTRIBUTE_PURE _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_SYS (mbschr, char *, (const char *string, int c)); @@ -1141,12 +1141,12 @@ _GL_CXXALIASWARN (mbschr); # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define mbsrchr rpl_mbsrchr /* avoid collision with system function */ # endif -_GL_FUNCDECL_RPL (mbsrchr, char *, (const char *string, int c), +_GL_FUNCATTR_RPL (mbsrchr, char *, (const char *string, int c), _GL_ATTRIBUTE_PURE _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (mbsrchr, char *, (const char *string, int c)); # else -_GL_FUNCDECL_SYS (mbsrchr, char *, (const char *string, int c), +_GL_FUNCATTR_SYS (mbsrchr, char *, (const char *string, int c), _GL_ATTRIBUTE_PURE _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_SYS (mbsrchr, char *, (const char *string, int c)); @@ -1236,12 +1236,12 @@ _GL_EXTERN_C size_t mbscspn (const char *string, const char *accept) # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define mbspbrk rpl_mbspbrk /* avoid collision with HP-UX function */ # endif -_GL_FUNCDECL_RPL (mbspbrk, char *, (const char *string, const char *accept), +_GL_FUNCATTR_RPL (mbspbrk, char *, (const char *string, const char *accept), _GL_ATTRIBUTE_PURE _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (mbspbrk, char *, (const char *string, const char *accept)); # else -_GL_FUNCDECL_SYS (mbspbrk, char *, (const char *string, const char *accept), +_GL_FUNCATTR_SYS (mbspbrk, char *, (const char *string, const char *accept), _GL_ATTRIBUTE_PURE _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_SYS (mbspbrk, char *, (const char *string, const char *accept)); @@ -1331,12 +1331,12 @@ _GL_WARN_ON_USE (strerror, "strerror is unportable - " # undef strerror_r # define strerror_r rpl_strerror_r # endif -_GL_FUNCDECL_RPL (strerror_r, int, (int errnum, char *buf, size_t buflen), +_GL_FUNCATTR_RPL (strerror_r, int, (int errnum, char *buf, size_t buflen), _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (strerror_r, int, (int errnum, char *buf, size_t buflen)); # else # if !@HAVE_DECL_STRERROR_R@ -_GL_FUNCDECL_SYS (strerror_r, int, (int errnum, char *buf, size_t buflen), +_GL_FUNCATTR_SYS (strerror_r, int, (int errnum, char *buf, size_t buflen), _GL_ARG_NONNULL ((2))); # endif _GL_CXXALIAS_SYS (strerror_r, int, (int errnum, char *buf, size_t buflen)); @@ -1435,13 +1435,13 @@ _GL_WARN_ON_USE (strsignal, "strsignal is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define strverscmp rpl_strverscmp # endif -_GL_FUNCDECL_RPL (strverscmp, int, (const char *, const char *), +_GL_FUNCATTR_RPL (strverscmp, int, (const char *, const char *), _GL_ATTRIBUTE_PURE _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (strverscmp, int, (const char *, const char *)); # else # if !@HAVE_STRVERSCMP@ -_GL_FUNCDECL_SYS (strverscmp, int, (const char *, const char *), +_GL_FUNCATTR_SYS (strverscmp, int, (const char *, const char *), _GL_ATTRIBUTE_PURE _GL_ARG_NONNULL ((1, 2))); # endif diff --git a/lib/sys_random.in.h b/lib/sys_random.in.h index 279ce62130..f02d097f9b 100644 --- a/lib/sys_random.in.h +++ b/lib/sys_random.in.h @@ -76,14 +76,14 @@ # undef getrandom # define getrandom rpl_getrandom # endif -_GL_FUNCDECL_RPL (getrandom, ssize_t, +_GL_FUNCATTR_RPL (getrandom, ssize_t, (void *buffer, size_t length, unsigned int flags), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (getrandom, ssize_t, (void *buffer, size_t length, unsigned int flags)); # else # if !@HAVE_GETRANDOM@ -_GL_FUNCDECL_SYS (getrandom, ssize_t, +_GL_FUNCATTR_SYS (getrandom, ssize_t, (void *buffer, size_t length, unsigned int flags), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); # endif diff --git a/lib/sys_resource.in.h b/lib/sys_resource.in.h index 0db80b2d88..7a435180db 100644 --- a/lib/sys_resource.in.h +++ b/lib/sys_resource.in.h @@ -110,7 +110,7 @@ struct rusage #if @GNULIB_GETRUSAGE@ # if !@HAVE_GETRUSAGE@ -_GL_FUNCDECL_SYS (getrusage, int, (int who, struct rusage *usage_p), +_GL_FUNCATTR_SYS (getrusage, int, (int who, struct rusage *usage_p), _GL_ARG_NONNULL ((2))); # endif _GL_CXXALIAS_SYS (getrusage, int, (int who, struct rusage *usage_p)); diff --git a/lib/sys_socket.in.h b/lib/sys_socket.in.h index a478a1d782..6fe8499398 100644 --- a/lib/sys_socket.in.h +++ b/lib/sys_socket.in.h @@ -314,7 +314,7 @@ _GL_WARN_ON_USE (socket, "socket is not always POSIX compliant - " # undef connect # define connect rpl_connect # endif -_GL_FUNCDECL_RPL (connect, int, +_GL_FUNCATTR_RPL (connect, int, (int fd, const struct sockaddr *addr, socklen_t addrlen), _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (connect, int, @@ -384,7 +384,7 @@ _GL_WARN_ON_USE (accept, "accept is not always POSIX compliant - " # undef bind # define bind rpl_bind # endif -_GL_FUNCDECL_RPL (bind, int, +_GL_FUNCATTR_RPL (bind, int, (int fd, const struct sockaddr *addr, socklen_t addrlen), _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (bind, int, @@ -416,7 +416,7 @@ _GL_WARN_ON_USE (bind, "bind is not always POSIX compliant - " # undef getpeername # define getpeername rpl_getpeername # endif -_GL_FUNCDECL_RPL (getpeername, int, +_GL_FUNCATTR_RPL (getpeername, int, (int fd, struct sockaddr *restrict addr, socklen_t *restrict addrlen), _GL_ARG_NONNULL ((2, 3))); @@ -452,7 +452,7 @@ _GL_WARN_ON_USE (getpeername, "getpeername is not always POSIX compliant - " # undef getsockname # define getsockname rpl_getsockname # endif -_GL_FUNCDECL_RPL (getsockname, int, +_GL_FUNCATTR_RPL (getsockname, int, (int fd, struct sockaddr *restrict addr, socklen_t *restrict addrlen), _GL_ARG_NONNULL ((2, 3))); @@ -488,7 +488,7 @@ _GL_WARN_ON_USE (getsockname, "getsockname is not always POSIX compliant - " # undef getsockopt # define getsockopt rpl_getsockopt # endif -_GL_FUNCDECL_RPL (getsockopt, int, +_GL_FUNCATTR_RPL (getsockopt, int, (int fd, int level, int optname, void *restrict optval, socklen_t *restrict optlen), _GL_ARG_NONNULL ((4, 5))); @@ -547,7 +547,7 @@ _GL_WARN_ON_USE (listen, "listen is not always POSIX compliant - " # undef recv # define recv rpl_recv # endif -_GL_FUNCDECL_RPL (recv, ssize_t, (int fd, void *buf, size_t len, int flags), +_GL_FUNCATTR_RPL (recv, ssize_t, (int fd, void *buf, size_t len, int flags), _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (recv, ssize_t, (int fd, void *buf, size_t len, int flags)); # else @@ -576,7 +576,7 @@ _GL_WARN_ON_USE (recv, "recv is not always POSIX compliant - " # undef send # define send rpl_send # endif -_GL_FUNCDECL_RPL (send, ssize_t, +_GL_FUNCATTR_RPL (send, ssize_t, (int fd, const void *buf, size_t len, int flags), _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (send, ssize_t, @@ -608,7 +608,7 @@ _GL_WARN_ON_USE (send, "send is not always POSIX compliant - " # undef recvfrom # define recvfrom rpl_recvfrom # endif -_GL_FUNCDECL_RPL (recvfrom, ssize_t, +_GL_FUNCATTR_RPL (recvfrom, ssize_t, (int fd, void *restrict buf, size_t len, int flags, struct sockaddr *restrict from, socklen_t *restrict fromlen), @@ -647,7 +647,7 @@ _GL_WARN_ON_USE (recvfrom, "recvfrom is not always POSIX compliant - " # undef sendto # define sendto rpl_sendto # endif -_GL_FUNCDECL_RPL (sendto, ssize_t, +_GL_FUNCATTR_RPL (sendto, ssize_t, (int fd, const void *buf, size_t len, int flags, const struct sockaddr *to, socklen_t tolen), _GL_ARG_NONNULL ((2))); @@ -681,7 +681,7 @@ _GL_WARN_ON_USE (sendto, "sendto is not always POSIX compliant - " # undef setsockopt # define setsockopt rpl_setsockopt # endif -_GL_FUNCDECL_RPL (setsockopt, int, (int fd, int level, int optname, +_GL_FUNCATTR_RPL (setsockopt, int, (int fd, int level, int optname, const void * optval, socklen_t optlen), _GL_ARG_NONNULL ((4))); _GL_CXXALIAS_RPL (setsockopt, int, (int fd, int level, int optname, diff --git a/lib/sys_stat.in.h b/lib/sys_stat.in.h index d2ecdb9da9..4df3bbd2cc 100644 --- a/lib/sys_stat.in.h +++ b/lib/sys_stat.in.h @@ -436,7 +436,7 @@ struct stat # undef chmod # define chmod rpl_chmod # endif -_GL_FUNCDECL_RPL (chmod, int, (const char *filename, mode_t mode), +_GL_FUNCATTR_RPL (chmod, int, (const char *filename, mode_t mode), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (chmod, int, (const char *filename, mode_t mode)); # elif defined _WIN32 && !defined __CYGWIN__ @@ -480,14 +480,14 @@ _GL_CXXALIASWARN (chmod); # undef fchmodat # define fchmodat rpl_fchmodat # endif -_GL_FUNCDECL_RPL (fchmodat, int, +_GL_FUNCATTR_RPL (fchmodat, int, (int fd, char const *file, mode_t mode, int flag), _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (fchmodat, int, (int fd, char const *file, mode_t mode, int flag)); # else # if !@HAVE_FCHMODAT@ -_GL_FUNCDECL_SYS (fchmodat, int, +_GL_FUNCATTR_SYS (fchmodat, int, (int fd, char const *file, mode_t mode, int flag), _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_NODISCARD); # endif @@ -510,7 +510,7 @@ _GL_WARN_ON_USE (fchmodat, "fchmodat is not portable - " # undef fstat # define fstat rpl_fstat # endif -_GL_FUNCDECL_RPL (fstat, int, (int fd, struct stat *buf), +_GL_FUNCATTR_RPL (fstat, int, (int fd, struct stat *buf), _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (fstat, int, (int fd, struct stat *buf)); # else @@ -542,7 +542,7 @@ _GL_WARN_ON_USE (fstat, "fstat has portability problems - " # undef fstatat # define fstatat rpl_fstatat # endif -_GL_FUNCDECL_RPL (fstatat, int, +_GL_FUNCATTR_RPL (fstatat, int, (int fd, char const *restrict name, struct stat *restrict st, int flags), _GL_ARG_NONNULL ((2, 3))); @@ -551,7 +551,7 @@ _GL_CXXALIAS_RPL (fstatat, int, int flags)); # else # if !@HAVE_FSTATAT@ -_GL_FUNCDECL_SYS (fstatat, int, +_GL_FUNCATTR_SYS (fstatat, int, (int fd, char const *restrict name, struct stat *restrict st, int flags), _GL_ARG_NONNULL ((2, 3))); @@ -630,7 +630,7 @@ _GL_WARN_ON_USE (getumask, "getumask is not portable - " /* Change the mode of FILENAME to MODE, without dereferencing it if FILENAME denotes a symbolic link. */ # if !@HAVE_LCHMOD@ || defined __hpux -_GL_FUNCDECL_SYS (lchmod, int, (const char *filename, mode_t mode), +_GL_FUNCATTR_SYS (lchmod, int, (const char *filename, mode_t mode), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (lchmod, int, (const char *filename, mode_t mode)); @@ -650,7 +650,7 @@ _GL_WARN_ON_USE (lchmod, "lchmod is unportable - " # undef mkdir # define mkdir rpl_mkdir # endif -_GL_FUNCDECL_RPL (mkdir, int, (char const *name, mode_t mode), +_GL_FUNCATTR_RPL (mkdir, int, (char const *name, mode_t mode), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (mkdir, int, (char const *name, mode_t mode)); # elif defined _WIN32 && !defined __CYGWIN__ @@ -708,7 +708,7 @@ _GL_WARN_ON_USE (mkdir, "mkdir does not always support two parameters - " #if @GNULIB_MKDIRAT@ # if !@HAVE_MKDIRAT@ -_GL_FUNCDECL_SYS (mkdirat, int, (int fd, char const *file, mode_t mode), +_GL_FUNCATTR_SYS (mkdirat, int, (int fd, char const *file, mode_t mode), _GL_ARG_NONNULL ((2))); # endif _GL_CXXALIAS_SYS (mkdirat, int, (int fd, char const *file, mode_t mode)); @@ -728,12 +728,12 @@ _GL_WARN_ON_USE (mkdirat, "mkdirat is not portable - " # undef mkfifo # define mkfifo rpl_mkfifo # endif -_GL_FUNCDECL_RPL (mkfifo, int, (char const *file, mode_t mode), +_GL_FUNCATTR_RPL (mkfifo, int, (char const *file, mode_t mode), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (mkfifo, int, (char const *file, mode_t mode)); # else # if !@HAVE_MKFIFO@ -_GL_FUNCDECL_SYS (mkfifo, int, (char const *file, mode_t mode), +_GL_FUNCATTR_SYS (mkfifo, int, (char const *file, mode_t mode), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (mkfifo, int, (char const *file, mode_t mode)); @@ -754,12 +754,12 @@ _GL_WARN_ON_USE (mkfifo, "mkfifo is not portable - " # undef mkfifoat # define mkfifoat rpl_mkfifoat # endif -_GL_FUNCDECL_RPL (mkfifoat, int, (int fd, char const *file, mode_t mode), +_GL_FUNCATTR_RPL (mkfifoat, int, (int fd, char const *file, mode_t mode), _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (mkfifoat, int, (int fd, char const *file, mode_t mode)); # else # if !@HAVE_MKFIFOAT@ -_GL_FUNCDECL_SYS (mkfifoat, int, (int fd, char const *file, mode_t mode), +_GL_FUNCATTR_SYS (mkfifoat, int, (int fd, char const *file, mode_t mode), _GL_ARG_NONNULL ((2))); # endif _GL_CXXALIAS_SYS (mkfifoat, int, (int fd, char const *file, mode_t mode)); @@ -782,12 +782,12 @@ _GL_WARN_ON_USE (mkfifoat, "mkfifoat is not portable - " # undef mknod # define mknod rpl_mknod # endif -_GL_FUNCDECL_RPL (mknod, int, (char const *file, mode_t mode, dev_t dev), +_GL_FUNCATTR_RPL (mknod, int, (char const *file, mode_t mode, dev_t dev), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (mknod, int, (char const *file, mode_t mode, dev_t dev)); # else # if !@HAVE_MKNOD@ -_GL_FUNCDECL_SYS (mknod, int, (char const *file, mode_t mode, dev_t dev), +_GL_FUNCATTR_SYS (mknod, int, (char const *file, mode_t mode, dev_t dev), _GL_ARG_NONNULL ((1))); # endif /* Need to cast, because on OSF/1 5.1, the third parameter is '...'. */ @@ -809,14 +809,14 @@ _GL_WARN_ON_USE (mknod, "mknod is not portable - " # undef mknodat # define mknodat rpl_mknodat # endif -_GL_FUNCDECL_RPL (mknodat, int, +_GL_FUNCATTR_RPL (mknodat, int, (int fd, char const *file, mode_t mode, dev_t dev), _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (mknodat, int, (int fd, char const *file, mode_t mode, dev_t dev)); # else # if !@HAVE_MKNODAT@ -_GL_FUNCDECL_SYS (mknodat, int, +_GL_FUNCATTR_SYS (mknodat, int, (int fd, char const *file, mode_t mode, dev_t dev), _GL_ARG_NONNULL ((2))); # endif @@ -923,7 +923,7 @@ _GL_CXXALIAS_RPL_1 (lstat, stat, int, # undef lstat # define lstat rpl_lstat # endif -_GL_FUNCDECL_RPL (lstat, int, +_GL_FUNCATTR_RPL (lstat, int, (const char *restrict name, struct stat *restrict buf), _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (lstat, int, @@ -977,14 +977,14 @@ _GL_CXXALIASWARN (umask); # undef utimensat # define utimensat rpl_utimensat # endif -_GL_FUNCDECL_RPL (utimensat, int, (int fd, char const *name, +_GL_FUNCATTR_RPL (utimensat, int, (int fd, char const *name, struct timespec const times[2], int flag), _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (utimensat, int, (int fd, char const *name, struct timespec const times[2], int flag)); # else # if !@HAVE_UTIMENSAT@ -_GL_FUNCDECL_SYS (utimensat, int, (int fd, char const *name, +_GL_FUNCATTR_SYS (utimensat, int, (int fd, char const *name, struct timespec const times[2], int flag), _GL_ARG_NONNULL ((2))); # endif diff --git a/lib/sys_time.in.h b/lib/sys_time.in.h index 88e912e60e..7944828e45 100644 --- a/lib/sys_time.in.h +++ b/lib/sys_time.in.h @@ -104,14 +104,14 @@ struct timeval # undef gettimeofday # define gettimeofday rpl_gettimeofday # endif -_GL_FUNCDECL_RPL (gettimeofday, int, +_GL_FUNCATTR_RPL (gettimeofday, int, (struct timeval *restrict, void *restrict), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (gettimeofday, int, (struct timeval *restrict, void *restrict)); # else # if !@HAVE_GETTIMEOFDAY@ -_GL_FUNCDECL_SYS (gettimeofday, int, +_GL_FUNCATTR_SYS (gettimeofday, int, (struct timeval *restrict, void *restrict), _GL_ARG_NONNULL ((1))); # endif diff --git a/lib/threads.in.h b/lib/threads.in.h index 6a52e7b795..46b9343c74 100644 --- a/lib/threads.in.h +++ b/lib/threads.in.h @@ -163,12 +163,12 @@ typedef int (* thrd_start_t) (void *); # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define thrd_create rpl_thrd_create # endif -_GL_FUNCDECL_RPL (thrd_create, int, (thrd_t *, thrd_start_t, void *), +_GL_FUNCATTR_RPL (thrd_create, int, (thrd_t *, thrd_start_t, void *), _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (thrd_create, int, (thrd_t *, thrd_start_t, void *)); # else # if !@HAVE_THREADS_H@ -_GL_FUNCDECL_SYS (thrd_create, int, (thrd_t *, thrd_start_t, void *), +_GL_FUNCATTR_SYS (thrd_create, int, (thrd_t *, thrd_start_t, void *), _GL_ARG_NONNULL ((1, 2))); # endif _GL_CXXALIAS_SYS (thrd_create, int, (thrd_t *, thrd_start_t, void *)); @@ -187,11 +187,11 @@ _GL_WARN_ON_USE (thrd_create, "thrd_create is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define thrd_current rpl_thrd_current # endif -_GL_FUNCDECL_RPL (thrd_current, thrd_t, (void), _GL_ATTRIBUTE_PURE); +_GL_FUNCATTR_RPL (thrd_current, thrd_t, (void), _GL_ATTRIBUTE_PURE); _GL_CXXALIAS_RPL (thrd_current, thrd_t, (void)); # else # if !@HAVE_THREADS_H@ -_GL_FUNCDECL_SYS (thrd_current, thrd_t, (void), _GL_ATTRIBUTE_PURE); +_GL_FUNCATTR_SYS (thrd_current, thrd_t, (void), _GL_ATTRIBUTE_PURE); # endif _GL_CXXALIAS_SYS (thrd_current, thrd_t, (void)); # endif @@ -209,11 +209,11 @@ _GL_WARN_ON_USE (thrd_current, "thrd_current is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define thrd_equal rpl_thrd_equal # endif -_GL_FUNCDECL_RPL (thrd_equal, int, (thrd_t, thrd_t), _GL_ATTRIBUTE_PURE); +_GL_FUNCATTR_RPL (thrd_equal, int, (thrd_t, thrd_t), _GL_ATTRIBUTE_PURE); _GL_CXXALIAS_RPL (thrd_equal, int, (thrd_t, thrd_t)); # else # if !@HAVE_THREADS_H@ -_GL_FUNCDECL_SYS (thrd_equal, int, (thrd_t, thrd_t), _GL_ATTRIBUTE_PURE); +_GL_FUNCATTR_SYS (thrd_equal, int, (thrd_t, thrd_t), _GL_ATTRIBUTE_PURE); # endif _GL_CXXALIAS_SYS (thrd_equal, int, (thrd_t, thrd_t)); # endif @@ -231,14 +231,14 @@ _GL_WARN_ON_USE (thrd_equal, "thrd_equal is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define thrd_sleep rpl_thrd_sleep # endif -_GL_FUNCDECL_RPL (thrd_sleep, int, +_GL_FUNCATTR_RPL (thrd_sleep, int, (const struct timespec *, struct timespec *), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (thrd_sleep, int, (const struct timespec *, struct timespec *)); # else # if !@HAVE_THREADS_H@ -_GL_FUNCDECL_SYS (thrd_sleep, int, +_GL_FUNCATTR_SYS (thrd_sleep, int, (const struct timespec *, struct timespec *), _GL_ARG_NONNULL ((1))); # endif @@ -392,11 +392,11 @@ typedef pthread_mutex_t mtx_t; # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define mtx_init rpl_mtx_init # endif -_GL_FUNCDECL_RPL (mtx_init, int, (mtx_t *, int), _GL_ARG_NONNULL ((1))); +_GL_FUNCATTR_RPL (mtx_init, int, (mtx_t *, int), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (mtx_init, int, (mtx_t *, int)); # else # if !@HAVE_THREADS_H@ -_GL_FUNCDECL_SYS (mtx_init, int, (mtx_t *, int), _GL_ARG_NONNULL ((1))); +_GL_FUNCATTR_SYS (mtx_init, int, (mtx_t *, int), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (mtx_init, int, (mtx_t *, int)); # endif @@ -414,11 +414,11 @@ _GL_WARN_ON_USE (mtx_init, "mtx_init is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define mtx_lock rpl_mtx_lock # endif -_GL_FUNCDECL_RPL (mtx_lock, int, (mtx_t *), _GL_ARG_NONNULL ((1))); +_GL_FUNCATTR_RPL (mtx_lock, int, (mtx_t *), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (mtx_lock, int, (mtx_t *)); # else # if !@HAVE_THREADS_H@ -_GL_FUNCDECL_SYS (mtx_lock, int, (mtx_t *), _GL_ARG_NONNULL ((1))); +_GL_FUNCATTR_SYS (mtx_lock, int, (mtx_t *), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (mtx_lock, int, (mtx_t *)); # endif @@ -436,11 +436,11 @@ _GL_WARN_ON_USE (mtx_lock, "mtx_lock is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define mtx_trylock rpl_mtx_trylock # endif -_GL_FUNCDECL_RPL (mtx_trylock, int, (mtx_t *), _GL_ARG_NONNULL ((1))); +_GL_FUNCATTR_RPL (mtx_trylock, int, (mtx_t *), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (mtx_trylock, int, (mtx_t *)); # else # if !@HAVE_THREADS_H@ -_GL_FUNCDECL_SYS (mtx_trylock, int, (mtx_t *), _GL_ARG_NONNULL ((1))); +_GL_FUNCATTR_SYS (mtx_trylock, int, (mtx_t *), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (mtx_trylock, int, (mtx_t *)); # endif @@ -458,12 +458,12 @@ _GL_WARN_ON_USE (mtx_trylock, "mtx_trylock is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define mtx_timedlock rpl_mtx_timedlock # endif -_GL_FUNCDECL_RPL (mtx_timedlock, int, (mtx_t *, const struct timespec *), +_GL_FUNCATTR_RPL (mtx_timedlock, int, (mtx_t *, const struct timespec *), _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (mtx_timedlock, int, (mtx_t *, const struct timespec *)); # else # if !@HAVE_THREADS_H@ -_GL_FUNCDECL_SYS (mtx_timedlock, int, (mtx_t *, const struct timespec *), +_GL_FUNCATTR_SYS (mtx_timedlock, int, (mtx_t *, const struct timespec *), _GL_ARG_NONNULL ((1, 2))); # endif _GL_CXXALIAS_SYS (mtx_timedlock, int, (mtx_t *, const struct timespec *)); @@ -482,11 +482,11 @@ _GL_WARN_ON_USE (mtx_timedlock, "mtx_timedlock is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define mtx_unlock rpl_mtx_unlock # endif -_GL_FUNCDECL_RPL (mtx_unlock, int, (mtx_t *), _GL_ARG_NONNULL ((1))); +_GL_FUNCATTR_RPL (mtx_unlock, int, (mtx_t *), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (mtx_unlock, int, (mtx_t *)); # else # if !@HAVE_THREADS_H@ -_GL_FUNCDECL_SYS (mtx_unlock, int, (mtx_t *), _GL_ARG_NONNULL ((1))); +_GL_FUNCATTR_SYS (mtx_unlock, int, (mtx_t *), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (mtx_unlock, int, (mtx_t *)); # endif @@ -504,11 +504,11 @@ _GL_WARN_ON_USE (mtx_unlock, "mtx_unlock is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define mtx_destroy rpl_mtx_destroy # endif -_GL_FUNCDECL_RPL (mtx_destroy, void, (mtx_t *), _GL_ARG_NONNULL ((1))); +_GL_FUNCATTR_RPL (mtx_destroy, void, (mtx_t *), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (mtx_destroy, void, (mtx_t *)); # else # if !@HAVE_THREADS_H@ -_GL_FUNCDECL_SYS (mtx_destroy, void, (mtx_t *), _GL_ARG_NONNULL ((1))); +_GL_FUNCATTR_SYS (mtx_destroy, void, (mtx_t *), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (mtx_destroy, void, (mtx_t *)); # endif @@ -550,12 +550,12 @@ typedef pthread_once_t once_flag; # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define call_once rpl_call_once # endif -_GL_FUNCDECL_RPL (call_once, void, (once_flag *, void (*) (void)), +_GL_FUNCATTR_RPL (call_once, void, (once_flag *, void (*) (void)), _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (call_once, void, (once_flag *, void (*) (void))); # else # if !@HAVE_THREADS_H@ -_GL_FUNCDECL_SYS (call_once, void, (once_flag *, void (*) (void)), +_GL_FUNCATTR_SYS (call_once, void, (once_flag *, void (*) (void)), _GL_ARG_NONNULL ((1, 2))); # endif _GL_CXXALIAS_SYS_CAST (call_once, void, (once_flag *, void (*) (void))); @@ -595,11 +595,11 @@ typedef pthread_cond_t cnd_t; # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define cnd_init rpl_cnd_init # endif -_GL_FUNCDECL_RPL (cnd_init, int, (cnd_t *), _GL_ARG_NONNULL ((1))); +_GL_FUNCATTR_RPL (cnd_init, int, (cnd_t *), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (cnd_init, int, (cnd_t *)); # else # if !@HAVE_THREADS_H@ -_GL_FUNCDECL_SYS (cnd_init, int, (cnd_t *), _GL_ARG_NONNULL ((1))); +_GL_FUNCATTR_SYS (cnd_init, int, (cnd_t *), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (cnd_init, int, (cnd_t *)); # endif @@ -617,11 +617,11 @@ _GL_WARN_ON_USE (cnd_init, "cnd_init is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define cnd_wait rpl_cnd_wait # endif -_GL_FUNCDECL_RPL (cnd_wait, int, (cnd_t *, mtx_t *), _GL_ARG_NONNULL ((1, 2))); +_GL_FUNCATTR_RPL (cnd_wait, int, (cnd_t *, mtx_t *), _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (cnd_wait, int, (cnd_t *, mtx_t *)); # else # if !@HAVE_THREADS_H@ -_GL_FUNCDECL_SYS (cnd_wait, int, (cnd_t *, mtx_t *), _GL_ARG_NONNULL ((1, 2))); +_GL_FUNCATTR_SYS (cnd_wait, int, (cnd_t *, mtx_t *), _GL_ARG_NONNULL ((1, 2))); # endif _GL_CXXALIAS_SYS (cnd_wait, int, (cnd_t *, mtx_t *)); # endif @@ -639,14 +639,14 @@ _GL_WARN_ON_USE (cnd_wait, "cnd_wait is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define cnd_timedwait rpl_cnd_timedwait # endif -_GL_FUNCDECL_RPL (cnd_timedwait, int, +_GL_FUNCATTR_RPL (cnd_timedwait, int, (cnd_t *, mtx_t *, const struct timespec *), _GL_ARG_NONNULL ((1, 2, 3))); _GL_CXXALIAS_RPL (cnd_timedwait, int, (cnd_t *, mtx_t *, const struct timespec *)); # else # if !@HAVE_THREADS_H@ -_GL_FUNCDECL_SYS (cnd_timedwait, int, +_GL_FUNCATTR_SYS (cnd_timedwait, int, (cnd_t *, mtx_t *, const struct timespec *), _GL_ARG_NONNULL ((1, 2, 3))); # endif @@ -667,11 +667,11 @@ _GL_WARN_ON_USE (cnd_timedwait, "cnd_timedwait is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define cnd_signal rpl_cnd_signal # endif -_GL_FUNCDECL_RPL (cnd_signal, int, (cnd_t *), _GL_ARG_NONNULL ((1))); +_GL_FUNCATTR_RPL (cnd_signal, int, (cnd_t *), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (cnd_signal, int, (cnd_t *)); # else # if !@HAVE_THREADS_H@ -_GL_FUNCDECL_SYS (cnd_signal, int, (cnd_t *), _GL_ARG_NONNULL ((1))); +_GL_FUNCATTR_SYS (cnd_signal, int, (cnd_t *), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (cnd_signal, int, (cnd_t *)); # endif @@ -689,11 +689,11 @@ _GL_WARN_ON_USE (cnd_signal, "cnd_signal is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define cnd_broadcast rpl_cnd_broadcast # endif -_GL_FUNCDECL_RPL (cnd_broadcast, int, (cnd_t *), _GL_ARG_NONNULL ((1))); +_GL_FUNCATTR_RPL (cnd_broadcast, int, (cnd_t *), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (cnd_broadcast, int, (cnd_t *)); # else # if !@HAVE_THREADS_H@ -_GL_FUNCDECL_SYS (cnd_broadcast, int, (cnd_t *), _GL_ARG_NONNULL ((1))); +_GL_FUNCATTR_SYS (cnd_broadcast, int, (cnd_t *), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (cnd_broadcast, int, (cnd_t *)); # endif @@ -711,11 +711,11 @@ _GL_WARN_ON_USE (cnd_broadcast, "cnd_broadcast is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define cnd_destroy rpl_cnd_destroy # endif -_GL_FUNCDECL_RPL (cnd_destroy, void, (cnd_t *), _GL_ARG_NONNULL ((1))); +_GL_FUNCATTR_RPL (cnd_destroy, void, (cnd_t *), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (cnd_destroy, void, (cnd_t *)); # else # if !@HAVE_THREADS_H@ -_GL_FUNCDECL_SYS (cnd_destroy, void, (cnd_t *), _GL_ARG_NONNULL ((1))); +_GL_FUNCATTR_SYS (cnd_destroy, void, (cnd_t *), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (cnd_destroy, void, (cnd_t *)); # endif @@ -771,12 +771,12 @@ typedef void (*tss_dtor_t) (void *); # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define tss_create rpl_tss_create # endif -_GL_FUNCDECL_RPL (tss_create, int, (tss_t *, tss_dtor_t), +_GL_FUNCATTR_RPL (tss_create, int, (tss_t *, tss_dtor_t), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (tss_create, int, (tss_t *, tss_dtor_t)); # else # if !@HAVE_THREADS_H@ -_GL_FUNCDECL_SYS (tss_create, int, (tss_t *, tss_dtor_t), +_GL_FUNCATTR_SYS (tss_create, int, (tss_t *, tss_dtor_t), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (tss_create, int, (tss_t *, tss_dtor_t)); diff --git a/lib/time.in.h b/lib/time.in.h index 097c509d3c..c384bd37ab 100644 --- a/lib/time.in.h +++ b/lib/time.in.h @@ -147,12 +147,12 @@ extern # undef timespec_get # define timespec_get rpl_timespec_get # endif -_GL_FUNCDECL_RPL (timespec_get, int, (struct timespec *ts, int base), +_GL_FUNCATTR_RPL (timespec_get, int, (struct timespec *ts, int base), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (timespec_get, int, (struct timespec *ts, int base)); # else # if !@HAVE_TIMESPEC_GET@ -_GL_FUNCDECL_SYS (timespec_get, int, (struct timespec *ts, int base), +_GL_FUNCATTR_SYS (timespec_get, int, (struct timespec *ts, int base), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (timespec_get, int, (struct timespec *ts, int base)); @@ -176,12 +176,12 @@ _GL_WARN_ON_USE (timespec_get, "timespec_get is unportable - " # undef timespec_getres # define timespec_getres rpl_timespec_getres # endif -_GL_FUNCDECL_RPL (timespec_getres, int, (struct timespec *ts, int base), +_GL_FUNCATTR_RPL (timespec_getres, int, (struct timespec *ts, int base), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (timespec_getres, int, (struct timespec *ts, int base)); # else # if !@HAVE_TIMESPEC_GETRES@ -_GL_FUNCDECL_SYS (timespec_getres, int, (struct timespec *ts, int base), +_GL_FUNCATTR_SYS (timespec_getres, int, (struct timespec *ts, int base), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (timespec_getres, int, (struct timespec *ts, int base)); @@ -225,14 +225,14 @@ _GL_WARN_ON_USE (time, "time has consistency problems - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define nanosleep rpl_nanosleep # endif -_GL_FUNCDECL_RPL (nanosleep, int, +_GL_FUNCATTR_RPL (nanosleep, int, (struct timespec const *__rqtp, struct timespec *__rmtp), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (nanosleep, int, (struct timespec const *__rqtp, struct timespec *__rmtp)); # else # if ! @HAVE_NANOSLEEP@ -_GL_FUNCDECL_SYS (nanosleep, int, +_GL_FUNCATTR_SYS (nanosleep, int, (struct timespec const *__rqtp, struct timespec *__rmtp), _GL_ARG_NONNULL ((1))); # endif @@ -295,7 +295,7 @@ _GL_WARN_ON_USE (tzset, "tzset has portability problems - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define mktime rpl_mktime # endif -_GL_FUNCDECL_RPL (mktime, time_t, (struct tm *__tp), _GL_ARG_NONNULL ((1))); +_GL_FUNCATTR_RPL (mktime, time_t, (struct tm *__tp), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (mktime, time_t, (struct tm *__tp)); # else _GL_CXXALIAS_SYS (mktime, time_t, (struct tm *__tp)); @@ -320,14 +320,14 @@ _GL_WARN_ON_USE (mktime, "mktime has portability problems - " # undef localtime_r # define localtime_r rpl_localtime_r # endif -_GL_FUNCDECL_RPL (localtime_r, struct tm *, (time_t const *restrict __timer, +_GL_FUNCATTR_RPL (localtime_r, struct tm *, (time_t const *restrict __timer, struct tm *restrict __result), _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (localtime_r, struct tm *, (time_t const *restrict __timer, struct tm *restrict __result)); # else # if ! @HAVE_DECL_LOCALTIME_R@ -_GL_FUNCDECL_SYS (localtime_r, struct tm *, (time_t const *restrict __timer, +_GL_FUNCATTR_SYS (localtime_r, struct tm *, (time_t const *restrict __timer, struct tm *restrict __result), _GL_ARG_NONNULL ((1, 2))); # endif @@ -342,14 +342,14 @@ _GL_CXXALIASWARN (localtime_r); # undef gmtime_r # define gmtime_r rpl_gmtime_r # endif -_GL_FUNCDECL_RPL (gmtime_r, struct tm *, (time_t const *restrict __timer, +_GL_FUNCATTR_RPL (gmtime_r, struct tm *, (time_t const *restrict __timer, struct tm *restrict __result), _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (gmtime_r, struct tm *, (time_t const *restrict __timer, struct tm *restrict __result)); # else # if ! @HAVE_DECL_LOCALTIME_R@ -_GL_FUNCDECL_SYS (gmtime_r, struct tm *, (time_t const *restrict __timer, +_GL_FUNCATTR_SYS (gmtime_r, struct tm *, (time_t const *restrict __timer, struct tm *restrict __result), _GL_ARG_NONNULL ((1, 2))); # endif @@ -381,7 +381,7 @@ _GL_WARN_ON_USE (gmtime_r, "gmtime_r is unportable - " # undef localtime # define localtime rpl_localtime # endif -_GL_FUNCDECL_RPL (localtime, struct tm *, (time_t const *__timer), +_GL_FUNCATTR_RPL (localtime, struct tm *, (time_t const *__timer), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (localtime, struct tm *, (time_t const *__timer)); # else @@ -404,7 +404,7 @@ _GL_WARN_ON_USE (localtime, "localtime has portability problems - " # undef gmtime # define gmtime rpl_gmtime # endif -_GL_FUNCDECL_RPL (gmtime, struct tm *, (time_t const *__timer), +_GL_FUNCATTR_RPL (gmtime, struct tm *, (time_t const *__timer), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (gmtime, struct tm *, (time_t const *__timer)); # else @@ -418,7 +418,7 @@ _GL_CXXALIASWARN (gmtime); . */ # if @GNULIB_STRPTIME@ # if ! @HAVE_STRPTIME@ -_GL_FUNCDECL_SYS (strptime, char *, (char const *restrict __buf, +_GL_FUNCATTR_SYS (strptime, char *, (char const *restrict __buf, char const *restrict __format, struct tm *restrict __tm), _GL_ARG_NONNULL ((1, 2, 3))); @@ -445,7 +445,7 @@ _GL_WARN_ON_USE (strptime, "strptime is unportable - " # ifndef __cplusplus _GL_ATTRIBUTE_DEPRECATED # endif -_GL_FUNCDECL_RPL (ctime, char *, (time_t const *__tp), +_GL_FUNCATTR_RPL (ctime, char *, (time_t const *__tp), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (ctime, char *, (time_t const *__tp)); # else @@ -465,7 +465,7 @@ _GL_CXXALIASWARN (ctime); # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define strftime rpl_strftime # endif -_GL_FUNCDECL_RPL (strftime, size_t, +_GL_FUNCATTR_RPL (strftime, size_t, (char *restrict __buf, size_t __bufsize, const char *restrict __fmt, const struct tm *restrict __tp), _GL_ARG_NONNULL ((1, 3, 4))); @@ -538,7 +538,7 @@ _GL_CXXALIAS_SYS (tzfree, void, (timezone_t __tz)); # undef localtime_rz # define localtime_rz rpl_localtime_rz # endif -_GL_FUNCDECL_RPL (localtime_rz, struct tm *, +_GL_FUNCATTR_RPL (localtime_rz, struct tm *, (timezone_t __tz, time_t const *restrict __timer, struct tm *restrict __result), _GL_ARG_NONNULL ((2, 3))); @@ -547,7 +547,7 @@ _GL_CXXALIAS_RPL (localtime_rz, struct tm *, struct tm *restrict __result)); # else # if !@HAVE_TZALLOC@ -_GL_FUNCDECL_SYS (localtime_rz, struct tm *, +_GL_FUNCATTR_SYS (localtime_rz, struct tm *, (timezone_t __tz, time_t const *restrict __timer, struct tm *restrict __result), _GL_ARG_NONNULL ((2, 3))); @@ -567,14 +567,14 @@ _GL_CXXALIAS_SYS (localtime_rz, struct tm *, # undef mktime_z # define mktime_z rpl_mktime_z # endif -_GL_FUNCDECL_RPL (mktime_z, time_t, +_GL_FUNCATTR_RPL (mktime_z, time_t, (timezone_t __tz, struct tm *restrict __tm), _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (mktime_z, time_t, (timezone_t __tz, struct tm *restrict __tm)); # else # if !@HAVE_TZALLOC@ -_GL_FUNCDECL_SYS (mktime_z, time_t, +_GL_FUNCATTR_SYS (mktime_z, time_t, (timezone_t __tz, struct tm *restrict __tm), _GL_ARG_NONNULL ((2))); # endif @@ -597,11 +597,11 @@ _GL_CXXALIAS_SYS (mktime_z, time_t, # undef timegm # define timegm rpl_timegm # endif -_GL_FUNCDECL_RPL (timegm, time_t, (struct tm *__tm), _GL_ARG_NONNULL ((1))); +_GL_FUNCATTR_RPL (timegm, time_t, (struct tm *__tm), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (timegm, time_t, (struct tm *__tm)); # else # if ! @HAVE_TIMEGM@ -_GL_FUNCDECL_SYS (timegm, time_t, (struct tm *__tm), _GL_ARG_NONNULL ((1))); +_GL_FUNCATTR_SYS (timegm, time_t, (struct tm *__tm), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (timegm, time_t, (struct tm *__tm)); # endif diff --git a/lib/uchar.in.h b/lib/uchar.in.h index 9f2360471e..d6e3fea6db 100644 --- a/lib/uchar.in.h +++ b/lib/uchar.in.h @@ -170,7 +170,7 @@ btoc32 (int c) } _GL_END_C_LINKAGE # else -_GL_FUNCDECL_SYS (btoc32, wint_t, (int c), _GL_ATTRIBUTE_PURE); +_GL_FUNCATTR_SYS (btoc32, wint_t, (int c), _GL_ATTRIBUTE_PURE); # endif _GL_CXXALIAS_SYS (btoc32, wint_t, (int c)); _GL_CXXALIASWARN (btoc32); @@ -514,7 +514,7 @@ c32snrtombs (char *dest, const char32_t **srcp, size_t srclen, size_t len, } _GL_END_C_LINKAGE # else -_GL_FUNCDECL_SYS (c32snrtombs, size_t, +_GL_FUNCATTR_SYS (c32snrtombs, size_t, (char *dest, const char32_t **srcp, size_t srclen, size_t len, mbstate_t *ps), _GL_ARG_NONNULL ((2))); @@ -541,7 +541,7 @@ c32srtombs (char *dest, const char32_t **srcp, size_t len, mbstate_t *ps) } _GL_END_C_LINKAGE # else -_GL_FUNCDECL_SYS (c32srtombs, size_t, +_GL_FUNCATTR_SYS (c32srtombs, size_t, (char *dest, const char32_t **srcp, size_t len, mbstate_t *ps), _GL_ARG_NONNULL ((2))); @@ -567,7 +567,7 @@ c32stombs (char *dest, const char32_t *src, size_t len) } _GL_END_C_LINKAGE # else -_GL_FUNCDECL_SYS (c32stombs, size_t, +_GL_FUNCATTR_SYS (c32stombs, size_t, (char *dest, const char32_t *src, size_t len), _GL_ARG_NONNULL ((2))); # endif @@ -592,7 +592,7 @@ c32swidth (const char32_t *s, size_t n) } _GL_END_C_LINKAGE # else -_GL_FUNCDECL_SYS (c32swidth, int, (const char32_t *s, size_t n), +_GL_FUNCATTR_SYS (c32swidth, int, (const char32_t *s, size_t n), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (c32swidth, int, (const char32_t *s, size_t n)); @@ -703,7 +703,7 @@ mbsnrtoc32s (char32_t *dest, const char **srcp, size_t srclen, size_t len, } _GL_END_C_LINKAGE # else -_GL_FUNCDECL_SYS (mbsnrtoc32s, size_t, +_GL_FUNCATTR_SYS (mbsnrtoc32s, size_t, (char32_t *dest, const char **srcp, size_t srclen, size_t len, mbstate_t *ps), _GL_ARG_NONNULL ((2))); @@ -730,7 +730,7 @@ mbsrtoc32s (char32_t *dest, const char **srcp, size_t len, mbstate_t *ps) } _GL_END_C_LINKAGE # else -_GL_FUNCDECL_SYS (mbsrtoc32s, size_t, +_GL_FUNCATTR_SYS (mbsrtoc32s, size_t, (char32_t *dest, const char **srcp, size_t len, mbstate_t *ps), _GL_ARG_NONNULL ((2))); @@ -756,7 +756,7 @@ mbstoc32s (char32_t *dest, const char *src, size_t len) } _GL_END_C_LINKAGE # else -_GL_FUNCDECL_SYS (mbstoc32s, size_t, +_GL_FUNCATTR_SYS (mbstoc32s, size_t, (char32_t *dest, const char *src, size_t len), _GL_ARG_NONNULL ((2))); # endif @@ -798,7 +798,7 @@ c32_get_type_test (const char *name) } _GL_END_C_LINKAGE # else -_GL_FUNCDECL_SYS (c32_get_type_test, c32_type_test_t, (const char *name), +_GL_FUNCATTR_SYS (c32_get_type_test, c32_type_test_t, (const char *name), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (c32_get_type_test, c32_type_test_t, (const char *name)); @@ -829,7 +829,7 @@ _GL_FUNCDECL_SYS (c32_apply_type_test, int, (wint_t wc, c32_type_test_t property)); # endif # else -_GL_FUNCDECL_SYS (c32_apply_type_test, int, +_GL_FUNCATTR_SYS (c32_apply_type_test, int, (wint_t wc, c32_type_test_t property), _GL_ARG_NONNULL ((2))); # endif @@ -870,7 +870,7 @@ c32_get_mapping (const char *name) } _GL_END_C_LINKAGE # else -_GL_FUNCDECL_SYS (c32_get_mapping, c32_mapping_t, (const char *name), +_GL_FUNCATTR_SYS (c32_get_mapping, c32_mapping_t, (const char *name), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (c32_get_mapping, c32_mapping_t, (const char *name)); @@ -896,7 +896,7 @@ c32_apply_mapping (wint_t wc, c32_mapping_t mapping) } _GL_END_C_LINKAGE # else -_GL_FUNCDECL_SYS (c32_apply_mapping, wint_t, +_GL_FUNCATTR_SYS (c32_apply_mapping, wint_t, (wint_t wc, c32_mapping_t mapping), _GL_ARG_NONNULL ((2))); # endif diff --git a/lib/unistd.in.h b/lib/unistd.in.h index 3222f5a568..47268d0b8f 100644 --- a/lib/unistd.in.h +++ b/lib/unistd.in.h @@ -287,7 +287,7 @@ _GL_INLINE_HEADER_BEGIN # undef access # define access rpl_access # endif -_GL_FUNCDECL_RPL (access, int, (const char *file, int mode), +_GL_FUNCATTR_RPL (access, int, (const char *file, int mode), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (access, int, (const char *file, int mode)); # elif defined _WIN32 && !defined __CYGWIN__ @@ -371,12 +371,12 @@ _GL_CXXALIASWARN (chdir); # undef chown # define chown rpl_chown # endif -_GL_FUNCDECL_RPL (chown, int, (const char *file, uid_t uid, gid_t gid), +_GL_FUNCATTR_RPL (chown, int, (const char *file, uid_t uid, gid_t gid), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (chown, int, (const char *file, uid_t uid, gid_t gid)); # else # if !@HAVE_CHOWN@ -_GL_FUNCDECL_SYS (chown, int, (const char *file, uid_t uid, gid_t gid), +_GL_FUNCATTR_SYS (chown, int, (const char *file, uid_t uid, gid_t gid), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); # endif _GL_CXXALIAS_SYS (chown, int, (const char *file, uid_t uid, gid_t gid)); @@ -476,7 +476,7 @@ _GL_WARN_ON_USE (copy_file_range, # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define dup rpl_dup # endif -_GL_FUNCDECL_RPL (dup, int, (int oldfd), _GL_ATTRIBUTE_NODISCARD); +_GL_FUNCATTR_RPL (dup, int, (int oldfd), _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (dup, int, (int oldfd)); # elif defined _WIN32 && !defined __CYGWIN__ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) @@ -639,7 +639,7 @@ rpl_environ (void) /* Like access(), except that it uses the effective user id and group id of the current process. */ # if !@HAVE_EUIDACCESS@ -_GL_FUNCDECL_SYS (euidaccess, int, (const char *filename, int mode), +_GL_FUNCATTR_SYS (euidaccess, int, (const char *filename, int mode), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (euidaccess, int, (const char *filename, int mode)); @@ -664,7 +664,7 @@ _GL_WARN_ON_USE (euidaccess, "euidaccess is unportable - " # undef execl # define execl rpl_execl # endif -_GL_FUNCDECL_RPL (execl, int, (const char *program, const char *arg, ...), +_GL_FUNCATTR_RPL (execl, int, (const char *program, const char *arg, ...), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (execl, int, (const char *program, const char *arg, ...)); # else @@ -699,7 +699,7 @@ _GL_CXXALIASWARN (execl); # undef execle # define execle rpl_execle # endif -_GL_FUNCDECL_RPL (execle, int, (const char *program, const char *arg, ...), +_GL_FUNCATTR_RPL (execle, int, (const char *program, const char *arg, ...), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (execle, int, (const char *program, const char *arg, ...)); # else @@ -735,7 +735,7 @@ _GL_CXXALIASWARN (execle); # undef execlp # define execlp rpl_execlp # endif -_GL_FUNCDECL_RPL (execlp, int, (const char *program, const char *arg, ...), +_GL_FUNCATTR_RPL (execlp, int, (const char *program, const char *arg, ...), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (execlp, int, (const char *program, const char *arg, ...)); # else @@ -772,7 +772,7 @@ _GL_CXXALIASWARN (execlp); # undef execv # define execv rpl_execv # endif -_GL_FUNCDECL_RPL (execv, int, (const char *program, char * const *argv), +_GL_FUNCATTR_RPL (execv, int, (const char *program, char * const *argv), _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (execv, int, (const char *program, char * const *argv)); # else @@ -808,7 +808,7 @@ _GL_CXXALIASWARN (execv); # undef execve # define execve rpl_execve # endif -_GL_FUNCDECL_RPL (execve, int, +_GL_FUNCATTR_RPL (execve, int, (const char *program, char * const *argv, char * const *env), _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (execve, int, @@ -849,7 +849,7 @@ _GL_CXXALIASWARN (execve); # undef execvp # define execvp rpl_execvp # endif -_GL_FUNCDECL_RPL (execvp, int, (const char *program, char * const *argv), +_GL_FUNCATTR_RPL (execvp, int, (const char *program, char * const *argv), _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (execvp, int, (const char *program, char * const *argv)); # else @@ -885,14 +885,14 @@ _GL_CXXALIASWARN (execvp); # undef execvpe # define execvpe rpl_execvpe # endif -_GL_FUNCDECL_RPL (execvpe, int, +_GL_FUNCATTR_RPL (execvpe, int, (const char *program, char * const *argv, char * const *env), _GL_ARG_NONNULL ((1, 2))); _GL_CXXALIAS_RPL (execvpe, int, (const char *program, char * const *argv, char * const *env)); # else # if !@HAVE_DECL_EXECVPE@ -_GL_FUNCDECL_SYS (execvpe, int, +_GL_FUNCATTR_SYS (execvpe, int, (const char *program, char * const *argv, char * const *env), _GL_ARG_NONNULL ((1, 2))); # endif @@ -923,7 +923,7 @@ _GL_CXXALIAS_MDA_CAST (execvpe, intptr_t, char * const *env)); # elif @HAVE_EXECVPE@ # if !@HAVE_DECL_EXECVPE@ -_GL_FUNCDECL_SYS (execvpe, int, +_GL_FUNCATTR_SYS (execvpe, int, (const char *program, char * const *argv, char * const *env), _GL_ARG_NONNULL ((1, 2))); # endif @@ -942,14 +942,14 @@ _GL_CXXALIASWARN (execvpe); # undef faccessat # define faccessat rpl_faccessat # endif -_GL_FUNCDECL_RPL (faccessat, int, +_GL_FUNCATTR_RPL (faccessat, int, (int fd, char const *name, int mode, int flag), _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (faccessat, int, (int fd, char const *name, int mode, int flag)); # else # if !@HAVE_FACCESSAT@ -_GL_FUNCDECL_SYS (faccessat, int, +_GL_FUNCATTR_SYS (faccessat, int, (int fd, char const *file, int mode, int flag), _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_NODISCARD); # endif @@ -979,11 +979,11 @@ _GL_WARN_ON_USE (faccessat, "faccessat is not portable - " # undef fchdir # define fchdir rpl_fchdir # endif -_GL_FUNCDECL_RPL (fchdir, int, (int /*fd*/), _GL_ATTRIBUTE_NODISCARD); +_GL_FUNCATTR_RPL (fchdir, int, (int /*fd*/), _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (fchdir, int, (int /*fd*/)); # else # if !@HAVE_FCHDIR@ || !@HAVE_DECL_FCHDIR@ -_GL_FUNCDECL_SYS (fchdir, int, (int /*fd*/), _GL_ATTRIBUTE_NODISCARD); +_GL_FUNCATTR_SYS (fchdir, int, (int /*fd*/), _GL_ATTRIBUTE_NODISCARD); # endif _GL_CXXALIAS_SYS (fchdir, int, (int /*fd*/)); # endif @@ -1011,14 +1011,14 @@ _GL_WARN_ON_USE (fchdir, "fchdir is unportable - " # undef fchownat # define fchownat rpl_fchownat # endif -_GL_FUNCDECL_RPL (fchownat, int, (int fd, char const *file, +_GL_FUNCATTR_RPL (fchownat, int, (int fd, char const *file, uid_t owner, gid_t group, int flag), _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (fchownat, int, (int fd, char const *file, uid_t owner, gid_t group, int flag)); # else # if !@HAVE_FCHOWNAT@ -_GL_FUNCDECL_SYS (fchownat, int, (int fd, char const *file, +_GL_FUNCATTR_SYS (fchownat, int, (int fd, char const *file, uid_t owner, gid_t group, int flag), _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_NODISCARD); # endif @@ -1094,13 +1094,13 @@ _GL_WARN_ON_USE (fsync, "fsync is unportable - " # undef ftruncate # define ftruncate rpl_ftruncate # endif -_GL_FUNCDECL_RPL (ftruncate, int, +_GL_FUNCATTR_RPL (ftruncate, int, (int fd, off_t length), _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (ftruncate, int, (int fd, off_t length)); # else # if !@HAVE_FTRUNCATE@ -_GL_FUNCDECL_SYS (ftruncate, int, +_GL_FUNCATTR_SYS (ftruncate, int, (int fd, off_t length), _GL_ATTRIBUTE_NODISCARD); # endif _GL_CXXALIAS_SYS (ftruncate, int, @@ -1133,7 +1133,7 @@ _GL_WARN_ON_USE (ftruncate, "ftruncate is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define getcwd rpl_getcwd # endif -_GL_FUNCDECL_RPL (getcwd, char *, (char *buf, size_t size), +_GL_FUNCATTR_RPL (getcwd, char *, (char *buf, size_t size), _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (getcwd, char *, (char *buf, size_t size)); # elif defined _WIN32 && !defined __CYGWIN__ @@ -1189,14 +1189,14 @@ _GL_CXXALIASWARN (getcwd); # undef getdomainname # define getdomainname rpl_getdomainname # endif -_GL_FUNCDECL_RPL (getdomainname, int, +_GL_FUNCATTR_RPL (getdomainname, int, (char *name, size_t len), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (getdomainname, int, (char *name, size_t len)); # else # if !@HAVE_DECL_GETDOMAINNAME@ -_GL_FUNCDECL_SYS (getdomainname, int, +_GL_FUNCATTR_SYS (getdomainname, int, (char *name, size_t len), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); # endif @@ -1250,13 +1250,13 @@ _GL_WARN_ON_USE (getdtablesize, "getdtablesize is unportable - " # undef getentropy # define getentropy rpl_getentropy # endif -_GL_FUNCDECL_RPL (getentropy, int, +_GL_FUNCATTR_RPL (getentropy, int, (void *buffer, size_t length), _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (getentropy, int, (void *buffer, size_t length)); # else # if !@HAVE_GETENTROPY@ -_GL_FUNCDECL_SYS (getentropy, int, +_GL_FUNCATTR_SYS (getentropy, int, (void *buffer, size_t length), _GL_ATTRIBUTE_NODISCARD); # endif _GL_CXXALIAS_SYS (getentropy, int, @@ -1285,13 +1285,13 @@ _GL_WARN_ON_USE (getentropy, "getentropy is unportable - " # undef getgroups # define getgroups rpl_getgroups # endif -_GL_FUNCDECL_RPL (getgroups, int, +_GL_FUNCATTR_RPL (getgroups, int, (int n, gid_t *groups), _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (getgroups, int, (int n, gid_t *groups)); # else # if !@HAVE_GETGROUPS@ -_GL_FUNCDECL_SYS (getgroups, int, +_GL_FUNCATTR_SYS (getgroups, int, (int n, gid_t *groups), _GL_ATTRIBUTE_NODISCARD); # endif _GL_CXXALIAS_SYS (getgroups, int, @@ -1320,12 +1320,12 @@ _GL_WARN_ON_USE (getgroups, "getgroups is unportable - " # undef gethostname # define gethostname rpl_gethostname # endif -_GL_FUNCDECL_RPL (gethostname, int, (char *name, size_t len), +_GL_FUNCATTR_RPL (gethostname, int, (char *name, size_t len), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (gethostname, int, (char *name, size_t len)); # else # if !@HAVE_GETHOSTNAME@ -_GL_FUNCDECL_SYS (gethostname, int, (char *name, size_t len), +_GL_FUNCATTR_SYS (gethostname, int, (char *name, size_t len), _GL_ARG_NONNULL ((1))); # endif /* Need to cast, because on Solaris 10 and OSF/1 5.1 systems, the second @@ -1392,12 +1392,12 @@ _GL_WARN_ON_USE (getlogin, "getlogin is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define getlogin_r rpl_getlogin_r # endif -_GL_FUNCDECL_RPL (getlogin_r, int, (char *name, size_t size), +_GL_FUNCATTR_RPL (getlogin_r, int, (char *name, size_t size), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (getlogin_r, int, (char *name, size_t size)); # else # if !@HAVE_DECL_GETLOGIN_R@ -_GL_FUNCDECL_SYS (getlogin_r, int, (char *name, size_t size), +_GL_FUNCATTR_SYS (getlogin_r, int, (char *name, size_t size), _GL_ARG_NONNULL ((1))); # endif /* Need to cast, because on Solaris 10 systems, the second argument is @@ -1514,12 +1514,12 @@ _GL_WARN_ON_USE (getpagesize, "getpagesize is unportable - " # undef getpass # define getpass rpl_getpass # endif -_GL_FUNCDECL_RPL (getpass, char *, (const char *prompt), +_GL_FUNCATTR_RPL (getpass, char *, (const char *prompt), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (getpass, char *, (const char *prompt)); # else # if !@HAVE_GETPASS@ -_GL_FUNCDECL_SYS (getpass, char *, (const char *prompt), +_GL_FUNCATTR_SYS (getpass, char *, (const char *prompt), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (getpass, char *, (const char *prompt)); @@ -1695,12 +1695,12 @@ _GL_CXXALIASWARN (isatty); # undef lchown # define lchown rpl_lchown # endif -_GL_FUNCDECL_RPL (lchown, int, (char const *file, uid_t owner, gid_t group), +_GL_FUNCATTR_RPL (lchown, int, (char const *file, uid_t owner, gid_t group), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (lchown, int, (char const *file, uid_t owner, gid_t group)); # else # if !@HAVE_LCHOWN@ -_GL_FUNCDECL_SYS (lchown, int, (char const *file, uid_t owner, gid_t group), +_GL_FUNCATTR_SYS (lchown, int, (char const *file, uid_t owner, gid_t group), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); # endif _GL_CXXALIAS_SYS (lchown, int, (char const *file, uid_t owner, gid_t group)); @@ -1724,12 +1724,12 @@ _GL_WARN_ON_USE (lchown, "lchown is unportable to pre-POSIX.1-2001 systems - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define link rpl_link # endif -_GL_FUNCDECL_RPL (link, int, (const char *path1, const char *path2), +_GL_FUNCATTR_RPL (link, int, (const char *path1, const char *path2), _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (link, int, (const char *path1, const char *path2)); # else # if !@HAVE_LINK@ -_GL_FUNCDECL_SYS (link, int, (const char *path1, const char *path2), +_GL_FUNCATTR_SYS (link, int, (const char *path1, const char *path2), _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_NODISCARD); # endif _GL_CXXALIAS_SYS (link, int, (const char *path1, const char *path2)); @@ -1753,7 +1753,7 @@ _GL_WARN_ON_USE (link, "link is unportable - " # undef linkat # define linkat rpl_linkat # endif -_GL_FUNCDECL_RPL (linkat, int, +_GL_FUNCATTR_RPL (linkat, int, (int fd1, const char *path1, int fd2, const char *path2, int flag), _GL_ARG_NONNULL ((2, 4)) _GL_ATTRIBUTE_NODISCARD); @@ -1762,7 +1762,7 @@ _GL_CXXALIAS_RPL (linkat, int, int flag)); # else # if !@HAVE_LINKAT@ -_GL_FUNCDECL_SYS (linkat, int, +_GL_FUNCATTR_SYS (linkat, int, (int fd1, const char *path1, int fd2, const char *path2, int flag), _GL_ARG_NONNULL ((2, 4)) _GL_ATTRIBUTE_NODISCARD); @@ -1832,7 +1832,7 @@ _GL_CXXALIASWARN (lseek); Store the read-end as fd[0] and the write-end as fd[1]. Return 0 upon success, or -1 with errno set upon failure. */ # if !@HAVE_PIPE@ -_GL_FUNCDECL_SYS (pipe, int, (int fd[2]), +_GL_FUNCATTR_SYS (pipe, int, (int fd[2]), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); # endif _GL_CXXALIAS_SYS (pipe, int, (int fd[2])); @@ -1860,11 +1860,11 @@ _GL_WARN_ON_USE (pipe, "pipe is unportable - " # undef pipe2 # define pipe2 rpl_pipe2 # endif -_GL_FUNCDECL_RPL (pipe2, int, (int fd[2], int flags), +_GL_FUNCATTR_RPL (pipe2, int, (int fd[2], int flags), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (pipe2, int, (int fd[2], int flags)); # else -_GL_FUNCDECL_SYS (pipe2, int, (int fd[2], int flags), +_GL_FUNCATTR_SYS (pipe2, int, (int fd[2], int flags), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_SYS (pipe2, int, (int fd[2], int flags)); # endif @@ -1891,14 +1891,14 @@ _GL_WARN_ON_USE (pipe2, "pipe2 is unportable - " # undef pread # define pread rpl_pread # endif -_GL_FUNCDECL_RPL (pread, ssize_t, +_GL_FUNCATTR_RPL (pread, ssize_t, (int fd, void *buf, size_t bufsize, off_t offset), _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (pread, ssize_t, (int fd, void *buf, size_t bufsize, off_t offset)); # else # if !@HAVE_PREAD@ -_GL_FUNCDECL_SYS (pread, ssize_t, +_GL_FUNCATTR_SYS (pread, ssize_t, (int fd, void *buf, size_t bufsize, off_t offset), _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_NODISCARD); # endif @@ -1928,14 +1928,14 @@ _GL_WARN_ON_USE (pread, "pread is unportable - " # undef pwrite # define pwrite rpl_pwrite # endif -_GL_FUNCDECL_RPL (pwrite, ssize_t, +_GL_FUNCATTR_RPL (pwrite, ssize_t, (int fd, const void *buf, size_t bufsize, off_t offset), _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (pwrite, ssize_t, (int fd, const void *buf, size_t bufsize, off_t offset)); # else # if !@HAVE_PWRITE@ -_GL_FUNCDECL_SYS (pwrite, ssize_t, +_GL_FUNCATTR_SYS (pwrite, ssize_t, (int fd, const void *buf, size_t bufsize, off_t offset), _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_NODISCARD); # endif @@ -1964,7 +1964,7 @@ _GL_WARN_ON_USE (pwrite, "pwrite is unportable - " # define read rpl_read # endif -_GL_FUNCDECL_RPL (read, ssize_t, (int fd, void *buf, size_t count), +_GL_FUNCATTR_RPL (read, ssize_t, (int fd, void *buf, size_t count), _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (read, ssize_t, (int fd, void *buf, size_t count)); # elif defined _WIN32 && !defined __CYGWIN__ @@ -2004,7 +2004,7 @@ _GL_CXXALIASWARN (read); # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define readlink rpl_readlink # endif -_GL_FUNCDECL_RPL (readlink, ssize_t, +_GL_FUNCATTR_RPL (readlink, ssize_t, (const char *restrict file, char *restrict buf, size_t bufsize), _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_NODISCARD); @@ -2013,7 +2013,7 @@ _GL_CXXALIAS_RPL (readlink, ssize_t, char *restrict buf, size_t bufsize)); # else # if !@HAVE_READLINK@ -_GL_FUNCDECL_SYS (readlink, ssize_t, +_GL_FUNCATTR_SYS (readlink, ssize_t, (const char *restrict file, char *restrict buf, size_t bufsize), _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_NODISCARD); @@ -2037,7 +2037,7 @@ _GL_WARN_ON_USE (readlink, "readlink is unportable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define readlinkat rpl_readlinkat # endif -_GL_FUNCDECL_RPL (readlinkat, ssize_t, +_GL_FUNCATTR_RPL (readlinkat, ssize_t, (int fd, char const *restrict file, char *restrict buf, size_t len), _GL_ARG_NONNULL ((2, 3)) _GL_ATTRIBUTE_NODISCARD); @@ -2046,7 +2046,7 @@ _GL_CXXALIAS_RPL (readlinkat, ssize_t, char *restrict buf, size_t len)); # else # if !@HAVE_READLINKAT@ -_GL_FUNCDECL_SYS (readlinkat, ssize_t, +_GL_FUNCATTR_SYS (readlinkat, ssize_t, (int fd, char const *restrict file, char *restrict buf, size_t len), _GL_ARG_NONNULL ((2, 3)) _GL_ATTRIBUTE_NODISCARD); @@ -2073,7 +2073,7 @@ _GL_WARN_ON_USE (readlinkat, "readlinkat is not portable - " # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define rmdir rpl_rmdir # endif -_GL_FUNCDECL_RPL (rmdir, int, (char const *name), _GL_ARG_NONNULL ((1))); +_GL_FUNCATTR_RPL (rmdir, int, (char const *name), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (rmdir, int, (char const *name)); # elif defined _WIN32 && !defined __CYGWIN__ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) @@ -2122,14 +2122,14 @@ _GL_CXXALIASWARN (rmdir); # undef sethostname # define sethostname rpl_sethostname # endif -_GL_FUNCDECL_RPL (sethostname, int, +_GL_FUNCATTR_RPL (sethostname, int, (const char *name, size_t len), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (sethostname, int, (const char *name, size_t len)); # else # if !@HAVE_SETHOSTNAME@ || !@HAVE_DECL_SETHOSTNAME@ -_GL_FUNCDECL_SYS (sethostname, int, +_GL_FUNCATTR_SYS (sethostname, int, (const char *name, size_t len), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); # endif @@ -2210,14 +2210,14 @@ _GL_CXXALIASWARN (swab); # undef symlink # define symlink rpl_symlink # endif -_GL_FUNCDECL_RPL (symlink, int, +_GL_FUNCATTR_RPL (symlink, int, (char const *contents, char const *file), _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (symlink, int, (char const *contents, char const *file)); # else # if !@HAVE_SYMLINK@ -_GL_FUNCDECL_SYS (symlink, int, +_GL_FUNCATTR_SYS (symlink, int, (char const *contents, char const *file), _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_NODISCARD); # endif @@ -2240,14 +2240,14 @@ _GL_WARN_ON_USE (symlink, "symlink is not portable - " # undef symlinkat # define symlinkat rpl_symlinkat # endif -_GL_FUNCDECL_RPL (symlinkat, int, +_GL_FUNCATTR_RPL (symlinkat, int, (char const *contents, int fd, char const *file), _GL_ARG_NONNULL ((1, 3)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (symlinkat, int, (char const *contents, int fd, char const *file)); # else # if !@HAVE_SYMLINKAT@ -_GL_FUNCDECL_SYS (symlinkat, int, +_GL_FUNCATTR_SYS (symlinkat, int, (char const *contents, int fd, char const *file), _GL_ARG_NONNULL ((1, 3)) _GL_ATTRIBUTE_NODISCARD); # endif @@ -2276,12 +2276,12 @@ _GL_WARN_ON_USE (symlinkat, "symlinkat is not portable - " # undef truncate # define truncate rpl_truncate # endif -_GL_FUNCDECL_RPL (truncate, int, (const char *filename, off_t length), +_GL_FUNCATTR_RPL (truncate, int, (const char *filename, off_t length), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (truncate, int, (const char *filename, off_t length)); # else # if !@HAVE_DECL_TRUNCATE@ -_GL_FUNCDECL_SYS (truncate, int, (const char *filename, off_t length), +_GL_FUNCATTR_SYS (truncate, int, (const char *filename, off_t length), _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD); # endif _GL_CXXALIAS_SYS (truncate, int, (const char *filename, off_t length)); @@ -2306,14 +2306,14 @@ _GL_WARN_ON_USE (truncate, "truncate is unportable - " # undef ttyname_r # define ttyname_r rpl_ttyname_r # endif -_GL_FUNCDECL_RPL (ttyname_r, int, +_GL_FUNCATTR_RPL (ttyname_r, int, (int fd, char *buf, size_t buflen), _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (ttyname_r, int, (int fd, char *buf, size_t buflen)); # else # if !@HAVE_DECL_TTYNAME_R@ -_GL_FUNCDECL_SYS (ttyname_r, int, +_GL_FUNCATTR_SYS (ttyname_r, int, (int fd, char *buf, size_t buflen), _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_NODISCARD); # endif @@ -2338,7 +2338,7 @@ _GL_WARN_ON_USE (ttyname_r, "ttyname_r is not portable - " # undef unlink # define unlink rpl_unlink # endif -_GL_FUNCDECL_RPL (unlink, int, (char const *file), _GL_ARG_NONNULL ((1))); +_GL_FUNCATTR_RPL (unlink, int, (char const *file), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (unlink, int, (char const *file)); # elif defined _WIN32 && !defined __CYGWIN__ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) @@ -2379,12 +2379,12 @@ _GL_CXXALIASWARN (unlink); # undef unlinkat # define unlinkat rpl_unlinkat # endif -_GL_FUNCDECL_RPL (unlinkat, int, (int fd, char const *file, int flag), +_GL_FUNCATTR_RPL (unlinkat, int, (int fd, char const *file, int flag), _GL_ARG_NONNULL ((2))); _GL_CXXALIAS_RPL (unlinkat, int, (int fd, char const *file, int flag)); # else # if !@HAVE_UNLINKAT@ -_GL_FUNCDECL_SYS (unlinkat, int, (int fd, char const *file, int flag), +_GL_FUNCATTR_SYS (unlinkat, int, (int fd, char const *file, int flag), _GL_ARG_NONNULL ((2))); # endif _GL_CXXALIAS_SYS (unlinkat, int, (int fd, char const *file, int flag)); @@ -2438,7 +2438,7 @@ _GL_WARN_ON_USE (usleep, "usleep is unportable - " # undef write # define write rpl_write # endif -_GL_FUNCDECL_RPL (write, ssize_t, +_GL_FUNCATTR_RPL (write, ssize_t, (int fd, const void *buf, size_t count), _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_NODISCARD); _GL_CXXALIAS_RPL (write, ssize_t, diff --git a/lib/utime.in.h b/lib/utime.in.h index 55b7ee8c94..fde6f9d10d 100644 --- a/lib/utime.in.h +++ b/lib/utime.in.h @@ -71,7 +71,7 @@ # if !(defined __cplusplus && defined GNULIB_NAMESPACE) # define utime rpl_utime # endif -_GL_FUNCDECL_RPL (utime, int, (const char *filename, const struct utimbuf *ts), +_GL_FUNCATTR_RPL (utime, int, (const char *filename, const struct utimbuf *ts), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (utime, int, (const char *filename, const struct utimbuf *ts)); # elif defined _WIN32 && !defined __CYGWIN__ @@ -82,7 +82,7 @@ _GL_CXXALIAS_RPL (utime, int, (const char *filename, const struct utimbuf *ts)); _GL_CXXALIAS_MDA (utime, int, (const char *filename, const struct utimbuf *ts)); # else # if !@HAVE_UTIME@ -_GL_FUNCDECL_SYS (utime, int, (const char *filename, const struct utimbuf *ts), +_GL_FUNCATTR_SYS (utime, int, (const char *filename, const struct utimbuf *ts), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (utime, int, (const char *filename, const struct utimbuf *ts)); diff --git a/lib/wchar.in.h b/lib/wchar.in.h index ac7cb00fc7..c7db23bef4 100644 --- a/lib/wchar.in.h +++ b/lib/wchar.in.h @@ -620,7 +620,7 @@ _GL_WARN_ON_USE (mbrlen, "mbrlen is unportable - " # undef mbsrtowcs # define mbsrtowcs rpl_mbsrtowcs # endif -_GL_FUNCDECL_RPL (mbsrtowcs, size_t, +_GL_FUNCATTR_RPL (mbsrtowcs, size_t, (wchar_t *restrict dest, const char **restrict srcp, size_t len, mbstate_t *restrict ps), @@ -631,7 +631,7 @@ _GL_CXXALIAS_RPL (mbsrtowcs, size_t, mbstate_t *restrict ps)); # else # if !@HAVE_MBSRTOWCS@ -_GL_FUNCDECL_SYS (mbsrtowcs, size_t, +_GL_FUNCATTR_SYS (mbsrtowcs, size_t, (wchar_t *restrict dest, const char **restrict srcp, size_t len, mbstate_t *restrict ps), @@ -661,7 +661,7 @@ _GL_WARN_ON_USE (mbsrtowcs, "mbsrtowcs is unportable - " # undef mbsnrtowcs # define mbsnrtowcs rpl_mbsnrtowcs # endif -_GL_FUNCDECL_RPL (mbsnrtowcs, size_t, +_GL_FUNCATTR_RPL (mbsnrtowcs, size_t, (wchar_t *restrict dest, const char **restrict srcp, size_t srclen, size_t len, mbstate_t *restrict ps), @@ -672,7 +672,7 @@ _GL_CXXALIAS_RPL (mbsnrtowcs, size_t, mbstate_t *restrict ps)); # else # if !@HAVE_MBSNRTOWCS@ -_GL_FUNCDECL_SYS (mbsnrtowcs, size_t, +_GL_FUNCATTR_SYS (mbsnrtowcs, size_t, (wchar_t *restrict dest, const char **restrict srcp, size_t srclen, size_t len, mbstate_t *restrict ps), @@ -733,7 +733,7 @@ _GL_WARN_ON_USE (wcrtomb, "wcrtomb is unportable - " # undef wcsrtombs # define wcsrtombs rpl_wcsrtombs # endif -_GL_FUNCDECL_RPL (wcsrtombs, size_t, +_GL_FUNCATTR_RPL (wcsrtombs, size_t, (char *restrict dest, const wchar_t **restrict srcp, size_t len, mbstate_t *restrict ps), @@ -744,7 +744,7 @@ _GL_CXXALIAS_RPL (wcsrtombs, size_t, mbstate_t *restrict ps)); # else # if !@HAVE_WCSRTOMBS@ -_GL_FUNCDECL_SYS (wcsrtombs, size_t, +_GL_FUNCATTR_SYS (wcsrtombs, size_t, (char *restrict dest, const wchar_t **restrict srcp, size_t len, mbstate_t *restrict ps), @@ -774,7 +774,7 @@ _GL_WARN_ON_USE (wcsrtombs, "wcsrtombs is unportable - " # undef wcsnrtombs # define wcsnrtombs rpl_wcsnrtombs # endif -_GL_FUNCDECL_RPL (wcsnrtombs, size_t, +_GL_FUNCATTR_RPL (wcsnrtombs, size_t, (char *restrict dest, const wchar_t **restrict srcp, size_t srclen, size_t len, @@ -787,7 +787,7 @@ _GL_CXXALIAS_RPL (wcsnrtombs, size_t, mbstate_t *restrict ps)); # else # if !@HAVE_WCSNRTOMBS@ || (defined __cplusplus && defined __sun) -_GL_FUNCDECL_SYS (wcsnrtombs, size_t, +_GL_FUNCATTR_SYS (wcsnrtombs, size_t, (char *restrict dest, const wchar_t **restrict srcp, size_t srclen, size_t len, @@ -819,12 +819,12 @@ _GL_WARN_ON_USE (wcsnrtombs, "wcsnrtombs is unportable - " # undef wcwidth # define wcwidth rpl_wcwidth # endif -_GL_FUNCDECL_RPL (wcwidth, int, (wchar_t), _GL_ATTRIBUTE_PURE); +_GL_FUNCATTR_RPL (wcwidth, int, (wchar_t), _GL_ATTRIBUTE_PURE); _GL_CXXALIAS_RPL (wcwidth, int, (wchar_t)); # else # if !@HAVE_DECL_WCWIDTH@ /* wcwidth exists but is not declared. */ -_GL_FUNCDECL_SYS (wcwidth, int, (wchar_t), _GL_ATTRIBUTE_PURE); +_GL_FUNCATTR_SYS (wcwidth, int, (wchar_t), _GL_ATTRIBUTE_PURE); # endif _GL_CXXALIAS_SYS (wcwidth, int, (wchar_t)); # endif @@ -843,7 +843,7 @@ _GL_WARN_ON_USE (wcwidth, "wcwidth is unportable - " /* Search N wide characters of S for C. */ #if @GNULIB_WMEMCHR@ # if !@HAVE_WMEMCHR@ -_GL_FUNCDECL_SYS (wmemchr, wchar_t *, (const wchar_t *s, wchar_t c, size_t n), +_GL_FUNCATTR_SYS (wmemchr, wchar_t *, (const wchar_t *s, wchar_t c, size_t n), _GL_ATTRIBUTE_PURE); # endif /* On some systems, this function is defined as an overloaded function: @@ -879,14 +879,14 @@ _GL_WARN_ON_USE (wmemchr, "wmemchr is unportable - " # undef wmemcmp # define wmemcmp rpl_wmemcmp # endif -_GL_FUNCDECL_RPL (wmemcmp, int, +_GL_FUNCATTR_RPL (wmemcmp, int, (const wchar_t *s1, const wchar_t *s2, size_t n), _GL_ATTRIBUTE_PURE); _GL_CXXALIAS_RPL (wmemcmp, int, (const wchar_t *s1, const wchar_t *s2, size_t n)); # else # if !@HAVE_WMEMCMP@ -_GL_FUNCDECL_SYS (wmemcmp, int, +_GL_FUNCATTR_SYS (wmemcmp, int, (const wchar_t *s1, const wchar_t *s2, size_t n), _GL_ATTRIBUTE_PURE); # endif @@ -1005,7 +1005,7 @@ _GL_WARN_ON_USE (wmemset, "wmemset is unportable - " /* Return the number of wide characters in S. */ #if @GNULIB_WCSLEN@ # if !@HAVE_WCSLEN@ -_GL_FUNCDECL_SYS (wcslen, size_t, (const wchar_t *s), _GL_ATTRIBUTE_PURE); +_GL_FUNCATTR_SYS (wcslen, size_t, (const wchar_t *s), _GL_ATTRIBUTE_PURE); # endif _GL_CXXALIAS_SYS (wcslen, size_t, (const wchar_t *s)); # if __GLIBC__ >= 2 @@ -1026,7 +1026,7 @@ _GL_WARN_ON_USE (wcslen, "wcslen is unportable - " namespace, not in the global namespace. So, force a declaration in the global namespace. */ # if !@HAVE_WCSNLEN@ || (defined __sun && defined __cplusplus) -_GL_FUNCDECL_SYS (wcsnlen, size_t, (const wchar_t *s, size_t maxlen), +_GL_FUNCATTR_SYS (wcsnlen, size_t, (const wchar_t *s, size_t maxlen), _GL_ATTRIBUTE_PURE); # endif _GL_CXXALIAS_SYS (wcsnlen, size_t, (const wchar_t *s, size_t maxlen)); @@ -1176,12 +1176,12 @@ _GL_WARN_ON_USE (wcsncat, "wcsncat is unportable - " # undef wcscmp # define wcscmp rpl_wcscmp # endif -_GL_FUNCDECL_RPL (wcscmp, int, (const wchar_t *s1, const wchar_t *s2), +_GL_FUNCATTR_RPL (wcscmp, int, (const wchar_t *s1, const wchar_t *s2), _GL_ATTRIBUTE_PURE); _GL_CXXALIAS_RPL (wcscmp, int, (const wchar_t *s1, const wchar_t *s2)); # else # if !@HAVE_WCSCMP@ -_GL_FUNCDECL_SYS (wcscmp, int, (const wchar_t *s1, const wchar_t *s2), +_GL_FUNCATTR_SYS (wcscmp, int, (const wchar_t *s1, const wchar_t *s2), _GL_ATTRIBUTE_PURE); # endif _GL_CXXALIAS_SYS (wcscmp, int, (const wchar_t *s1, const wchar_t *s2)); @@ -1205,14 +1205,14 @@ _GL_WARN_ON_USE (wcscmp, "wcscmp is unportable - " # undef wcsncmp # define wcsncmp rpl_wcsncmp # endif -_GL_FUNCDECL_RPL (wcsncmp, int, +_GL_FUNCATTR_RPL (wcsncmp, int, (const wchar_t *s1, const wchar_t *s2, size_t n), _GL_ATTRIBUTE_PURE); _GL_CXXALIAS_RPL (wcsncmp, int, (const wchar_t *s1, const wchar_t *s2, size_t n)); # else # if !@HAVE_WCSNCMP@ -_GL_FUNCDECL_SYS (wcsncmp, int, +_GL_FUNCATTR_SYS (wcsncmp, int, (const wchar_t *s1, const wchar_t *s2, size_t n), _GL_ATTRIBUTE_PURE); # endif @@ -1237,7 +1237,7 @@ _GL_WARN_ON_USE (wcsncmp, "wcsncmp is unportable - " namespace, not in the global namespace. So, force a declaration in the global namespace. */ # if !@HAVE_WCSCASECMP@ || (defined __sun && defined __cplusplus) -_GL_FUNCDECL_SYS (wcscasecmp, int, (const wchar_t *s1, const wchar_t *s2), +_GL_FUNCATTR_SYS (wcscasecmp, int, (const wchar_t *s1, const wchar_t *s2), _GL_ATTRIBUTE_PURE); # endif _GL_CXXALIAS_SYS (wcscasecmp, int, (const wchar_t *s1, const wchar_t *s2)); @@ -1257,7 +1257,7 @@ _GL_WARN_ON_USE (wcscasecmp, "wcscasecmp is unportable - " namespace, not in the global namespace. So, force a declaration in the global namespace. */ # if !@HAVE_WCSNCASECMP@ || (defined __sun && defined __cplusplus) -_GL_FUNCDECL_SYS (wcsncasecmp, int, +_GL_FUNCATTR_SYS (wcsncasecmp, int, (const wchar_t *s1, const wchar_t *s2, size_t n), _GL_ATTRIBUTE_PURE); # endif @@ -1329,12 +1329,12 @@ _GL_CXXALIAS_MDA (wcsdup, wchar_t *, (const wchar_t *s)); # if !@HAVE_WCSDUP@ || (defined __sun && defined __cplusplus) \ || (__GNUC__ >= 11 && !defined __clang__) # if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 -_GL_FUNCDECL_SYS (wcsdup, wchar_t *, +_GL_FUNCATTR_SYS (wcsdup, wchar_t *, (const wchar_t *s), _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE) _GL_ATTRIBUTE_NOTHROW; # else -_GL_FUNCDECL_SYS (wcsdup, wchar_t *, +_GL_FUNCATTR_SYS (wcsdup, wchar_t *, (const wchar_t *s), _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); # endif @@ -1346,12 +1346,12 @@ _GL_CXXALIASWARN (wcsdup); # if (__GNUC__ >= 11 && !defined __clang__) && !defined wcsdup /* For -Wmismatched-dealloc: Associate wcsdup with free or rpl_free. */ # if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 -_GL_FUNCDECL_SYS (wcsdup, wchar_t *, +_GL_FUNCATTR_SYS (wcsdup, wchar_t *, (const wchar_t *s), _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE) _GL_ATTRIBUTE_NOTHROW; # else -_GL_FUNCDECL_SYS (wcsdup, wchar_t *, +_GL_FUNCATTR_SYS (wcsdup, wchar_t *, (const wchar_t *s), _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); # endif @@ -1374,12 +1374,12 @@ _GL_WARN_ON_USE (wcsdup, "wcsdup is unportable - " _GL_CXXALIAS_MDA (wcsdup, wchar_t *, (const wchar_t *s)); # else # if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2 -_GL_FUNCDECL_SYS (wcsdup, wchar_t *, +_GL_FUNCATTR_SYS (wcsdup, wchar_t *, (const wchar_t *s), _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE) _GL_ATTRIBUTE_NOTHROW; # else -_GL_FUNCDECL_SYS (wcsdup, wchar_t *, +_GL_FUNCATTR_SYS (wcsdup, wchar_t *, (const wchar_t *s), _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); # endif @@ -1397,7 +1397,7 @@ _GL_CXXALIASWARN (wcsdup); /* Find the first occurrence of WC in WCS. */ #if @GNULIB_WCSCHR@ # if !@HAVE_WCSCHR@ -_GL_FUNCDECL_SYS (wcschr, wchar_t *, (const wchar_t *wcs, wchar_t wc), +_GL_FUNCATTR_SYS (wcschr, wchar_t *, (const wchar_t *wcs, wchar_t wc), _GL_ATTRIBUTE_PURE); # endif /* On some systems, this function is defined as an overloaded function: @@ -1428,7 +1428,7 @@ _GL_WARN_ON_USE (wcschr, "wcschr is unportable - " /* Find the last occurrence of WC in WCS. */ #if @GNULIB_WCSRCHR@ # if !@HAVE_WCSRCHR@ -_GL_FUNCDECL_SYS (wcsrchr, wchar_t *, (const wchar_t *wcs, wchar_t wc), +_GL_FUNCATTR_SYS (wcsrchr, wchar_t *, (const wchar_t *wcs, wchar_t wc), _GL_ATTRIBUTE_PURE); # endif /* On some systems, this function is defined as an overloaded function: @@ -1460,7 +1460,7 @@ _GL_WARN_ON_USE (wcsrchr, "wcsrchr is unportable - " of wide characters not in REJECT. */ #if @GNULIB_WCSCSPN@ # if !@HAVE_WCSCSPN@ -_GL_FUNCDECL_SYS (wcscspn, size_t, (const wchar_t *wcs, const wchar_t *reject), +_GL_FUNCATTR_SYS (wcscspn, size_t, (const wchar_t *wcs, const wchar_t *reject), _GL_ATTRIBUTE_PURE); # endif _GL_CXXALIAS_SYS (wcscspn, size_t, (const wchar_t *wcs, const wchar_t *reject)); @@ -1480,7 +1480,7 @@ _GL_WARN_ON_USE (wcscspn, "wcscspn is unportable - " of wide characters in ACCEPT. */ #if @GNULIB_WCSSPN@ # if !@HAVE_WCSSPN@ -_GL_FUNCDECL_SYS (wcsspn, size_t, (const wchar_t *wcs, const wchar_t *accept), +_GL_FUNCATTR_SYS (wcsspn, size_t, (const wchar_t *wcs, const wchar_t *accept), _GL_ATTRIBUTE_PURE); # endif _GL_CXXALIAS_SYS (wcsspn, size_t, (const wchar_t *wcs, const wchar_t *accept)); @@ -1499,7 +1499,7 @@ _GL_WARN_ON_USE (wcsspn, "wcsspn is unportable - " /* Find the first occurrence in WCS of any character in ACCEPT. */ #if @GNULIB_WCSPBRK@ # if !@HAVE_WCSPBRK@ -_GL_FUNCDECL_SYS (wcspbrk, wchar_t *, +_GL_FUNCATTR_SYS (wcspbrk, wchar_t *, (const wchar_t *wcs, const wchar_t *accept), _GL_ATTRIBUTE_PURE); # endif @@ -1537,7 +1537,7 @@ _GL_WARN_ON_USE (wcspbrk, "wcspbrk is unportable - " # undef wcsstr # define wcsstr rpl_wcsstr # endif -_GL_FUNCDECL_RPL (wcsstr, wchar_t *, +_GL_FUNCATTR_RPL (wcsstr, wchar_t *, (const wchar_t *restrict haystack, const wchar_t *restrict needle), _GL_ATTRIBUTE_PURE); @@ -1546,7 +1546,7 @@ _GL_CXXALIAS_RPL (wcsstr, wchar_t *, const wchar_t *restrict needle)); # else # if !@HAVE_WCSSTR@ -_GL_FUNCDECL_SYS (wcsstr, wchar_t *, +_GL_FUNCATTR_SYS (wcsstr, wchar_t *, (const wchar_t *restrict haystack, const wchar_t *restrict needle), _GL_ATTRIBUTE_PURE); @@ -1626,12 +1626,12 @@ _GL_WARN_ON_USE (wcstok, "wcstok is unportable - " # undef wcswidth # define wcswidth rpl_wcswidth # endif -_GL_FUNCDECL_RPL (wcswidth, int, (const wchar_t *s, size_t n), +_GL_FUNCATTR_RPL (wcswidth, int, (const wchar_t *s, size_t n), _GL_ATTRIBUTE_PURE); _GL_CXXALIAS_RPL (wcswidth, int, (const wchar_t *s, size_t n)); # else # if !@HAVE_WCSWIDTH@ -_GL_FUNCDECL_SYS (wcswidth, int, (const wchar_t *s, size_t n), +_GL_FUNCATTR_SYS (wcswidth, int, (const wchar_t *s, size_t n), _GL_ATTRIBUTE_PURE); # endif _GL_CXXALIAS_SYS (wcswidth, int, (const wchar_t *s, size_t n)); @@ -1656,7 +1656,7 @@ _GL_WARN_ON_USE (wcswidth, "wcswidth is unportable - " # undef wcsftime # define wcsftime rpl_wcsftime # endif -_GL_FUNCDECL_RPL (wcsftime, size_t, +_GL_FUNCATTR_RPL (wcsftime, size_t, (wchar_t *restrict __buf, size_t __bufsize, const wchar_t *restrict __fmt, const struct tm *restrict __tp), @@ -1667,7 +1667,7 @@ _GL_CXXALIAS_RPL (wcsftime, size_t, const struct tm *restrict __tp)); # else # if !@HAVE_WCSFTIME@ -_GL_FUNCDECL_SYS (wcsftime, size_t, +_GL_FUNCATTR_SYS (wcsftime, size_t, (wchar_t *restrict __buf, size_t __bufsize, const wchar_t *restrict __fmt, const struct tm *restrict __tp), diff --git a/lib/wctype.in.h b/lib/wctype.in.h index efa77594d5..11ac17bc46 100644 --- a/lib/wctype.in.h +++ b/lib/wctype.in.h @@ -659,12 +659,12 @@ typedef void *rpl_wctype_t; # undef wctype # define wctype rpl_wctype # endif -_GL_FUNCDECL_RPL (wctype, wctype_t, (const char *name), +_GL_FUNCATTR_RPL (wctype, wctype_t, (const char *name), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (wctype, wctype_t, (const char *name)); # else # if !@HAVE_WCTYPE_T@ -_GL_FUNCDECL_SYS (wctype, wctype_t, (const char *name), +_GL_FUNCATTR_SYS (wctype, wctype_t, (const char *name), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (wctype, wctype_t, (const char *name)); @@ -741,12 +741,12 @@ typedef void *rpl_wctrans_t; # undef wctrans # define wctrans rpl_wctrans # endif -_GL_FUNCDECL_RPL (wctrans, wctrans_t, (const char *name), +_GL_FUNCATTR_RPL (wctrans, wctrans_t, (const char *name), _GL_ARG_NONNULL ((1))); _GL_CXXALIAS_RPL (wctrans, wctrans_t, (const char *name)); # else # if !@HAVE_WCTRANS_T@ -_GL_FUNCDECL_SYS (wctrans, wctrans_t, (const char *name), +_GL_FUNCATTR_SYS (wctrans, wctrans_t, (const char *name), _GL_ARG_NONNULL ((1))); # endif _GL_CXXALIAS_SYS (wctrans, wctrans_t, (const char *name)); -- 2.39.5