]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
Merge branch 'close_stream' of git://github.com/kerolasa/lelux-utiliteetit
authorKarel Zak <kzak@redhat.com>
Wed, 11 Apr 2012 10:37:59 +0000 (12:37 +0200)
committerKarel Zak <kzak@redhat.com>
Wed, 11 Apr 2012 10:37:59 +0000 (12:37 +0200)
* 'close_stream' of git://github.com/kerolasa/lelux-utiliteetit:
  disk-utils: verify writing to streams was successful
  fdisk: verify writing to streams was successful
  getopt: verify writing to streams was successful
  hwclock: verify writing to streams was successful
  login-utils: verify writing to streams was successful
  misc-utils: verify writing to streams was successful
  mount: verify writing to streams was successful
  partx: verify writing to streams was successful
  schedutils: verify writing to streams was successful
  sys-utils: verify writing to streams was successful
  term-utils: verify writing to streams was successful
  text-utils: verify writing to streams was successful
  include: add stream error checking facility

Conflicts:
fdisk/fdisk.c

1  2 
disk-utils/fsck.c
fdisk/fdisk.c
fdisk/sfdisk.c
misc-utils/lslocks.c

Simple merge
diff --cc fdisk/fdisk.c
index 7c1486184ab856992b664008968da6f9095ac712,4fc347b1fedaad37bc4576c67557eb3050c2bcb2..cf64fa77685972559caee6abfaf42fe08243729a
@@@ -33,7 -33,7 +33,8 @@@
  #include "pathnames.h"
  #include "canonicalize.h"
  #include "strutils.h"
 +#include "randutils.h"
+ #include "closestream.h"
  
  #include "fdisksunlabel.h"
  #include "fdisksgilabel.h"
diff --cc fdisk/sfdisk.c
Simple merge
Simple merge