From 202c2fb1518430f65b16ec99f2af32771979cea9 Mon Sep 17 00:00:00 2001 From: ParadoxV5 Date: Mon, 12 Aug 2024 22:08:50 -0600 Subject: [PATCH] `make abi_update` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commits for MDEV-21978 changes ABIs with their introduction of `__attribute__((format(printf, …))` tags. --- include/mysql/plugin_audit.h.pp | 40 +++++++++++++------ include/mysql/plugin_auth.h.pp | 40 +++++++++++++------ include/mysql/plugin_data_type.h.pp | 40 +++++++++++++------ include/mysql/plugin_encryption.h.pp | 40 +++++++++++++------ include/mysql/plugin_ftparser.h.pp | 40 +++++++++++++------ include/mysql/plugin_function.h.pp | 40 +++++++++++++------ include/mysql/plugin_password_validation.h.pp | 40 +++++++++++++------ 7 files changed, 196 insertions(+), 84 deletions(-) diff --git a/include/mysql/plugin_audit.h.pp b/include/mysql/plugin_audit.h.pp index 3d57b383f10..2ba67eb40cf 100644 --- a/include/mysql/plugin_audit.h.pp +++ b/include/mysql/plugin_audit.h.pp @@ -130,8 +130,10 @@ extern struct logger_service_st { unsigned long long size_limit, unsigned int rotations); int (*close)(LOGGER_HANDLE *log); - int (*vprintf)(LOGGER_HANDLE *log, const char *fmt, va_list argptr); - int (*printf)(LOGGER_HANDLE *log, const char *fmt, ...); + int (*vprintf)(LOGGER_HANDLE *log, const char *fmt, va_list argptr) + __attribute__((format(printf, 2, 0))); + int (*printf)(LOGGER_HANDLE *log, const char *fmt, ...) + __attribute__((format(printf, 2, 3))); int (*write)(LOGGER_HANDLE *log, const char *buffer, size_t size); int (*rotate)(LOGGER_HANDLE *log); } *logger_service; @@ -140,8 +142,10 @@ extern struct logger_service_st { unsigned long long size_limit, unsigned int rotations); int logger_close(LOGGER_HANDLE *log); - int logger_vprintf(LOGGER_HANDLE *log, const char *fmt, va_list argptr); - int logger_printf(LOGGER_HANDLE *log, const char *fmt, ...); + int logger_vprintf(LOGGER_HANDLE *log, const char *fmt, va_list argptr) + __attribute__((format(printf, 2, 0))); + int logger_printf(LOGGER_HANDLE *log, const char *fmt, ...) + __attribute__((format(printf, 2, 3))); int logger_write(LOGGER_HANDLE *log, const char *buffer, size_t size); int logger_rotate(LOGGER_HANDLE *log); } @@ -195,20 +199,32 @@ unsigned int my_aes_ctx_size(enum my_aes_mode mode); extern "C" { extern struct my_print_error_service_st { void (*my_error_func)(unsigned int nr, unsigned long MyFlags, ...); - void (*my_printf_error_func)(unsigned int nr, const char *fmt, unsigned long MyFlags,...); - void (*my_printv_error_func)(unsigned int error, const char *format, unsigned long MyFlags, va_list ap); + void (*my_printf_error_func)(unsigned int nr, const char *fmt, + unsigned long MyFlags, ...) + __attribute__((format(printf, 2, 4))); + void (*my_printv_error_func)(unsigned int error, const char *format, + unsigned long MyFlags, va_list ap) + __attribute__((format(printf, 2, 0))); } *my_print_error_service; extern void my_error(unsigned int nr, unsigned long MyFlags, ...); -extern void my_printf_error(unsigned int my_err, const char *format, unsigned long MyFlags, ...); -extern void my_printv_error(unsigned int error, const char *format, unsigned long MyFlags,va_list ap); +extern void my_printf_error(unsigned int my_err, const char *format, + unsigned long MyFlags, ...) + __attribute__((format(printf, 2, 4))); +extern void my_printv_error(unsigned int error, const char *format, + unsigned long MyFlags,va_list ap) + __attribute__((format(printf, 2, 0))); } extern "C" { extern struct my_snprintf_service_st { - size_t (*my_snprintf_type)(char*, size_t, const char*, ...); - size_t (*my_vsnprintf_type)(char *, size_t, const char*, va_list); + size_t (*my_snprintf_type)(char*, size_t, const char*, ...) + __attribute__((format(printf, 3, 4))); + size_t (*my_vsnprintf_type)(char *, size_t, const char*, va_list) + __attribute__((format(printf, 3, 0))); } *my_snprintf_service; -size_t my_snprintf(char* to, size_t n, const char* fmt, ...); -size_t my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap); +size_t my_snprintf(char* to, size_t n, const char* fmt, ...) + __attribute__((format(printf, 3, 4))); +size_t my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap) + __attribute__((format(printf, 3, 0))); } extern "C" { extern struct progress_report_service_st { diff --git a/include/mysql/plugin_auth.h.pp b/include/mysql/plugin_auth.h.pp index fbb4f5910ec..43201f954c2 100644 --- a/include/mysql/plugin_auth.h.pp +++ b/include/mysql/plugin_auth.h.pp @@ -130,8 +130,10 @@ extern struct logger_service_st { unsigned long long size_limit, unsigned int rotations); int (*close)(LOGGER_HANDLE *log); - int (*vprintf)(LOGGER_HANDLE *log, const char *fmt, va_list argptr); - int (*printf)(LOGGER_HANDLE *log, const char *fmt, ...); + int (*vprintf)(LOGGER_HANDLE *log, const char *fmt, va_list argptr) + __attribute__((format(printf, 2, 0))); + int (*printf)(LOGGER_HANDLE *log, const char *fmt, ...) + __attribute__((format(printf, 2, 3))); int (*write)(LOGGER_HANDLE *log, const char *buffer, size_t size); int (*rotate)(LOGGER_HANDLE *log); } *logger_service; @@ -140,8 +142,10 @@ extern struct logger_service_st { unsigned long long size_limit, unsigned int rotations); int logger_close(LOGGER_HANDLE *log); - int logger_vprintf(LOGGER_HANDLE *log, const char *fmt, va_list argptr); - int logger_printf(LOGGER_HANDLE *log, const char *fmt, ...); + int logger_vprintf(LOGGER_HANDLE *log, const char *fmt, va_list argptr) + __attribute__((format(printf, 2, 0))); + int logger_printf(LOGGER_HANDLE *log, const char *fmt, ...) + __attribute__((format(printf, 2, 3))); int logger_write(LOGGER_HANDLE *log, const char *buffer, size_t size); int logger_rotate(LOGGER_HANDLE *log); } @@ -195,20 +199,32 @@ unsigned int my_aes_ctx_size(enum my_aes_mode mode); extern "C" { extern struct my_print_error_service_st { void (*my_error_func)(unsigned int nr, unsigned long MyFlags, ...); - void (*my_printf_error_func)(unsigned int nr, const char *fmt, unsigned long MyFlags,...); - void (*my_printv_error_func)(unsigned int error, const char *format, unsigned long MyFlags, va_list ap); + void (*my_printf_error_func)(unsigned int nr, const char *fmt, + unsigned long MyFlags, ...) + __attribute__((format(printf, 2, 4))); + void (*my_printv_error_func)(unsigned int error, const char *format, + unsigned long MyFlags, va_list ap) + __attribute__((format(printf, 2, 0))); } *my_print_error_service; extern void my_error(unsigned int nr, unsigned long MyFlags, ...); -extern void my_printf_error(unsigned int my_err, const char *format, unsigned long MyFlags, ...); -extern void my_printv_error(unsigned int error, const char *format, unsigned long MyFlags,va_list ap); +extern void my_printf_error(unsigned int my_err, const char *format, + unsigned long MyFlags, ...) + __attribute__((format(printf, 2, 4))); +extern void my_printv_error(unsigned int error, const char *format, + unsigned long MyFlags,va_list ap) + __attribute__((format(printf, 2, 0))); } extern "C" { extern struct my_snprintf_service_st { - size_t (*my_snprintf_type)(char*, size_t, const char*, ...); - size_t (*my_vsnprintf_type)(char *, size_t, const char*, va_list); + size_t (*my_snprintf_type)(char*, size_t, const char*, ...) + __attribute__((format(printf, 3, 4))); + size_t (*my_vsnprintf_type)(char *, size_t, const char*, va_list) + __attribute__((format(printf, 3, 0))); } *my_snprintf_service; -size_t my_snprintf(char* to, size_t n, const char* fmt, ...); -size_t my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap); +size_t my_snprintf(char* to, size_t n, const char* fmt, ...) + __attribute__((format(printf, 3, 4))); +size_t my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap) + __attribute__((format(printf, 3, 0))); } extern "C" { extern struct progress_report_service_st { diff --git a/include/mysql/plugin_data_type.h.pp b/include/mysql/plugin_data_type.h.pp index be20dcccd55..94ce7bfff7b 100644 --- a/include/mysql/plugin_data_type.h.pp +++ b/include/mysql/plugin_data_type.h.pp @@ -130,8 +130,10 @@ extern struct logger_service_st { unsigned long long size_limit, unsigned int rotations); int (*close)(LOGGER_HANDLE *log); - int (*vprintf)(LOGGER_HANDLE *log, const char *fmt, va_list argptr); - int (*printf)(LOGGER_HANDLE *log, const char *fmt, ...); + int (*vprintf)(LOGGER_HANDLE *log, const char *fmt, va_list argptr) + __attribute__((format(printf, 2, 0))); + int (*printf)(LOGGER_HANDLE *log, const char *fmt, ...) + __attribute__((format(printf, 2, 3))); int (*write)(LOGGER_HANDLE *log, const char *buffer, size_t size); int (*rotate)(LOGGER_HANDLE *log); } *logger_service; @@ -140,8 +142,10 @@ extern struct logger_service_st { unsigned long long size_limit, unsigned int rotations); int logger_close(LOGGER_HANDLE *log); - int logger_vprintf(LOGGER_HANDLE *log, const char *fmt, va_list argptr); - int logger_printf(LOGGER_HANDLE *log, const char *fmt, ...); + int logger_vprintf(LOGGER_HANDLE *log, const char *fmt, va_list argptr) + __attribute__((format(printf, 2, 0))); + int logger_printf(LOGGER_HANDLE *log, const char *fmt, ...) + __attribute__((format(printf, 2, 3))); int logger_write(LOGGER_HANDLE *log, const char *buffer, size_t size); int logger_rotate(LOGGER_HANDLE *log); } @@ -195,20 +199,32 @@ unsigned int my_aes_ctx_size(enum my_aes_mode mode); extern "C" { extern struct my_print_error_service_st { void (*my_error_func)(unsigned int nr, unsigned long MyFlags, ...); - void (*my_printf_error_func)(unsigned int nr, const char *fmt, unsigned long MyFlags,...); - void (*my_printv_error_func)(unsigned int error, const char *format, unsigned long MyFlags, va_list ap); + void (*my_printf_error_func)(unsigned int nr, const char *fmt, + unsigned long MyFlags, ...) + __attribute__((format(printf, 2, 4))); + void (*my_printv_error_func)(unsigned int error, const char *format, + unsigned long MyFlags, va_list ap) + __attribute__((format(printf, 2, 0))); } *my_print_error_service; extern void my_error(unsigned int nr, unsigned long MyFlags, ...); -extern void my_printf_error(unsigned int my_err, const char *format, unsigned long MyFlags, ...); -extern void my_printv_error(unsigned int error, const char *format, unsigned long MyFlags,va_list ap); +extern void my_printf_error(unsigned int my_err, const char *format, + unsigned long MyFlags, ...) + __attribute__((format(printf, 2, 4))); +extern void my_printv_error(unsigned int error, const char *format, + unsigned long MyFlags,va_list ap) + __attribute__((format(printf, 2, 0))); } extern "C" { extern struct my_snprintf_service_st { - size_t (*my_snprintf_type)(char*, size_t, const char*, ...); - size_t (*my_vsnprintf_type)(char *, size_t, const char*, va_list); + size_t (*my_snprintf_type)(char*, size_t, const char*, ...) + __attribute__((format(printf, 3, 4))); + size_t (*my_vsnprintf_type)(char *, size_t, const char*, va_list) + __attribute__((format(printf, 3, 0))); } *my_snprintf_service; -size_t my_snprintf(char* to, size_t n, const char* fmt, ...); -size_t my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap); +size_t my_snprintf(char* to, size_t n, const char* fmt, ...) + __attribute__((format(printf, 3, 4))); +size_t my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap) + __attribute__((format(printf, 3, 0))); } extern "C" { extern struct progress_report_service_st { diff --git a/include/mysql/plugin_encryption.h.pp b/include/mysql/plugin_encryption.h.pp index 21edc27e4e3..f26a02def18 100644 --- a/include/mysql/plugin_encryption.h.pp +++ b/include/mysql/plugin_encryption.h.pp @@ -130,8 +130,10 @@ extern struct logger_service_st { unsigned long long size_limit, unsigned int rotations); int (*close)(LOGGER_HANDLE *log); - int (*vprintf)(LOGGER_HANDLE *log, const char *fmt, va_list argptr); - int (*printf)(LOGGER_HANDLE *log, const char *fmt, ...); + int (*vprintf)(LOGGER_HANDLE *log, const char *fmt, va_list argptr) + __attribute__((format(printf, 2, 0))); + int (*printf)(LOGGER_HANDLE *log, const char *fmt, ...) + __attribute__((format(printf, 2, 3))); int (*write)(LOGGER_HANDLE *log, const char *buffer, size_t size); int (*rotate)(LOGGER_HANDLE *log); } *logger_service; @@ -140,8 +142,10 @@ extern struct logger_service_st { unsigned long long size_limit, unsigned int rotations); int logger_close(LOGGER_HANDLE *log); - int logger_vprintf(LOGGER_HANDLE *log, const char *fmt, va_list argptr); - int logger_printf(LOGGER_HANDLE *log, const char *fmt, ...); + int logger_vprintf(LOGGER_HANDLE *log, const char *fmt, va_list argptr) + __attribute__((format(printf, 2, 0))); + int logger_printf(LOGGER_HANDLE *log, const char *fmt, ...) + __attribute__((format(printf, 2, 3))); int logger_write(LOGGER_HANDLE *log, const char *buffer, size_t size); int logger_rotate(LOGGER_HANDLE *log); } @@ -195,20 +199,32 @@ unsigned int my_aes_ctx_size(enum my_aes_mode mode); extern "C" { extern struct my_print_error_service_st { void (*my_error_func)(unsigned int nr, unsigned long MyFlags, ...); - void (*my_printf_error_func)(unsigned int nr, const char *fmt, unsigned long MyFlags,...); - void (*my_printv_error_func)(unsigned int error, const char *format, unsigned long MyFlags, va_list ap); + void (*my_printf_error_func)(unsigned int nr, const char *fmt, + unsigned long MyFlags, ...) + __attribute__((format(printf, 2, 4))); + void (*my_printv_error_func)(unsigned int error, const char *format, + unsigned long MyFlags, va_list ap) + __attribute__((format(printf, 2, 0))); } *my_print_error_service; extern void my_error(unsigned int nr, unsigned long MyFlags, ...); -extern void my_printf_error(unsigned int my_err, const char *format, unsigned long MyFlags, ...); -extern void my_printv_error(unsigned int error, const char *format, unsigned long MyFlags,va_list ap); +extern void my_printf_error(unsigned int my_err, const char *format, + unsigned long MyFlags, ...) + __attribute__((format(printf, 2, 4))); +extern void my_printv_error(unsigned int error, const char *format, + unsigned long MyFlags,va_list ap) + __attribute__((format(printf, 2, 0))); } extern "C" { extern struct my_snprintf_service_st { - size_t (*my_snprintf_type)(char*, size_t, const char*, ...); - size_t (*my_vsnprintf_type)(char *, size_t, const char*, va_list); + size_t (*my_snprintf_type)(char*, size_t, const char*, ...) + __attribute__((format(printf, 3, 4))); + size_t (*my_vsnprintf_type)(char *, size_t, const char*, va_list) + __attribute__((format(printf, 3, 0))); } *my_snprintf_service; -size_t my_snprintf(char* to, size_t n, const char* fmt, ...); -size_t my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap); +size_t my_snprintf(char* to, size_t n, const char* fmt, ...) + __attribute__((format(printf, 3, 4))); +size_t my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap) + __attribute__((format(printf, 3, 0))); } extern "C" { extern struct progress_report_service_st { diff --git a/include/mysql/plugin_ftparser.h.pp b/include/mysql/plugin_ftparser.h.pp index 58b8274fcb0..7c3e476849a 100644 --- a/include/mysql/plugin_ftparser.h.pp +++ b/include/mysql/plugin_ftparser.h.pp @@ -130,8 +130,10 @@ extern struct logger_service_st { unsigned long long size_limit, unsigned int rotations); int (*close)(LOGGER_HANDLE *log); - int (*vprintf)(LOGGER_HANDLE *log, const char *fmt, va_list argptr); - int (*printf)(LOGGER_HANDLE *log, const char *fmt, ...); + int (*vprintf)(LOGGER_HANDLE *log, const char *fmt, va_list argptr) + __attribute__((format(printf, 2, 0))); + int (*printf)(LOGGER_HANDLE *log, const char *fmt, ...) + __attribute__((format(printf, 2, 3))); int (*write)(LOGGER_HANDLE *log, const char *buffer, size_t size); int (*rotate)(LOGGER_HANDLE *log); } *logger_service; @@ -140,8 +142,10 @@ extern struct logger_service_st { unsigned long long size_limit, unsigned int rotations); int logger_close(LOGGER_HANDLE *log); - int logger_vprintf(LOGGER_HANDLE *log, const char *fmt, va_list argptr); - int logger_printf(LOGGER_HANDLE *log, const char *fmt, ...); + int logger_vprintf(LOGGER_HANDLE *log, const char *fmt, va_list argptr) + __attribute__((format(printf, 2, 0))); + int logger_printf(LOGGER_HANDLE *log, const char *fmt, ...) + __attribute__((format(printf, 2, 3))); int logger_write(LOGGER_HANDLE *log, const char *buffer, size_t size); int logger_rotate(LOGGER_HANDLE *log); } @@ -195,20 +199,32 @@ unsigned int my_aes_ctx_size(enum my_aes_mode mode); extern "C" { extern struct my_print_error_service_st { void (*my_error_func)(unsigned int nr, unsigned long MyFlags, ...); - void (*my_printf_error_func)(unsigned int nr, const char *fmt, unsigned long MyFlags,...); - void (*my_printv_error_func)(unsigned int error, const char *format, unsigned long MyFlags, va_list ap); + void (*my_printf_error_func)(unsigned int nr, const char *fmt, + unsigned long MyFlags, ...) + __attribute__((format(printf, 2, 4))); + void (*my_printv_error_func)(unsigned int error, const char *format, + unsigned long MyFlags, va_list ap) + __attribute__((format(printf, 2, 0))); } *my_print_error_service; extern void my_error(unsigned int nr, unsigned long MyFlags, ...); -extern void my_printf_error(unsigned int my_err, const char *format, unsigned long MyFlags, ...); -extern void my_printv_error(unsigned int error, const char *format, unsigned long MyFlags,va_list ap); +extern void my_printf_error(unsigned int my_err, const char *format, + unsigned long MyFlags, ...) + __attribute__((format(printf, 2, 4))); +extern void my_printv_error(unsigned int error, const char *format, + unsigned long MyFlags,va_list ap) + __attribute__((format(printf, 2, 0))); } extern "C" { extern struct my_snprintf_service_st { - size_t (*my_snprintf_type)(char*, size_t, const char*, ...); - size_t (*my_vsnprintf_type)(char *, size_t, const char*, va_list); + size_t (*my_snprintf_type)(char*, size_t, const char*, ...) + __attribute__((format(printf, 3, 4))); + size_t (*my_vsnprintf_type)(char *, size_t, const char*, va_list) + __attribute__((format(printf, 3, 0))); } *my_snprintf_service; -size_t my_snprintf(char* to, size_t n, const char* fmt, ...); -size_t my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap); +size_t my_snprintf(char* to, size_t n, const char* fmt, ...) + __attribute__((format(printf, 3, 4))); +size_t my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap) + __attribute__((format(printf, 3, 0))); } extern "C" { extern struct progress_report_service_st { diff --git a/include/mysql/plugin_function.h.pp b/include/mysql/plugin_function.h.pp index f1c4ad93b33..42970389951 100644 --- a/include/mysql/plugin_function.h.pp +++ b/include/mysql/plugin_function.h.pp @@ -130,8 +130,10 @@ extern struct logger_service_st { unsigned long long size_limit, unsigned int rotations); int (*close)(LOGGER_HANDLE *log); - int (*vprintf)(LOGGER_HANDLE *log, const char *fmt, va_list argptr); - int (*printf)(LOGGER_HANDLE *log, const char *fmt, ...); + int (*vprintf)(LOGGER_HANDLE *log, const char *fmt, va_list argptr) + __attribute__((format(printf, 2, 0))); + int (*printf)(LOGGER_HANDLE *log, const char *fmt, ...) + __attribute__((format(printf, 2, 3))); int (*write)(LOGGER_HANDLE *log, const char *buffer, size_t size); int (*rotate)(LOGGER_HANDLE *log); } *logger_service; @@ -140,8 +142,10 @@ extern struct logger_service_st { unsigned long long size_limit, unsigned int rotations); int logger_close(LOGGER_HANDLE *log); - int logger_vprintf(LOGGER_HANDLE *log, const char *fmt, va_list argptr); - int logger_printf(LOGGER_HANDLE *log, const char *fmt, ...); + int logger_vprintf(LOGGER_HANDLE *log, const char *fmt, va_list argptr) + __attribute__((format(printf, 2, 0))); + int logger_printf(LOGGER_HANDLE *log, const char *fmt, ...) + __attribute__((format(printf, 2, 3))); int logger_write(LOGGER_HANDLE *log, const char *buffer, size_t size); int logger_rotate(LOGGER_HANDLE *log); } @@ -195,20 +199,32 @@ unsigned int my_aes_ctx_size(enum my_aes_mode mode); extern "C" { extern struct my_print_error_service_st { void (*my_error_func)(unsigned int nr, unsigned long MyFlags, ...); - void (*my_printf_error_func)(unsigned int nr, const char *fmt, unsigned long MyFlags,...); - void (*my_printv_error_func)(unsigned int error, const char *format, unsigned long MyFlags, va_list ap); + void (*my_printf_error_func)(unsigned int nr, const char *fmt, + unsigned long MyFlags, ...) + __attribute__((format(printf, 2, 4))); + void (*my_printv_error_func)(unsigned int error, const char *format, + unsigned long MyFlags, va_list ap) + __attribute__((format(printf, 2, 0))); } *my_print_error_service; extern void my_error(unsigned int nr, unsigned long MyFlags, ...); -extern void my_printf_error(unsigned int my_err, const char *format, unsigned long MyFlags, ...); -extern void my_printv_error(unsigned int error, const char *format, unsigned long MyFlags,va_list ap); +extern void my_printf_error(unsigned int my_err, const char *format, + unsigned long MyFlags, ...) + __attribute__((format(printf, 2, 4))); +extern void my_printv_error(unsigned int error, const char *format, + unsigned long MyFlags,va_list ap) + __attribute__((format(printf, 2, 0))); } extern "C" { extern struct my_snprintf_service_st { - size_t (*my_snprintf_type)(char*, size_t, const char*, ...); - size_t (*my_vsnprintf_type)(char *, size_t, const char*, va_list); + size_t (*my_snprintf_type)(char*, size_t, const char*, ...) + __attribute__((format(printf, 3, 4))); + size_t (*my_vsnprintf_type)(char *, size_t, const char*, va_list) + __attribute__((format(printf, 3, 0))); } *my_snprintf_service; -size_t my_snprintf(char* to, size_t n, const char* fmt, ...); -size_t my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap); +size_t my_snprintf(char* to, size_t n, const char* fmt, ...) + __attribute__((format(printf, 3, 4))); +size_t my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap) + __attribute__((format(printf, 3, 0))); } extern "C" { extern struct progress_report_service_st { diff --git a/include/mysql/plugin_password_validation.h.pp b/include/mysql/plugin_password_validation.h.pp index 5f9bd1b3989..3d92c127b87 100644 --- a/include/mysql/plugin_password_validation.h.pp +++ b/include/mysql/plugin_password_validation.h.pp @@ -130,8 +130,10 @@ extern struct logger_service_st { unsigned long long size_limit, unsigned int rotations); int (*close)(LOGGER_HANDLE *log); - int (*vprintf)(LOGGER_HANDLE *log, const char *fmt, va_list argptr); - int (*printf)(LOGGER_HANDLE *log, const char *fmt, ...); + int (*vprintf)(LOGGER_HANDLE *log, const char *fmt, va_list argptr) + __attribute__((format(printf, 2, 0))); + int (*printf)(LOGGER_HANDLE *log, const char *fmt, ...) + __attribute__((format(printf, 2, 3))); int (*write)(LOGGER_HANDLE *log, const char *buffer, size_t size); int (*rotate)(LOGGER_HANDLE *log); } *logger_service; @@ -140,8 +142,10 @@ extern struct logger_service_st { unsigned long long size_limit, unsigned int rotations); int logger_close(LOGGER_HANDLE *log); - int logger_vprintf(LOGGER_HANDLE *log, const char *fmt, va_list argptr); - int logger_printf(LOGGER_HANDLE *log, const char *fmt, ...); + int logger_vprintf(LOGGER_HANDLE *log, const char *fmt, va_list argptr) + __attribute__((format(printf, 2, 0))); + int logger_printf(LOGGER_HANDLE *log, const char *fmt, ...) + __attribute__((format(printf, 2, 3))); int logger_write(LOGGER_HANDLE *log, const char *buffer, size_t size); int logger_rotate(LOGGER_HANDLE *log); } @@ -195,20 +199,32 @@ unsigned int my_aes_ctx_size(enum my_aes_mode mode); extern "C" { extern struct my_print_error_service_st { void (*my_error_func)(unsigned int nr, unsigned long MyFlags, ...); - void (*my_printf_error_func)(unsigned int nr, const char *fmt, unsigned long MyFlags,...); - void (*my_printv_error_func)(unsigned int error, const char *format, unsigned long MyFlags, va_list ap); + void (*my_printf_error_func)(unsigned int nr, const char *fmt, + unsigned long MyFlags, ...) + __attribute__((format(printf, 2, 4))); + void (*my_printv_error_func)(unsigned int error, const char *format, + unsigned long MyFlags, va_list ap) + __attribute__((format(printf, 2, 0))); } *my_print_error_service; extern void my_error(unsigned int nr, unsigned long MyFlags, ...); -extern void my_printf_error(unsigned int my_err, const char *format, unsigned long MyFlags, ...); -extern void my_printv_error(unsigned int error, const char *format, unsigned long MyFlags,va_list ap); +extern void my_printf_error(unsigned int my_err, const char *format, + unsigned long MyFlags, ...) + __attribute__((format(printf, 2, 4))); +extern void my_printv_error(unsigned int error, const char *format, + unsigned long MyFlags,va_list ap) + __attribute__((format(printf, 2, 0))); } extern "C" { extern struct my_snprintf_service_st { - size_t (*my_snprintf_type)(char*, size_t, const char*, ...); - size_t (*my_vsnprintf_type)(char *, size_t, const char*, va_list); + size_t (*my_snprintf_type)(char*, size_t, const char*, ...) + __attribute__((format(printf, 3, 4))); + size_t (*my_vsnprintf_type)(char *, size_t, const char*, va_list) + __attribute__((format(printf, 3, 0))); } *my_snprintf_service; -size_t my_snprintf(char* to, size_t n, const char* fmt, ...); -size_t my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap); +size_t my_snprintf(char* to, size_t n, const char* fmt, ...) + __attribute__((format(printf, 3, 4))); +size_t my_vsnprintf(char *to, size_t n, const char* fmt, va_list ap) + __attribute__((format(printf, 3, 0))); } extern "C" { extern struct progress_report_service_st {