diff options
| author | David Sterba <dsterba@suse.com> | 2017-03-27 14:14:20 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2017-03-31 14:17:48 +0200 |
| commit | 11b8ec4aac0e30215f4990cbc6accd55e0a16553 (patch) | |
| tree | 80aafa770bddc627fdd987204f2bb2752e75f7a8 /messages.h | |
| parent | 230092bc489e81452a4adff0c59aa3390bbba953 (diff) | |
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>
Diffstat (limited to 'messages.h')
| -rw-r--r-- | messages.h | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -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 |