btrfs-progs: move message helpers implementation out of header

Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/Makefile b/Makefile
index e3bab95..5a30fbd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -95,7 +95,7 @@ objects = ctree.o disk-io.o kernel-lib/radix-tree.o extent-tree.o print-tree.o \
          qgroup.o raid56.o free-space-cache.o kernel-lib/list_sort.o props.o \
          ulist.o qgroup-verify.o backref.o string-table.o task-utils.o \
          inode.o file.o find-root.o free-space-tree.o help.o send-dump.o \
-         fsfeatures.o
+         fsfeatures.o messages.o
 cmds_objects = cmds-subvolume.o cmds-filesystem.o cmds-device.o cmds-scrub.o \
               cmds-inspect.o cmds-balance.o cmds-send.o cmds-receive.o \
               cmds-quota.o cmds-qgroup.o cmds-replace.o cmds-check.o \

diff --git a/messages.c b/messages.c
new file mode 100644 (file)
index 0000000..5c906d6
--- /dev/null
+++ b/messages.c
@@ -0,0 +1,77 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License v2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 021110-1307, USA.
+ */
+
+#include <stdio.h>
+#include <stdarg.h>
+#include "messages.h"
+
+__attribute__ ((format (printf, 1, 2)))
+void __warning(const char *fmt, ...)
+{
+       va_list args;
+
+       fputs("WARNING: ", stderr);
+       va_start(args, fmt);
+       vfprintf(stderr, fmt, args);
+       va_end(args);
+       fputc('\n', stderr);
+}
+
+__attribute__ ((format (printf, 1, 2)))
+void __error(const char *fmt, ...)
+{
+       va_list args;
+
+       fputs("ERROR: ", stderr);
+       va_start(args, fmt);
+       vfprintf(stderr, fmt, args);
+       va_end(args);
+       fputc('\n', stderr);
+}
+
+__attribute__ ((format (printf, 2, 3)))
+int __warning_on(int condition, const char *fmt, ...)
+{
+       va_list args;
+
+       if (!condition)
+               return 0;
+
+       fputs("WARNING: ", stderr);
+       va_start(args, fmt);
+       vfprintf(stderr, fmt, args);
+       va_end(args);
+       fputc('\n', stderr);
+
+       return 1;
+}
+
+__attribute__ ((format (printf, 2, 3)))
+int __error_on(int condition, const char *fmt, ...)
+{
+       va_list args;
+
+       if (!condition)
+               return 0;
+
+       fputs("ERROR: ", stderr);
+       va_start(args, fmt);
+       vfprintf(stderr, fmt, args);
+       va_end(args);
+       fputc('\n', stderr);
+
+       return 1;
+}

diff --git a/messages.h b/messages.h
index fa00ff4..47c6489 100644 (file)
--- a/messages.h
+++ b/messages.h
@@ -71,61 +71,15 @@
        } while (0)
 
 __attribute__ ((format (printf, 1, 2)))
-static inline void __warning(const char *fmt, ...)
-{
-       va_list args;
-
-       fputs("WARNING: ", stderr);
-       va_start(args, fmt);
-       vfprintf(stderr, fmt, args);
-       va_end(args);
-       fputc('\n', stderr);
-}
+void __warning(const char *fmt, ...);
 
 __attribute__ ((format (printf, 1, 2)))
-static inline void __error(const char *fmt, ...)
-{
-       va_list args;
-
-       fputs("ERROR: ", stderr);
-       va_start(args, fmt);
-       vfprintf(stderr, fmt, args);
-       va_end(args);
-       fputc('\n', stderr);
-}
+void __error(const char *fmt, ...);
 
 __attribute__ ((format (printf, 2, 3)))
-static inline int __warning_on(int condition, const char *fmt, ...)
-{
-       va_list args;
-
-       if (!condition)
-               return 0;
-
-       fputs("WARNING: ", stderr);
-       va_start(args, fmt);
-       vfprintf(stderr, fmt, args);
-       va_end(args);
-       fputc('\n', stderr);
-
-       return 1;
-}
+int __warning_on(int condition, const char *fmt, ...);
 
 __attribute__ ((format (printf, 2, 3)))
-static inline int __error_on(int condition, const char *fmt, ...)
-{
-       va_list args;
-
-       if (!condition)
-               return 0;
-
-       fputs("ERROR: ", stderr);
-       va_start(args, fmt);
-       vfprintf(stderr, fmt, args);
-       va_end(args);
-       fputc('\n', stderr);
-
-       return 1;
-}
+int __error_on(int condition, const char *fmt, ...);
 
 #endif