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>

diff --git a/messages.c b/messages.c
index 5c906d6..7600091 100644 (file)
--- a/messages.c
+++ b/messages.c
@@ -19,7 +19,7 @@
 #include "messages.h"
 
 __attribute__ ((format (printf, 1, 2)))
-void __warning(const char *fmt, ...)
+void __btrfs_warning(const char *fmt, ...)
 {
        va_list args;
 
@@ -31,7 +31,7 @@ void __warning(const char *fmt, ...)
 }
 
 __attribute__ ((format (printf, 1, 2)))
-void __error(const char *fmt, ...)
+void __btrfs_error(const char *fmt, ...)
 {
        va_list args;
 
@@ -43,7 +43,7 @@ void __error(const char *fmt, ...)
 }
 
 __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;
 
@@ -60,7 +60,7 @@ int __warning_on(int condition, const char *fmt, ...)
 }
 
 __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;
 

diff --git a/messages.h b/messages.h
index 47c6489..a308b4b 100644 (file)
--- a/messages.h
+++ b/messages.h
@@ -39,7 +39,7 @@
        do {                                                            \
                PRINT_TRACE_ON_ERROR;                                   \
                PRINT_VERBOSE_ERROR;                                    \
-               __error((fmt), ##__VA_ARGS__);                          \
+               __btrfs_error((fmt), ##__VA_ARGS__);                    \
                DO_ABORT_ON_ERROR;                                      \
        } while (0)
 
@@ -49,7 +49,7 @@
                        PRINT_TRACE_ON_ERROR;                           \
                if ((cond))                                             \
                        PRINT_VERBOSE_ERROR;                            \
-               __error_on((cond), (fmt), ##__VA_ARGS__);               \
+               __btrfs_error_on((cond), (fmt), ##__VA_ARGS__);         \
                if ((cond))                                             \
                        DO_ABORT_ON_ERROR;                              \
        } while (0)
@@ -58,7 +58,7 @@
        do {                                                            \
                PRINT_TRACE_ON_ERROR;                                   \
                PRINT_VERBOSE_ERROR;                                    \
-               __warning((fmt), ##__VA_ARGS__);                        \
+               __btrfs_warning((fmt), ##__VA_ARGS__);                  \
        } while (0)
 
 #define warning_on(cond, fmt, ...)                                     \
@@ -67,19 +67,19 @@
                        PRINT_TRACE_ON_ERROR;                           \
                if ((cond))                                             \
                        PRINT_VERBOSE_ERROR;                            \
-               __warning_on((cond), (fmt), ##__VA_ARGS__);             \
+               __btrfs_warning_on((cond), (fmt), ##__VA_ARGS__);       \
        } while (0)
 
 __attribute__ ((format (printf, 1, 2)))
-void __warning(const char *fmt, ...);
+void __btrfs_warning(const char *fmt, ...);
 
 __attribute__ ((format (printf, 1, 2)))
-void __error(const char *fmt, ...);
+void __btrfs_error(const char *fmt, ...);
 
 __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)))
-int __error_on(int condition, const char *fmt, ...);
+int __btrfs_error_on(int condition, const char *fmt, ...);
 
 #endif