Prefer declaring these attributes with such macros, rather than spelling out the full attribute.
These macros were added in 73e50d0577c2111a1810b21de8d61022dbbf2411 in 2013, but haven't been used in mingw-w64 headers since (although they may have been used in user code). These macros, which expand to the full attribute, differ slightly from the other preexisting macros (which are used quite widely) like __MINGW_PRINTF_FORMAT, which expand only to the type string "gnu_printf", "ms_printf" or "printf". However as we do have these existing macros in this form, for declaring a specific form of these format attributes, take them into use where applicable. Signed-off-by: Martin Storsjö <mar...@martin.st> --- No changes to this patch. --- mingw-w64-headers/crt/stdio.h | 140 +++++++++++++++++----------------- 1 file changed, 70 insertions(+), 70 deletions(-) diff --git a/mingw-w64-headers/crt/stdio.h b/mingw-w64-headers/crt/stdio.h index d9fb00498..60c83b94e 100644 --- a/mingw-w64-headers/crt/stdio.h +++ b/mingw-w64-headers/crt/stdio.h @@ -165,83 +165,83 @@ __mingw_bos_declare; #ifndef _STDIO_DEFINED extern - __attribute__((__format__ (gnu_scanf, 2, 3))) __MINGW_ATTRIB_NONNULL(2) + __MINGW_GNU_SCANF(2, 3) __MINGW_ATTRIB_NONNULL(2) int __cdecl __mingw_sscanf(const char * __restrict__ _Src,const char * __restrict__ _Format,...); extern - __attribute__((__format__ (gnu_scanf, 2, 0))) __MINGW_ATTRIB_NONNULL(2) + __MINGW_GNU_SCANF(2, 0) __MINGW_ATTRIB_NONNULL(2) int __cdecl __mingw_vsscanf (const char * __restrict__ _Str,const char * __restrict__ Format,va_list argp); extern - __attribute__((__format__ (gnu_scanf, 1, 2))) __MINGW_ATTRIB_NONNULL(1) + __MINGW_GNU_SCANF(1, 2) __MINGW_ATTRIB_NONNULL(1) int __cdecl __mingw_scanf(const char * __restrict__ _Format,...); extern - __attribute__((__format__ (gnu_scanf, 1, 0))) __MINGW_ATTRIB_NONNULL(1) + __MINGW_GNU_SCANF(1, 0) __MINGW_ATTRIB_NONNULL(1) int __cdecl __mingw_vscanf(const char * __restrict__ Format, va_list argp); extern - __attribute__((__format__ (gnu_scanf, 2, 3))) __MINGW_ATTRIB_NONNULL(2) + __MINGW_GNU_SCANF(2, 3) __MINGW_ATTRIB_NONNULL(2) int __cdecl __mingw_fscanf(FILE * __restrict__ _File,const char * __restrict__ _Format,...); extern - __attribute__((__format__ (gnu_scanf, 2, 0))) __MINGW_ATTRIB_NONNULL(2) + __MINGW_GNU_SCANF(2, 0) __MINGW_ATTRIB_NONNULL(2) int __cdecl __mingw_vfscanf (FILE * __restrict__ fp, const char * __restrict__ Format,va_list argp); extern - __attribute__((__format__ (gnu_printf, 3, 0))) __MINGW_ATTRIB_NONNULL(3) + __MINGW_GNU_PRINTF(3, 0) __MINGW_ATTRIB_NONNULL(3) int __cdecl __mingw_vsnprintf(char * __restrict__ _DstBuf,size_t _MaxCount,const char * __restrict__ _Format, va_list _ArgList); extern - __attribute__((__format__ (gnu_printf, 3, 4))) __MINGW_ATTRIB_NONNULL(3) + __MINGW_GNU_PRINTF(3, 4) __MINGW_ATTRIB_NONNULL(3) int __cdecl __mingw_snprintf(char * __restrict__ s, size_t n, const char * __restrict__ format, ...); extern - __attribute__((__format__ (gnu_printf, 1, 2))) __MINGW_ATTRIB_NONNULL(1) + __MINGW_GNU_PRINTF(1, 2) __MINGW_ATTRIB_NONNULL(1) int __cdecl __mingw_printf(const char * __restrict__ , ... ) __MINGW_NOTHROW; extern - __attribute__((__format__ (gnu_printf, 1, 0))) __MINGW_ATTRIB_NONNULL(1) + __MINGW_GNU_PRINTF(1, 0) __MINGW_ATTRIB_NONNULL(1) int __cdecl __mingw_vprintf (const char * __restrict__ , va_list) __MINGW_NOTHROW; extern - __attribute__((__format__ (gnu_printf, 2, 3))) __MINGW_ATTRIB_NONNULL(2) + __MINGW_GNU_PRINTF(2, 3) __MINGW_ATTRIB_NONNULL(2) int __cdecl __mingw_fprintf (FILE * __restrict__ , const char * __restrict__ , ...) __MINGW_NOTHROW; extern - __attribute__((__format__ (gnu_printf, 2, 0))) __MINGW_ATTRIB_NONNULL(2) + __MINGW_GNU_PRINTF(2, 0) __MINGW_ATTRIB_NONNULL(2) int __cdecl __mingw_vfprintf (FILE * __restrict__ , const char * __restrict__ , va_list) __MINGW_NOTHROW; extern - __attribute__((__format__ (gnu_printf, 2, 3))) __MINGW_ATTRIB_NONNULL(2) + __MINGW_GNU_PRINTF(2, 3) __MINGW_ATTRIB_NONNULL(2) int __cdecl __mingw_sprintf (char * __restrict__ , const char * __restrict__ , ...) __MINGW_NOTHROW; extern - __attribute__((__format__ (gnu_printf, 2, 0))) __MINGW_ATTRIB_NONNULL(2) + __MINGW_GNU_PRINTF(2, 0) __MINGW_ATTRIB_NONNULL(2) int __cdecl __mingw_vsprintf (char * __restrict__ , const char * __restrict__ , va_list) __MINGW_NOTHROW; extern - __attribute__((__format__ (gnu_printf, 2, 3))) __attribute__((nonnull (1,2))) + __MINGW_GNU_PRINTF(2, 3) __attribute__((nonnull (1,2))) int __cdecl __mingw_asprintf(char ** __restrict__ , const char * __restrict__ , ...) __MINGW_NOTHROW; extern - __attribute__((__format__ (gnu_printf, 2, 0))) __attribute__((nonnull (1,2))) + __MINGW_GNU_PRINTF(2, 0) __attribute__((nonnull (1,2))) int __cdecl __mingw_vasprintf(char ** __restrict__ , const char * __restrict__ , va_list) __MINGW_NOTHROW; extern - __attribute__((__format__ (ms_scanf, 2, 3))) __MINGW_ATTRIB_NONNULL(2) + __MINGW_MS_SCANF(2, 3) __MINGW_ATTRIB_NONNULL(2) int __cdecl __ms_sscanf(const char * __restrict__ _Src,const char * __restrict__ _Format,...); extern - __attribute__((__format__ (ms_scanf, 1, 2))) __MINGW_ATTRIB_NONNULL(1) + __MINGW_MS_SCANF(1, 2) __MINGW_ATTRIB_NONNULL(1) int __cdecl __ms_scanf(const char * __restrict__ _Format,...); extern - __attribute__((__format__ (ms_scanf, 2, 3))) __MINGW_ATTRIB_NONNULL(2) + __MINGW_MS_SCANF(2, 3) __MINGW_ATTRIB_NONNULL(2) int __cdecl __ms_fscanf(FILE * __restrict__ _File,const char * __restrict__ _Format,...); extern - __attribute__((__format__ (ms_printf, 1, 2))) __MINGW_ATTRIB_NONNULL(1) + __MINGW_MS_PRINTF(1, 2) __MINGW_ATTRIB_NONNULL(1) int __cdecl __ms_printf(const char * __restrict__ , ... ) __MINGW_NOTHROW; extern - __attribute__((__format__ (ms_printf, 1, 0))) __MINGW_ATTRIB_NONNULL(1) + __MINGW_MS_PRINTF(1, 0) __MINGW_ATTRIB_NONNULL(1) int __cdecl __ms_vprintf (const char * __restrict__ , va_list) __MINGW_NOTHROW; extern - __attribute__((__format__ (ms_printf, 2, 3))) __MINGW_ATTRIB_NONNULL(2) + __MINGW_MS_PRINTF(2, 3) __MINGW_ATTRIB_NONNULL(2) int __cdecl __ms_fprintf (FILE * __restrict__ , const char * __restrict__ , ...) __MINGW_NOTHROW; extern - __attribute__((__format__ (ms_printf, 2, 0))) __MINGW_ATTRIB_NONNULL(2) + __MINGW_MS_PRINTF(2, 0) __MINGW_ATTRIB_NONNULL(2) int __cdecl __ms_vfprintf (FILE * __restrict__ , const char * __restrict__ , va_list) __MINGW_NOTHROW; extern - __attribute__((__format__ (ms_printf, 2, 3))) __MINGW_ATTRIB_NONNULL(2) + __MINGW_MS_PRINTF(2, 3) __MINGW_ATTRIB_NONNULL(2) int __cdecl __ms_sprintf (char * __restrict__ , const char * __restrict__ , ...) __MINGW_NOTHROW; extern - __attribute__((__format__ (ms_printf, 2, 0))) __MINGW_ATTRIB_NONNULL(2) + __MINGW_MS_PRINTF(2, 0) __MINGW_ATTRIB_NONNULL(2) int __cdecl __ms_vsprintf (char * __restrict__ , const char * __restrict__ , va_list) __MINGW_NOTHROW; #ifdef _UCRT @@ -272,7 +272,7 @@ extern #ifdef _GNU_SOURCE __mingw_ovr -__attribute__ ((__format__ (gnu_printf, 2, 3))) __attribute__((nonnull (1,2))) +__MINGW_GNU_PRINTF(2, 3) __attribute__((nonnull (1,2))) int asprintf(char **__ret, const char *__format, ...) { int __retval; @@ -283,7 +283,7 @@ int asprintf(char **__ret, const char *__format, ...) } __mingw_ovr -__attribute__ ((__format__ (gnu_printf, 2, 0))) __attribute__((nonnull (1,2))) +__MINGW_GNU_PRINTF(2, 0) __attribute__((nonnull (1,2))) int vasprintf(char **__ret, const char *__format, __builtin_va_list __local_argv) { return __mingw_vasprintf( __ret, __format, __local_argv ); @@ -297,7 +297,7 @@ extern "C++" { #endif __mingw_ovr -__attribute__((__format__ (gnu_scanf, 2, 3))) __MINGW_ATTRIB_NONNULL(2) +__MINGW_GNU_SCANF(2, 3) __MINGW_ATTRIB_NONNULL(2) int sscanf(const char *__source, const char *__format, ...) { int __retval; @@ -308,7 +308,7 @@ int sscanf(const char *__source, const char *__format, ...) } __mingw_ovr -__attribute__((__format__ (gnu_scanf, 1, 2))) __MINGW_ATTRIB_NONNULL(1) +__MINGW_GNU_SCANF(1, 2) __MINGW_ATTRIB_NONNULL(1) int scanf(const char *__format, ...) { int __retval; @@ -319,7 +319,7 @@ int scanf(const char *__format, ...) } __mingw_ovr -__attribute__((__format__ (gnu_scanf, 2, 3))) __MINGW_ATTRIB_NONNULL(2) +__MINGW_GNU_SCANF(2, 3) __MINGW_ATTRIB_NONNULL(2) int fscanf(FILE *__stream, const char *__format, ...) { int __retval; @@ -336,21 +336,21 @@ int fscanf(FILE *__stream, const char *__format, ...) #endif __mingw_ovr -__attribute__((__format__ (gnu_scanf, 2, 0))) __MINGW_ATTRIB_NONNULL(2) +__MINGW_GNU_SCANF(2, 0) __MINGW_ATTRIB_NONNULL(2) int vsscanf (const char *__source, const char *__format, __builtin_va_list __local_argv) { return __mingw_vsscanf( __source, __format, __local_argv ); } __mingw_ovr -__attribute__((__format__ (gnu_scanf, 1, 0))) __MINGW_ATTRIB_NONNULL(1) +__MINGW_GNU_SCANF(1, 0) __MINGW_ATTRIB_NONNULL(1) int vscanf(const char *__format, __builtin_va_list __local_argv) { return __mingw_vfscanf( stdin, __format, __local_argv ); } __mingw_ovr -__attribute__((__format__ (gnu_scanf, 2, 0))) __MINGW_ATTRIB_NONNULL(2) +__MINGW_GNU_SCANF(2, 0) __MINGW_ATTRIB_NONNULL(2) int vfscanf (FILE *__stream, const char *__format, __builtin_va_list __local_argv) { return __mingw_vfscanf( __stream, __format, __local_argv ); @@ -364,7 +364,7 @@ int vfscanf (FILE *__stream, const char *__format, __builtin_va_list __local_ar __mingw_ovr -__attribute__((__format__ (gnu_printf, 2, 3))) __MINGW_ATTRIB_NONNULL(2) +__MINGW_GNU_PRINTF(2, 3) __MINGW_ATTRIB_NONNULL(2) int fprintf (FILE *__stream, const char *__format, ...) { int __retval; @@ -375,7 +375,7 @@ int fprintf (FILE *__stream, const char *__format, ...) } __mingw_ovr -__attribute__((__format__ (gnu_printf, 1, 2))) __MINGW_ATTRIB_NONNULL(1) +__MINGW_GNU_PRINTF(1, 2) __MINGW_ATTRIB_NONNULL(1) int printf (const char *__format, ...) { int __retval; @@ -390,7 +390,7 @@ int printf (const char *__format, ...) int sprintf (char *__stream, const char *__format, ...) __MINGW_ASM_CALL(__mingw_sprintf); __mingw_bos_extern_ovr -__attribute__((__format__ (gnu_printf, 2, 3))) __MINGW_ATTRIB_NONNULL(2) +__MINGW_GNU_PRINTF(2, 3) __MINGW_ATTRIB_NONNULL(2) int sprintf (char *__stream, const char *__format, ...) { if (__mingw_bos_known(__stream)) { @@ -405,7 +405,7 @@ int sprintf (char *__stream, const char *__format, ...) #else /* !__MINGW_FORTIFY_VA_ARG */ __mingw_ovr -__attribute__((__format__ (gnu_printf, 2, 3))) __MINGW_ATTRIB_NONNULL(2) +__MINGW_GNU_PRINTF(2, 3) __MINGW_ATTRIB_NONNULL(2) int sprintf (char *__stream, const char *__format, ...) { int __retval; @@ -418,21 +418,21 @@ int sprintf (char *__stream, const char *__format, ...) #endif /* __MINGW_FORTIFY_VA_ARG */ __mingw_ovr -__attribute__((__format__ (gnu_printf, 2, 0))) __MINGW_ATTRIB_NONNULL(2) +__MINGW_GNU_PRINTF(2, 0) __MINGW_ATTRIB_NONNULL(2) int vfprintf (FILE *__stream, const char *__format, __builtin_va_list __local_argv) { return __mingw_vfprintf( __stream, __format, __local_argv ); } __mingw_ovr -__attribute__((__format__ (gnu_printf, 1, 0))) __MINGW_ATTRIB_NONNULL(1) +__MINGW_GNU_PRINTF(1, 0) __MINGW_ATTRIB_NONNULL(1) int vprintf (const char *__format, __builtin_va_list __local_argv) { return __mingw_vfprintf( stdout, __format, __local_argv ); } __mingw_bos_ovr -__attribute__((__format__ (gnu_printf, 2, 0))) __MINGW_ATTRIB_NONNULL(2) +__MINGW_GNU_PRINTF(2, 0) __MINGW_ATTRIB_NONNULL(2) int vsprintf (char *__stream, const char *__format, __builtin_va_list __local_argv) { #if __MINGW_FORTIFY_LEVEL > 0 @@ -452,7 +452,7 @@ int vsprintf (char *__stream, const char *__format, __builtin_va_list __local_ar int snprintf (char *__stream, size_t __n, const char *__format, ...) __MINGW_ASM_CALL(__mingw_snprintf); __mingw_bos_extern_ovr -__attribute__((__format__ (gnu_printf, 3, 4))) __MINGW_ATTRIB_NONNULL(3) +__MINGW_GNU_PRINTF(3, 4) __MINGW_ATTRIB_NONNULL(3) int snprintf (char *__stream, size_t __n, const char *__format, ...) { __mingw_bos_ptr_chk_warn(__stream, __n, 1); @@ -462,7 +462,7 @@ int snprintf (char *__stream, size_t __n, const char *__format, ...) #else /* !__MINGW_FORTIFY_VA_ARG */ __mingw_ovr -__attribute__((__format__ (gnu_printf, 3, 4))) __MINGW_ATTRIB_NONNULL(3) +__MINGW_GNU_PRINTF(3, 4) __MINGW_ATTRIB_NONNULL(3) int snprintf (char *__stream, size_t __n, const char *__format, ...) { int __retval; @@ -475,7 +475,7 @@ int snprintf (char *__stream, size_t __n, const char *__format, ...) #endif /* __MINGW_FORTIFY_VA_ARG */ __mingw_bos_ovr -__attribute__((__format__ (gnu_printf, 3, 0))) __MINGW_ATTRIB_NONNULL(3) +__MINGW_GNU_PRINTF(3, 0) __MINGW_ATTRIB_NONNULL(3) int vsnprintf (char *__stream, size_t __n, const char *__format, __builtin_va_list __local_argv) { #if __MINGW_FORTIFY_LEVEL > 0 @@ -550,25 +550,25 @@ int vsnprintf (char *__stream, size_t __n, const char *__format, __builtin_va_li #endif #else - __attribute__((__format__ (ms_printf, 2, 3))) __MINGW_ATTRIB_NONNULL(2) + __MINGW_MS_PRINTF(2, 3) __MINGW_ATTRIB_NONNULL(2) int __cdecl fprintf(FILE * __restrict__ _File,const char * __restrict__ _Format,...); - __attribute__((__format__ (ms_printf, 1, 2))) __MINGW_ATTRIB_NONNULL(1) + __MINGW_MS_PRINTF(1, 2) __MINGW_ATTRIB_NONNULL(1) int __cdecl printf(const char * __restrict__ _Format,...); - __attribute__((__format__ (ms_printf, 2, 3))) __MINGW_ATTRIB_NONNULL(2) + __MINGW_MS_PRINTF(2, 3) __MINGW_ATTRIB_NONNULL(2) int __cdecl sprintf(char * __restrict__ _Dest,const char * __restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; - __attribute__((__format__ (ms_printf, 2, 0))) __MINGW_ATTRIB_NONNULL(2) + __MINGW_MS_PRINTF(2, 0) __MINGW_ATTRIB_NONNULL(2) int __cdecl vfprintf(FILE * __restrict__ _File,const char * __restrict__ _Format,va_list _ArgList); - __attribute__((__format__ (ms_printf, 1, 0))) __MINGW_ATTRIB_NONNULL(1) + __MINGW_MS_PRINTF(1, 0) __MINGW_ATTRIB_NONNULL(1) int __cdecl vprintf(const char * __restrict__ _Format,va_list _ArgList); - __attribute__((__format__ (ms_printf, 2, 0))) __MINGW_ATTRIB_NONNULL(2) + __MINGW_MS_PRINTF(2, 0) __MINGW_ATTRIB_NONNULL(2) int __cdecl vsprintf(char * __restrict__ _Dest,const char * __restrict__ _Format,va_list _Args) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; - __attribute__((__format__ (ms_scanf, 2, 3))) __MINGW_ATTRIB_NONNULL(2) + __MINGW_MS_SCANF(2, 3) __MINGW_ATTRIB_NONNULL(2) int __cdecl fscanf(FILE * __restrict__ _File,const char * __restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; - __attribute__((__format__ (ms_scanf, 1, 2))) __MINGW_ATTRIB_NONNULL(1) + __MINGW_MS_SCANF(1, 2) __MINGW_ATTRIB_NONNULL(1) int __cdecl scanf(const char * __restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; - __attribute__((__format__ (ms_scanf, 2, 3))) __MINGW_ATTRIB_NONNULL(2) + __MINGW_MS_SCANF(2, 3) __MINGW_ATTRIB_NONNULL(2) int __cdecl sscanf(const char * __restrict__ _Src,const char * __restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; #ifdef _GNU_SOURCE int __cdecl vasprintf(char ** __restrict__ __ret,const char * __restrict__ __format,va_list __ap) __attribute__ ((format (__MINGW_PRINTF_FORMAT, 2, 0))); @@ -580,28 +580,28 @@ int vsnprintf (char *__stream, size_t __n, const char *__format, __builtin_va_li #pragma GCC diagnostic ignored "-Wshadow" #endif - __attribute__((__format__ (ms_scanf, 1, 0))) __MINGW_ATTRIB_NONNULL(1) + __MINGW_MS_SCANF(1, 0) __MINGW_ATTRIB_NONNULL(1) int __cdecl __ms_vscanf(const char * __restrict__ Format, va_list argp); - __attribute__((__format__ (ms_scanf, 2, 0))) __MINGW_ATTRIB_NONNULL(2) + __MINGW_MS_SCANF(2, 0) __MINGW_ATTRIB_NONNULL(2) int __cdecl __ms_vfscanf (FILE * __restrict__ fp, const char * __restrict__ Format,va_list argp); - __attribute__((__format__ (ms_scanf, 2, 0))) __MINGW_ATTRIB_NONNULL(2) + __MINGW_MS_SCANF(2, 0) __MINGW_ATTRIB_NONNULL(2) int __cdecl __ms_vsscanf (const char * __restrict__ _Str,const char * __restrict__ Format,va_list argp); __mingw_ovr - __attribute__((__format__ (ms_scanf, 2, 0))) __MINGW_ATTRIB_NONNULL(2) + __MINGW_MS_SCANF(2, 0) __MINGW_ATTRIB_NONNULL(2) int vfscanf (FILE *__stream, const char *__format, __builtin_va_list __local_argv) { return __ms_vfscanf (__stream, __format, __local_argv); } __mingw_ovr - __attribute__((__format__ (ms_scanf, 2, 0))) __MINGW_ATTRIB_NONNULL(2) + __MINGW_MS_SCANF(2, 0) __MINGW_ATTRIB_NONNULL(2) int vsscanf (const char * __restrict__ __source, const char * __restrict__ __format, __builtin_va_list __local_argv) { return __ms_vsscanf( __source, __format, __local_argv ); } __mingw_ovr - __attribute__((__format__ (ms_scanf, 1, 0))) __MINGW_ATTRIB_NONNULL(1) + __MINGW_MS_SCANF(1, 0) __MINGW_ATTRIB_NONNULL(1) int vscanf(const char *__format, __builtin_va_list __local_argv) { return __ms_vscanf (__format, __local_argv); @@ -742,13 +742,13 @@ int vsnprintf (char *__stream, size_t __n, const char *__format, __builtin_va_li int __cdecl _snscanf(const char * __restrict__ _Src,size_t _MaxCount,const char * __restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; #else __MINGW_ATTRIB_PURE - __attribute__((__format__ (ms_printf, 1, 2))) __MINGW_ATTRIB_NONNULL(1) + __MINGW_MS_PRINTF(1, 2) __MINGW_ATTRIB_NONNULL(1) _CRTIMP int __cdecl _scprintf(const char * __restrict__ _Format,...); - __attribute__((__format__ (ms_scanf, 3, 4))) __MINGW_ATTRIB_NONNULL(3) + __MINGW_MS_SCANF(3, 4) __MINGW_ATTRIB_NONNULL(3) _CRTIMP int __cdecl _snscanf(const char * __restrict__ _Src,size_t _MaxCount,const char * __restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; #endif __MINGW_ATTRIB_PURE - __attribute__((__format__ (ms_printf, 1, 0))) __MINGW_ATTRIB_NONNULL(1) + __MINGW_MS_PRINTF(1, 0) __MINGW_ATTRIB_NONNULL(1) _CRTIMP int __cdecl _vscprintf(const char * __restrict__ _Format,va_list _ArgList); FILE *__cdecl tmpfile(void) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; char *__cdecl tmpnam(char *_Buffer); @@ -760,9 +760,9 @@ int vsnprintf (char *__stream, size_t __n, const char *__format, __builtin_va_li __attribute__((__format__ (__MINGW_PRINTF_FORMAT, 3, 4))) __MINGW_ATTRIB_NONNULL(3) int __cdecl _snprintf(char * __restrict__ _Dest,size_t _Count,const char * __restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; #else - __attribute__((__format__ (ms_printf, 3, 4))) __MINGW_ATTRIB_NONNULL(3) + __MINGW_MS_PRINTF(3, 4) __MINGW_ATTRIB_NONNULL(3) _CRTIMP int __cdecl _snprintf(char * __restrict__ _Dest,size_t _Count,const char * __restrict__ _Format,...) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; - __attribute__((__format__ (ms_printf, 3, 0))) __MINGW_ATTRIB_NONNULL(3) + __MINGW_MS_PRINTF(3, 0) __MINGW_ATTRIB_NONNULL(3) _CRTIMP int __cdecl _vsnprintf(char * __restrict__ _Dest,size_t _Count,const char * __restrict__ _Format,va_list _Args) __MINGW_ATTRIB_DEPRECATED_SEC_WARN; #endif @@ -888,12 +888,12 @@ char * tmpnam(char * __dst) #pragma GCC diagnostic ignored "-Wshadow" #endif - __attribute__((__format__ (ms_printf, 3, 0))) __MINGW_ATTRIB_NONNULL(3) + __MINGW_MS_PRINTF(3, 0) __MINGW_ATTRIB_NONNULL(3) int __cdecl __ms_vsnprintf(char * __restrict__ d,size_t n,const char * __restrict__ format,va_list arg) __MINGW_ATTRIB_DEPRECATED_MSVC2005 __MINGW_ATTRIB_DEPRECATED_SEC_WARN; __mingw_bos_ovr - __attribute__((__format__ (ms_printf, 3, 0))) __MINGW_ATTRIB_NONNULL(3) + __MINGW_MS_PRINTF(3, 0) __MINGW_ATTRIB_NONNULL(3) int vsnprintf (char * __restrict__ __stream, size_t __n, const char * __restrict__ __format, va_list __local_argv) { #if __MINGW_FORTIFY_LEVEL > 0 @@ -904,7 +904,7 @@ char * tmpnam(char * __dst) return __ms_vsnprintf (__stream, __n, __format, __local_argv); } - __attribute__((__format__ (ms_printf, 3, 4))) __MINGW_ATTRIB_NONNULL(3) + __MINGW_MS_PRINTF(3, 4) __MINGW_ATTRIB_NONNULL(3) int __cdecl __ms_snprintf(char * __restrict__ s, size_t n, const char * __restrict__ format, ...); #ifndef __NO_ISOCEXT @@ -913,7 +913,7 @@ char * tmpnam(char * __dst) int snprintf (char * __restrict__ __stream, size_t __n, const char * __restrict__ __format, ...) __MINGW_ASM_CALL(__ms_snprintf); __mingw_bos_extern_ovr -__attribute__((__format__ (ms_printf, 3, 4))) __MINGW_ATTRIB_NONNULL(3) +__MINGW_MS_PRINTF(3, 4) __MINGW_ATTRIB_NONNULL(3) int snprintf (char * __restrict__ __stream, size_t __n, const char * __restrict__ __format, ...) { __mingw_bos_ptr_chk_warn(__stream, __n, 1); @@ -925,7 +925,7 @@ int snprintf (char * __restrict__ __stream, size_t __n, const char * __restrict_ #else /* !__MINGW_FORTIFY_VA_ARG */ __mingw_ovr -__attribute__((__format__ (ms_printf, 3, 4))) __MINGW_ATTRIB_NONNULL(3) +__MINGW_MS_PRINTF(3, 4) __MINGW_ATTRIB_NONNULL(3) int snprintf (char * __restrict__ __stream, size_t __n, const char * __restrict__ __format, ...) { int __retval; @@ -946,7 +946,7 @@ int snprintf (char * __restrict__ __stream, size_t __n, const char * __restrict_ int __cdecl __mingw_call_ms_sprintf(char * __restrict__, const char * __restrict__, ...) __MINGW_ASM_CALL(sprintf); __mingw_bos_extern_ovr -__attribute__((__format__ (ms_printf, 2, 3))) __MINGW_ATTRIB_NONNULL(2) +__MINGW_MS_PRINTF(2, 3) __MINGW_ATTRIB_NONNULL(2) int sprintf (char * __restrict__ __stream, const char * __restrict__ __format, ...) { if (__mingw_bos_known(__stream)) { @@ -965,7 +965,7 @@ int sprintf (char * __restrict__ __stream, const char * __restrict__ __format, . int __cdecl __mingw_call_ms_vsprintf(char * __restrict__, const char * __restrict__, va_list) __MINGW_ASM_CALL(vsprintf); __mingw_bos_extern_ovr -__attribute__((__format__ (ms_printf, 2, 0))) __MINGW_ATTRIB_NONNULL(2) +__MINGW_MS_PRINTF(2, 0) __MINGW_ATTRIB_NONNULL(2) int vsprintf (char * __restrict__ __stream, const char * __restrict__ __format, va_list __local_argv) { if (__mingw_bos_known(__stream)) { -- 2.34.1 _______________________________________________ Mingw-w64-public mailing list Mingw-w64-public@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mingw-w64-public