RepoMirrors
/
btrfs-progs
mirror of https://github.com/kdave/btrfs-progs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: add prefix to message helpers 

The implementation of message helpers use very generic names so we
should at least use a prefix, as they're going to be usied from within
the library. The build fix will follow.

Reported-by: Mike Gilbert <floppym@gentoo.org>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2017-03-27 14:14:20 +02:00
parent 230092bc48
commit 11b8ec4aac
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
messages.c
View File

@ -19,7 +19,7 @@
#include "messages.h" #include "messages.h"
__attribute__ ((format (printf, 1, 2))) __attribute__ ((format (printf, 1, 2)))
void __warning(const char *fmt, ...) void __btrfs_warning(const char *fmt, ...)
{ {
va_list args; va_list args;
@ -31,7 +31,7 @@ void __warning(const char *fmt, ...)
} }
__attribute__ ((format (printf, 1, 2))) __attribute__ ((format (printf, 1, 2)))
void __error(const char *fmt, ...) void __btrfs_error(const char *fmt, ...)
{ {
va_list args; va_list args;
@ -43,7 +43,7 @@ void __error(const char *fmt, ...)
} }
__attribute__ ((format (printf, 2, 3))) __attribute__ ((format (printf, 2, 3)))
int __warning_on(int condition, const char *fmt, ...) int __btrfs_warning_on(int condition, const char *fmt, ...)
{ {
va_list args; va_list args;
@ -60,7 +60,7 @@ int __warning_on(int condition, const char *fmt, ...)
} }
__attribute__ ((format (printf, 2, 3))) __attribute__ ((format (printf, 2, 3)))
int __error_on(int condition, const char *fmt, ...) int __btrfs_error_on(int condition, const char *fmt, ...)
{ {
va_list args; va_list args;

16
messages.h
View File

@ -39,7 +39,7 @@
do { \ do { \
PRINT_TRACE_ON_ERROR; \ PRINT_TRACE_ON_ERROR; \
PRINT_VERBOSE_ERROR; \ PRINT_VERBOSE_ERROR; \
__error((fmt), ##__VA_ARGS__); \ __btrfs_error((fmt), ##__VA_ARGS__); \
DO_ABORT_ON_ERROR; \ DO_ABORT_ON_ERROR; \
} while (0) } while (0)
@ -49,7 +49,7 @@
PRINT_TRACE_ON_ERROR; \ PRINT_TRACE_ON_ERROR; \
if ((cond)) \ if ((cond)) \
PRINT_VERBOSE_ERROR; \ PRINT_VERBOSE_ERROR; \
__error_on((cond), (fmt), ##__VA_ARGS__); \ __btrfs_error_on((cond), (fmt), ##__VA_ARGS__); \
if ((cond)) \ if ((cond)) \
DO_ABORT_ON_ERROR; \ DO_ABORT_ON_ERROR; \
} while (0) } while (0)
@ -58,7 +58,7 @@
do { \ do { \
PRINT_TRACE_ON_ERROR; \ PRINT_TRACE_ON_ERROR; \
PRINT_VERBOSE_ERROR; \ PRINT_VERBOSE_ERROR; \
__warning((fmt), ##__VA_ARGS__); \ __btrfs_warning((fmt), ##__VA_ARGS__); \
} while (0) } while (0)
#define warning_on(cond, fmt, ...) \ #define warning_on(cond, fmt, ...) \
@ -67,19 +67,19 @@
PRINT_TRACE_ON_ERROR; \ PRINT_TRACE_ON_ERROR; \
if ((cond)) \ if ((cond)) \
PRINT_VERBOSE_ERROR; \ PRINT_VERBOSE_ERROR; \
__warning_on((cond), (fmt), ##__VA_ARGS__); \ __btrfs_warning_on((cond), (fmt), ##__VA_ARGS__); \
} while (0) } while (0)
__attribute__ ((format (printf, 1, 2))) __attribute__ ((format (printf, 1, 2)))
void __warning(const char *fmt, ...); void __btrfs_warning(const char *fmt, ...);
__attribute__ ((format (printf, 1, 2))) __attribute__ ((format (printf, 1, 2)))
void __error(const char *fmt, ...); void __btrfs_error(const char *fmt, ...);
__attribute__ ((format (printf, 2, 3))) __attribute__ ((format (printf, 2, 3)))
int __warning_on(int condition, const char *fmt, ...); int __btrfs_warning_on(int condition, const char *fmt, ...);
__attribute__ ((format (printf, 2, 3))) __attribute__ ((format (printf, 2, 3)))
int __error_on(int condition, const char *fmt, ...); int __btrfs_error_on(int condition, const char *fmt, ...);
#endif #endif