1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00

make abi_update

Commits for MDEV-21978 changes ABIs with their introduction of
`__attribute__((format(printf, …))` tags.
This commit is contained in:
ParadoxV5
2024-08-12 22:08:50 -06:00
committed by Sergei Golubchik
parent c8783757d6
commit 202c2fb151
7 changed files with 196 additions and 84 deletions

View File

@@ -130,8 +130,10 @@ extern struct logger_service_st {
unsigned long long size_limit, unsigned long long size_limit,
unsigned int rotations); unsigned int rotations);
int (*close)(LOGGER_HANDLE *log); int (*close)(LOGGER_HANDLE *log);
int (*vprintf)(LOGGER_HANDLE *log, const char *fmt, va_list argptr); int (*vprintf)(LOGGER_HANDLE *log, const char *fmt, va_list argptr)
int (*printf)(LOGGER_HANDLE *log, const char *fmt, ...); __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 (*write)(LOGGER_HANDLE *log, const char *buffer, size_t size);
int (*rotate)(LOGGER_HANDLE *log); int (*rotate)(LOGGER_HANDLE *log);
} *logger_service; } *logger_service;
@@ -140,8 +142,10 @@ extern struct logger_service_st {
unsigned long long size_limit, unsigned long long size_limit,
unsigned int rotations); unsigned int rotations);
int logger_close(LOGGER_HANDLE *log); int logger_close(LOGGER_HANDLE *log);
int logger_vprintf(LOGGER_HANDLE *log, const char *fmt, va_list argptr); int logger_vprintf(LOGGER_HANDLE *log, const char *fmt, va_list argptr)
int logger_printf(LOGGER_HANDLE *log, const char *fmt, ...); __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_write(LOGGER_HANDLE *log, const char *buffer, size_t size);
int logger_rotate(LOGGER_HANDLE *log); int logger_rotate(LOGGER_HANDLE *log);
} }
@@ -195,20 +199,32 @@ unsigned int my_aes_ctx_size(enum my_aes_mode mode);
extern "C" { extern "C" {
extern struct my_print_error_service_st { extern struct my_print_error_service_st {
void (*my_error_func)(unsigned int nr, unsigned long MyFlags, ...); 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_printf_error_func)(unsigned int nr, const char *fmt,
void (*my_printv_error_func)(unsigned int error, const char *format, unsigned long MyFlags, va_list ap); 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; } *my_print_error_service;
extern void my_error(unsigned int nr, unsigned long MyFlags, ...); 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_printf_error(unsigned int my_err, const char *format,
extern void my_printv_error(unsigned int error, const char *format, unsigned long MyFlags,va_list ap); 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 "C" {
extern struct my_snprintf_service_st { extern struct my_snprintf_service_st {
size_t (*my_snprintf_type)(char*, size_t, const char*, ...); size_t (*my_snprintf_type)(char*, size_t, const char*, ...)
size_t (*my_vsnprintf_type)(char *, size_t, const char*, va_list); __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; } *my_snprintf_service;
size_t my_snprintf(char* to, size_t n, const char* fmt, ...); 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); __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 "C" {
extern struct progress_report_service_st { extern struct progress_report_service_st {

View File

@@ -130,8 +130,10 @@ extern struct logger_service_st {
unsigned long long size_limit, unsigned long long size_limit,
unsigned int rotations); unsigned int rotations);
int (*close)(LOGGER_HANDLE *log); int (*close)(LOGGER_HANDLE *log);
int (*vprintf)(LOGGER_HANDLE *log, const char *fmt, va_list argptr); int (*vprintf)(LOGGER_HANDLE *log, const char *fmt, va_list argptr)
int (*printf)(LOGGER_HANDLE *log, const char *fmt, ...); __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 (*write)(LOGGER_HANDLE *log, const char *buffer, size_t size);
int (*rotate)(LOGGER_HANDLE *log); int (*rotate)(LOGGER_HANDLE *log);
} *logger_service; } *logger_service;
@@ -140,8 +142,10 @@ extern struct logger_service_st {
unsigned long long size_limit, unsigned long long size_limit,
unsigned int rotations); unsigned int rotations);
int logger_close(LOGGER_HANDLE *log); int logger_close(LOGGER_HANDLE *log);
int logger_vprintf(LOGGER_HANDLE *log, const char *fmt, va_list argptr); int logger_vprintf(LOGGER_HANDLE *log, const char *fmt, va_list argptr)
int logger_printf(LOGGER_HANDLE *log, const char *fmt, ...); __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_write(LOGGER_HANDLE *log, const char *buffer, size_t size);
int logger_rotate(LOGGER_HANDLE *log); int logger_rotate(LOGGER_HANDLE *log);
} }
@@ -195,20 +199,32 @@ unsigned int my_aes_ctx_size(enum my_aes_mode mode);
extern "C" { extern "C" {
extern struct my_print_error_service_st { extern struct my_print_error_service_st {
void (*my_error_func)(unsigned int nr, unsigned long MyFlags, ...); 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_printf_error_func)(unsigned int nr, const char *fmt,
void (*my_printv_error_func)(unsigned int error, const char *format, unsigned long MyFlags, va_list ap); 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; } *my_print_error_service;
extern void my_error(unsigned int nr, unsigned long MyFlags, ...); 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_printf_error(unsigned int my_err, const char *format,
extern void my_printv_error(unsigned int error, const char *format, unsigned long MyFlags,va_list ap); 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 "C" {
extern struct my_snprintf_service_st { extern struct my_snprintf_service_st {
size_t (*my_snprintf_type)(char*, size_t, const char*, ...); size_t (*my_snprintf_type)(char*, size_t, const char*, ...)
size_t (*my_vsnprintf_type)(char *, size_t, const char*, va_list); __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; } *my_snprintf_service;
size_t my_snprintf(char* to, size_t n, const char* fmt, ...); 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); __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 "C" {
extern struct progress_report_service_st { extern struct progress_report_service_st {

View File

@@ -130,8 +130,10 @@ extern struct logger_service_st {
unsigned long long size_limit, unsigned long long size_limit,
unsigned int rotations); unsigned int rotations);
int (*close)(LOGGER_HANDLE *log); int (*close)(LOGGER_HANDLE *log);
int (*vprintf)(LOGGER_HANDLE *log, const char *fmt, va_list argptr); int (*vprintf)(LOGGER_HANDLE *log, const char *fmt, va_list argptr)
int (*printf)(LOGGER_HANDLE *log, const char *fmt, ...); __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 (*write)(LOGGER_HANDLE *log, const char *buffer, size_t size);
int (*rotate)(LOGGER_HANDLE *log); int (*rotate)(LOGGER_HANDLE *log);
} *logger_service; } *logger_service;
@@ -140,8 +142,10 @@ extern struct logger_service_st {
unsigned long long size_limit, unsigned long long size_limit,
unsigned int rotations); unsigned int rotations);
int logger_close(LOGGER_HANDLE *log); int logger_close(LOGGER_HANDLE *log);
int logger_vprintf(LOGGER_HANDLE *log, const char *fmt, va_list argptr); int logger_vprintf(LOGGER_HANDLE *log, const char *fmt, va_list argptr)
int logger_printf(LOGGER_HANDLE *log, const char *fmt, ...); __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_write(LOGGER_HANDLE *log, const char *buffer, size_t size);
int logger_rotate(LOGGER_HANDLE *log); int logger_rotate(LOGGER_HANDLE *log);
} }
@@ -195,20 +199,32 @@ unsigned int my_aes_ctx_size(enum my_aes_mode mode);
extern "C" { extern "C" {
extern struct my_print_error_service_st { extern struct my_print_error_service_st {
void (*my_error_func)(unsigned int nr, unsigned long MyFlags, ...); 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_printf_error_func)(unsigned int nr, const char *fmt,
void (*my_printv_error_func)(unsigned int error, const char *format, unsigned long MyFlags, va_list ap); 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; } *my_print_error_service;
extern void my_error(unsigned int nr, unsigned long MyFlags, ...); 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_printf_error(unsigned int my_err, const char *format,
extern void my_printv_error(unsigned int error, const char *format, unsigned long MyFlags,va_list ap); 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 "C" {
extern struct my_snprintf_service_st { extern struct my_snprintf_service_st {
size_t (*my_snprintf_type)(char*, size_t, const char*, ...); size_t (*my_snprintf_type)(char*, size_t, const char*, ...)
size_t (*my_vsnprintf_type)(char *, size_t, const char*, va_list); __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; } *my_snprintf_service;
size_t my_snprintf(char* to, size_t n, const char* fmt, ...); 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); __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 "C" {
extern struct progress_report_service_st { extern struct progress_report_service_st {

View File

@@ -130,8 +130,10 @@ extern struct logger_service_st {
unsigned long long size_limit, unsigned long long size_limit,
unsigned int rotations); unsigned int rotations);
int (*close)(LOGGER_HANDLE *log); int (*close)(LOGGER_HANDLE *log);
int (*vprintf)(LOGGER_HANDLE *log, const char *fmt, va_list argptr); int (*vprintf)(LOGGER_HANDLE *log, const char *fmt, va_list argptr)
int (*printf)(LOGGER_HANDLE *log, const char *fmt, ...); __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 (*write)(LOGGER_HANDLE *log, const char *buffer, size_t size);
int (*rotate)(LOGGER_HANDLE *log); int (*rotate)(LOGGER_HANDLE *log);
} *logger_service; } *logger_service;
@@ -140,8 +142,10 @@ extern struct logger_service_st {
unsigned long long size_limit, unsigned long long size_limit,
unsigned int rotations); unsigned int rotations);
int logger_close(LOGGER_HANDLE *log); int logger_close(LOGGER_HANDLE *log);
int logger_vprintf(LOGGER_HANDLE *log, const char *fmt, va_list argptr); int logger_vprintf(LOGGER_HANDLE *log, const char *fmt, va_list argptr)
int logger_printf(LOGGER_HANDLE *log, const char *fmt, ...); __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_write(LOGGER_HANDLE *log, const char *buffer, size_t size);
int logger_rotate(LOGGER_HANDLE *log); int logger_rotate(LOGGER_HANDLE *log);
} }
@@ -195,20 +199,32 @@ unsigned int my_aes_ctx_size(enum my_aes_mode mode);
extern "C" { extern "C" {
extern struct my_print_error_service_st { extern struct my_print_error_service_st {
void (*my_error_func)(unsigned int nr, unsigned long MyFlags, ...); 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_printf_error_func)(unsigned int nr, const char *fmt,
void (*my_printv_error_func)(unsigned int error, const char *format, unsigned long MyFlags, va_list ap); 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; } *my_print_error_service;
extern void my_error(unsigned int nr, unsigned long MyFlags, ...); 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_printf_error(unsigned int my_err, const char *format,
extern void my_printv_error(unsigned int error, const char *format, unsigned long MyFlags,va_list ap); 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 "C" {
extern struct my_snprintf_service_st { extern struct my_snprintf_service_st {
size_t (*my_snprintf_type)(char*, size_t, const char*, ...); size_t (*my_snprintf_type)(char*, size_t, const char*, ...)
size_t (*my_vsnprintf_type)(char *, size_t, const char*, va_list); __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; } *my_snprintf_service;
size_t my_snprintf(char* to, size_t n, const char* fmt, ...); 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); __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 "C" {
extern struct progress_report_service_st { extern struct progress_report_service_st {

View File

@@ -130,8 +130,10 @@ extern struct logger_service_st {
unsigned long long size_limit, unsigned long long size_limit,
unsigned int rotations); unsigned int rotations);
int (*close)(LOGGER_HANDLE *log); int (*close)(LOGGER_HANDLE *log);
int (*vprintf)(LOGGER_HANDLE *log, const char *fmt, va_list argptr); int (*vprintf)(LOGGER_HANDLE *log, const char *fmt, va_list argptr)
int (*printf)(LOGGER_HANDLE *log, const char *fmt, ...); __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 (*write)(LOGGER_HANDLE *log, const char *buffer, size_t size);
int (*rotate)(LOGGER_HANDLE *log); int (*rotate)(LOGGER_HANDLE *log);
} *logger_service; } *logger_service;
@@ -140,8 +142,10 @@ extern struct logger_service_st {
unsigned long long size_limit, unsigned long long size_limit,
unsigned int rotations); unsigned int rotations);
int logger_close(LOGGER_HANDLE *log); int logger_close(LOGGER_HANDLE *log);
int logger_vprintf(LOGGER_HANDLE *log, const char *fmt, va_list argptr); int logger_vprintf(LOGGER_HANDLE *log, const char *fmt, va_list argptr)
int logger_printf(LOGGER_HANDLE *log, const char *fmt, ...); __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_write(LOGGER_HANDLE *log, const char *buffer, size_t size);
int logger_rotate(LOGGER_HANDLE *log); int logger_rotate(LOGGER_HANDLE *log);
} }
@@ -195,20 +199,32 @@ unsigned int my_aes_ctx_size(enum my_aes_mode mode);
extern "C" { extern "C" {
extern struct my_print_error_service_st { extern struct my_print_error_service_st {
void (*my_error_func)(unsigned int nr, unsigned long MyFlags, ...); 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_printf_error_func)(unsigned int nr, const char *fmt,
void (*my_printv_error_func)(unsigned int error, const char *format, unsigned long MyFlags, va_list ap); 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; } *my_print_error_service;
extern void my_error(unsigned int nr, unsigned long MyFlags, ...); 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_printf_error(unsigned int my_err, const char *format,
extern void my_printv_error(unsigned int error, const char *format, unsigned long MyFlags,va_list ap); 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 "C" {
extern struct my_snprintf_service_st { extern struct my_snprintf_service_st {
size_t (*my_snprintf_type)(char*, size_t, const char*, ...); size_t (*my_snprintf_type)(char*, size_t, const char*, ...)
size_t (*my_vsnprintf_type)(char *, size_t, const char*, va_list); __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; } *my_snprintf_service;
size_t my_snprintf(char* to, size_t n, const char* fmt, ...); 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); __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 "C" {
extern struct progress_report_service_st { extern struct progress_report_service_st {

View File

@@ -130,8 +130,10 @@ extern struct logger_service_st {
unsigned long long size_limit, unsigned long long size_limit,
unsigned int rotations); unsigned int rotations);
int (*close)(LOGGER_HANDLE *log); int (*close)(LOGGER_HANDLE *log);
int (*vprintf)(LOGGER_HANDLE *log, const char *fmt, va_list argptr); int (*vprintf)(LOGGER_HANDLE *log, const char *fmt, va_list argptr)
int (*printf)(LOGGER_HANDLE *log, const char *fmt, ...); __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 (*write)(LOGGER_HANDLE *log, const char *buffer, size_t size);
int (*rotate)(LOGGER_HANDLE *log); int (*rotate)(LOGGER_HANDLE *log);
} *logger_service; } *logger_service;
@@ -140,8 +142,10 @@ extern struct logger_service_st {
unsigned long long size_limit, unsigned long long size_limit,
unsigned int rotations); unsigned int rotations);
int logger_close(LOGGER_HANDLE *log); int logger_close(LOGGER_HANDLE *log);
int logger_vprintf(LOGGER_HANDLE *log, const char *fmt, va_list argptr); int logger_vprintf(LOGGER_HANDLE *log, const char *fmt, va_list argptr)
int logger_printf(LOGGER_HANDLE *log, const char *fmt, ...); __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_write(LOGGER_HANDLE *log, const char *buffer, size_t size);
int logger_rotate(LOGGER_HANDLE *log); int logger_rotate(LOGGER_HANDLE *log);
} }
@@ -195,20 +199,32 @@ unsigned int my_aes_ctx_size(enum my_aes_mode mode);
extern "C" { extern "C" {
extern struct my_print_error_service_st { extern struct my_print_error_service_st {
void (*my_error_func)(unsigned int nr, unsigned long MyFlags, ...); 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_printf_error_func)(unsigned int nr, const char *fmt,
void (*my_printv_error_func)(unsigned int error, const char *format, unsigned long MyFlags, va_list ap); 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; } *my_print_error_service;
extern void my_error(unsigned int nr, unsigned long MyFlags, ...); 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_printf_error(unsigned int my_err, const char *format,
extern void my_printv_error(unsigned int error, const char *format, unsigned long MyFlags,va_list ap); 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 "C" {
extern struct my_snprintf_service_st { extern struct my_snprintf_service_st {
size_t (*my_snprintf_type)(char*, size_t, const char*, ...); size_t (*my_snprintf_type)(char*, size_t, const char*, ...)
size_t (*my_vsnprintf_type)(char *, size_t, const char*, va_list); __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; } *my_snprintf_service;
size_t my_snprintf(char* to, size_t n, const char* fmt, ...); 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); __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 "C" {
extern struct progress_report_service_st { extern struct progress_report_service_st {

View File

@@ -130,8 +130,10 @@ extern struct logger_service_st {
unsigned long long size_limit, unsigned long long size_limit,
unsigned int rotations); unsigned int rotations);
int (*close)(LOGGER_HANDLE *log); int (*close)(LOGGER_HANDLE *log);
int (*vprintf)(LOGGER_HANDLE *log, const char *fmt, va_list argptr); int (*vprintf)(LOGGER_HANDLE *log, const char *fmt, va_list argptr)
int (*printf)(LOGGER_HANDLE *log, const char *fmt, ...); __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 (*write)(LOGGER_HANDLE *log, const char *buffer, size_t size);
int (*rotate)(LOGGER_HANDLE *log); int (*rotate)(LOGGER_HANDLE *log);
} *logger_service; } *logger_service;
@@ -140,8 +142,10 @@ extern struct logger_service_st {
unsigned long long size_limit, unsigned long long size_limit,
unsigned int rotations); unsigned int rotations);
int logger_close(LOGGER_HANDLE *log); int logger_close(LOGGER_HANDLE *log);
int logger_vprintf(LOGGER_HANDLE *log, const char *fmt, va_list argptr); int logger_vprintf(LOGGER_HANDLE *log, const char *fmt, va_list argptr)
int logger_printf(LOGGER_HANDLE *log, const char *fmt, ...); __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_write(LOGGER_HANDLE *log, const char *buffer, size_t size);
int logger_rotate(LOGGER_HANDLE *log); int logger_rotate(LOGGER_HANDLE *log);
} }
@@ -195,20 +199,32 @@ unsigned int my_aes_ctx_size(enum my_aes_mode mode);
extern "C" { extern "C" {
extern struct my_print_error_service_st { extern struct my_print_error_service_st {
void (*my_error_func)(unsigned int nr, unsigned long MyFlags, ...); 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_printf_error_func)(unsigned int nr, const char *fmt,
void (*my_printv_error_func)(unsigned int error, const char *format, unsigned long MyFlags, va_list ap); 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; } *my_print_error_service;
extern void my_error(unsigned int nr, unsigned long MyFlags, ...); 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_printf_error(unsigned int my_err, const char *format,
extern void my_printv_error(unsigned int error, const char *format, unsigned long MyFlags,va_list ap); 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 "C" {
extern struct my_snprintf_service_st { extern struct my_snprintf_service_st {
size_t (*my_snprintf_type)(char*, size_t, const char*, ...); size_t (*my_snprintf_type)(char*, size_t, const char*, ...)
size_t (*my_vsnprintf_type)(char *, size_t, const char*, va_list); __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; } *my_snprintf_service;
size_t my_snprintf(char* to, size_t n, const char* fmt, ...); 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); __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 "C" {
extern struct progress_report_service_st { extern struct progress_report_service_st {