From: Sami Kerola <kerolasa@iki.fi>
Date: Thu, 21 Jul 2011 22:22:14 +0000 (+0200)
Subject: include: move disk-utils/mkfs.h -> include/exitcodes.h
X-Git-Tag: v2.20-rc1~27^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b8f040cdd4d94e524261fc0fb72aff7bc55b177b;p=thirdparty%2Futil-linux.git

include: move disk-utils/mkfs.h -> include/exitcodes.h

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---

diff --git a/disk-utils/Makefile.am b/disk-utils/Makefile.am
index 4f26b905fe..88a10a12b4 100644
--- a/disk-utils/Makefile.am
+++ b/disk-utils/Makefile.am
@@ -16,7 +16,7 @@ dist_man_MANS = isosize.8 mkfs.8 mkswap.8 \
 sbin_PROGRAMS = mkfs mkswap fsck.minix mkfs.minix mkfs.bfs
 
 fsck_minix_SOURCES = fsck.minix.c minix.h $(top_srcdir)/lib/ismounted.c
-mkfs_minix_SOURCES = mkfs.minix.c minix.h mkfs.h $(utils_common) $(top_srcdir)/lib/strutils.c
+mkfs_minix_SOURCES = mkfs.minix.c minix.h $(utils_common) $(top_srcdir)/lib/strutils.c
 mkfs_bfs_SOURCES = mkfs.bfs.c $(utils_common) $(top_srcdir)/lib/strutils.c
 
 swaplabel_SOURCES = swaplabel.c $(utils_common)
@@ -64,7 +64,7 @@ if BUILD_CRAMFS
 cramfs_common = $(utils_common) cramfs.h cramfs_common.c
 sbin_PROGRAMS += fsck.cramfs mkfs.cramfs
 fsck_cramfs_SOURCES = fsck.cramfs.c $(cramfs_common)
-mkfs_cramfs_SOURCES = mkfs.cramfs.c mkfs.h $(cramfs_common) $(top_srcdir)/lib/md5.c $(top_srcdir)/lib/strutils.c
+mkfs_cramfs_SOURCES = mkfs.cramfs.c $(cramfs_common) $(top_srcdir)/lib/md5.c $(top_srcdir)/lib/strutils.c
 fsck_cramfs_LDADD = -lz
 mkfs_cramfs_LDADD = -lz
 endif
diff --git a/disk-utils/mkfs.cramfs.c b/disk-utils/mkfs.cramfs.c
index a928c43e2f..9bb9153d89 100644
--- a/disk-utils/mkfs.cramfs.c
+++ b/disk-utils/mkfs.cramfs.c
@@ -42,7 +42,7 @@
 #include "cramfs.h"
 #include "md5.h"
 #include "nls.h"
-#include "mkfs.h"
+#include "exitcodes.h"
 #include "strutils.h"
 #define XALLOC_EXIT_CODE MKFS_ERROR
 #include "xalloc.h"
diff --git a/disk-utils/mkfs.h b/disk-utils/mkfs.h
deleted file mode 100644
index 35b88d1973..0000000000
--- a/disk-utils/mkfs.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef __MKFS_H__
-#define __MKFS_H__
-
-/* Exit codes used by mkfs-type programs */
-#define MKFS_OK          0     /* No errors */
-#define MKFS_ERROR       8     /* Operational error */
-#define MKFS_USAGE       16    /* Usage or syntax error */
-
-#endif
diff --git a/disk-utils/mkfs.minix.c b/disk-utils/mkfs.minix.c
index 06d087e262..1872c0fb4f 100644
--- a/disk-utils/mkfs.minix.c
+++ b/disk-utils/mkfs.minix.c
@@ -82,7 +82,7 @@
 #include "nls.h"
 #include "pathnames.h"
 #include "bitops.h"
-#include "mkfs.h"
+#include "exitcodes.h"
 #include "strutils.h"
 
 #define MINIX_ROOT_INO 1
diff --git a/include/Makefile.am b/include/Makefile.am
index b6d9bb11cd..bfa0a5de58 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -10,6 +10,7 @@ dist_noinst_HEADERS = \
 	cpuset.h \
 	crc32.h \
 	env.h \
+	exitcodes.h \
 	fsprobe.h \
 	ismounted.h \
 	linux_reboot.h \
diff --git a/include/exitcodes.h b/include/exitcodes.h
new file mode 100644
index 0000000000..1c5240a763
--- /dev/null
+++ b/include/exitcodes.h
@@ -0,0 +1,9 @@
+#ifndef UTIL_LINUX_EXITCODES_H
+#define UTIL_LINUX_EXITCODES_H
+
+/* Exit codes used by mkfs-type programs */
+#define MKFS_OK		0	/* No errors */
+#define MKFS_ERROR	8	/* Operational error */
+#define MKFS_USAGE	16	/* Usage or syntax error */
+
+#endif	/* UTIL_LINUX_EXITCODES_H */