ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2025-10-10 14:32:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx: add mdbx_printf_args() macro.

Browse Source 
Change-Id: I7fca72f8cc912d8644ecf149b755c78fb3cc7e23
This commit is contained in:
Leonid Yuriev
2020-09-10 15:35:43 +03:00
parent 369612a9b2
commit 58bcfb006e
7 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core.c
View File

@@ -581,7 +581,7 @@ number_of_ovpages(const MDBX_env *env, size_t bytes) {
return bytes2pgno(env, PAGEHDRSZ - 1 + bytes) + 1;
}
__cold static int __printf_args(2, 3)
__cold static int mdbx_printf_args(2, 3)
bad_page(const MDBX_page *mp, const char *fmt, ...) {
if (mdbx_log_enabled(MDBX_LOG_ERROR)) {
static const MDBX_page *prev;

9
src/defs.h
View File

@@ -259,15 +259,6 @@
# endif
#endif /* unlikely */
#ifndef __printf_args
# if defined(__GNUC__) || __has_attribute(__format__)
# define __printf_args(format_index, first_arg) \
__attribute__((__format__(__printf__, format_index, first_arg)))
# else
# define __printf_args(format_index, first_arg)
# endif
#endif /* __printf_args */
#ifndef __anonymous_struct_extension__
# if defined(__GNUC__)
# define __anonymous_struct_extension__ __extension__

4
src/internals.h
View File

@@ -1037,9 +1037,9 @@ extern uint8_t mdbx_runtime_flags;
extern uint8_t mdbx_loglevel;
extern MDBX_debug_func *mdbx_debug_logger;
MDBX_INTERNAL_FUNC void __printf_args(4, 5)
MDBX_INTERNAL_FUNC void mdbx_printf_args(4, 5)
mdbx_debug_log(int level, const char *function, int line, const char *fmt,
...) __printf_args(4, 5);
...) mdbx_printf_args(4, 5);
MDBX_INTERNAL_FUNC void mdbx_debug_log_va(int level, const char *function,
int line, const char *fmt,
va_list args);

6
src/mdbx_chk.c
View File

@@ -106,7 +106,7 @@ struct problem {
struct problem *problems_list;
uint64_t total_problems;
static void __printf_args(1, 2) print(const char *msg, ...) {
static void mdbx_printf_args(1, 2) print(const char *msg, ...) {
if (!quiet) {
va_list args;
@@ -145,7 +145,7 @@ static void va_log(MDBX_log_level_t level, const char *msg, va_list args) {
}
}
static void __printf_args(1, 2) error(const char *msg, ...) {
static void mdbx_printf_args(1, 2) error(const char *msg, ...) {
va_list args;
va_start(args, msg);
va_log(MDBX_LOG_ERROR, msg, args);
@@ -216,7 +216,7 @@ static walk_dbi_t *pagemap_lookup_dbi(const char *dbi_name, bool silent) {
return last = dbi;
}
static void __printf_args(4, 5)
static void mdbx_printf_args(4, 5)
problem_add(const char *object, uint64_t entry_number, const char *msg,
const char *extra, ...) {

2
src/osal.h
View File

@@ -487,7 +487,7 @@ static __maybe_unused __inline void mdbx_memory_barrier(void) {
#define mdbx_asprintf asprintf
#define mdbx_vasprintf vasprintf
#else
MDBX_INTERNAL_FUNC __printf_args(2, 3) int __maybe_unused
MDBX_INTERNAL_FUNC mdbx_printf_args(2, 3) int __maybe_unused
mdbx_asprintf(char **strp, const char *fmt, ...);
MDBX_INTERNAL_FUNC int mdbx_vasprintf(char **strp, const char *fmt, va_list ap);
#endif