From: Karel Zak <kzak@redhat.com>
Date: Tue, 26 Jul 2011 12:41:28 +0000 (+0200)
Subject: Merge branch 'cramfs' of https://github.com/kerolasa/lelux-utiliteetit
X-Git-Tag: v2.20-rc1~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9ae45d23de3cb769fa272db44d9eb400d2da9534;p=thirdparty%2Futil-linux.git

Merge branch 'cramfs' of https://github.com/kerolasa/lelux-utiliteetit

* 'cramfs' of https://github.com/kerolasa/lelux-utiliteetit:
  include: move fsck return values to exitcodes.h
  include: move disk-utils/mkfs.h -> include/exitcodes.h
  mkfs.cramfs: coding style
  mkfs.cramfs: include-what-you-use header check
  mkfs.cramfs: error printing fixes
  mkfs.cramfs: convert spaces to tabs
  mkfs.cramfs: validate numeric user inputs
  mkfs.cramfs: few symbolic exit codes where missing
  md5: use symbolical digest length
  mkfs.cramfs: use program_invocation_short_name
  mkfs.cramfs: use xalloc.h
  fsck.cramfs: add missed strings to translation
  fsck.cramfs: coding style
  fsck.cramfs: use xalloc.h
  fsck.cramfs: retire die function
  cramfs.h: coding style
  cramfs: use stdint.h instead of u{8,16,32}
  cramfs_common: coding style

Conflicts:
	disk-utils/Makefile.am

Signed-off-by: Karel Zak <kzak@redhat.com>
---

9ae45d23de3cb769fa272db44d9eb400d2da9534
diff --cc disk-utils/Makefile.am
index 69072e1dfe,88a10a12b4..6ca19c6a8d
--- a/disk-utils/Makefile.am
+++ b/disk-utils/Makefile.am
@@@ -15,9 -15,8 +15,9 @@@ dist_man_MANS = isosize.8 mkfs.8 mkswap
  
  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 $(utils_common) $(top_srcdir)/lib/strutils.c
 +fsck_minix_SOURCES = fsck.minix.c minix_programs.h $(top_srcdir)/lib/ismounted.c
- mkfs_minix_SOURCES = mkfs.minix.c minix_programs.h mkfs.h $(utils_common) \
- 		    $(top_srcdir)/lib/strutils.c
++mkfs_minix_SOURCES = mkfs.minix.c minix_programs.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)