diff --git a/disk-utils/fsck.minix.c b/disk-utils/fsck.minix.c index 139ab7ac8..5e56e832d 100644 --- a/disk-utils/fsck.minix.c +++ b/disk-utils/fsck.minix.c @@ -109,7 +109,7 @@ #include "pathnames.h" #include "bitops.h" #include "ismounted.h" -#include "writeall.h" +#include "all-io.h" #include "closestream.h" #define ROOT_INO 1 diff --git a/disk-utils/mkfs.minix.c b/disk-utils/mkfs.minix.c index 051cd5f68..c5baac125 100644 --- a/disk-utils/mkfs.minix.c +++ b/disk-utils/mkfs.minix.c @@ -84,7 +84,7 @@ #include "bitops.h" #include "exitcodes.h" #include "strutils.h" -#include "writeall.h" +#include "all-io.h" #include "closestream.h" #define MINIX_ROOT_INO 1 diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c index 43129a7d1..db465b7c2 100644 --- a/disk-utils/mkswap.c +++ b/disk-utils/mkswap.c @@ -54,7 +54,7 @@ #include "blkdev.h" #include "pathnames.h" #include "wholedisk.h" -#include "writeall.h" +#include "all-io.h" #include "xalloc.h" #include "c.h" #include "closestream.h" diff --git a/disk-utils/swaplabel.c b/disk-utils/swaplabel.c index 716db9e50..bf4ee71c2 100644 --- a/disk-utils/swaplabel.c +++ b/disk-utils/swaplabel.c @@ -27,7 +27,7 @@ #include "c.h" #include "closestream.h" -#include "writeall.h" +#include "all-io.h" #include "swapheader.h" #include "strutils.h" #include "nls.h" diff --git a/include/Makefile.am b/include/Makefile.am index f61cb0423..82164e416 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,6 +1,7 @@ include $(top_srcdir)/config/include-Makefile.am dist_noinst_HEADERS = \ + all-io.h \ at.h \ bitops.h \ blkdev.h \ @@ -40,6 +41,5 @@ dist_noinst_HEADERS = \ usleep.h \ wholedisk.h \ widechar.h \ - writeall.h \ xalloc.h \ xgetpass.h diff --git a/include/writeall.h b/include/all-io.h similarity index 89% rename from include/writeall.h rename to include/all-io.h index 6aa49272a..4d1ae1e53 100644 --- a/include/writeall.h +++ b/include/all-io.h @@ -1,5 +1,5 @@ -#ifndef UTIL_LINUX_WRITEALL_H -#define UTIL_LINUX_WRITEALL_H +#ifndef UTIL_LINUX_ALL_IO_H +#define UTIL_LINUX_ALL_IO_H #include #include @@ -44,4 +44,4 @@ static inline int fwrite_all(const void *ptr, size_t size, return 0; } -#endif /* UTIL_LINUX_WRITEALL_H */ +#endif /* UTIL_LINUX_ALL_IO_H */ diff --git a/lib/path.c b/lib/path.c index ad17fef0c..0d4d39135 100644 --- a/lib/path.c +++ b/lib/path.c @@ -27,7 +27,7 @@ #include #include -#include "writeall.h" +#include "all-io.h" #include "cpuset.h" #include "path.h" #include "nls.h" diff --git a/libblkid/src/probe.c b/libblkid/src/probe.c index 6bd69d39e..ce14526e2 100644 --- a/libblkid/src/probe.c +++ b/libblkid/src/probe.c @@ -109,7 +109,7 @@ #endif #include "blkidP.h" -#include "writeall.h" +#include "all-io.h" /* chains */ extern const struct blkid_chaindrv superblocks_drv; diff --git a/login-utils/login.c b/login-utils/login.c index 23b84a1d6..2b5c68d95 100644 --- a/login-utils/login.c +++ b/login-utils/login.c @@ -66,7 +66,7 @@ #include "strutils.h" #include "nls.h" #include "xalloc.h" -#include "writeall.h" +#include "all-io.h" #include "fileutils.h" #include "logindefs.h" diff --git a/misc-utils/uuidd.c b/misc-utils/uuidd.c index eb1ef02c6..65ee55ad0 100644 --- a/misc-utils/uuidd.c +++ b/misc-utils/uuidd.c @@ -33,7 +33,7 @@ extern int optind; #include "uuid.h" #include "uuidd.h" -#include "writeall.h" +#include "all-io.h" #include "c.h" #include "closestream.h" diff --git a/misc-utils/wipefs.c b/misc-utils/wipefs.c index a9d74f043..c751c3ac6 100644 --- a/misc-utils/wipefs.c +++ b/misc-utils/wipefs.c @@ -35,7 +35,7 @@ #include "nls.h" #include "xalloc.h" #include "strutils.h" -#include "writeall.h" +#include "all-io.h" #include "match.h" #include "c.h" #include "closestream.h" diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c index b47fede96..e47b08705 100644 --- a/sys-utils/dmesg.c +++ b/sys-utils/dmesg.c @@ -27,7 +27,7 @@ #include "strutils.h" #include "xalloc.h" #include "widechar.h" -#include "writeall.h" +#include "all-io.h" #include "bitops.h" #include "closestream.h" diff --git a/term-utils/agetty.c b/term-utils/agetty.c index bed4cde74..36e00eb44 100644 --- a/term-utils/agetty.c +++ b/term-utils/agetty.c @@ -33,7 +33,7 @@ #include #include "strutils.h" -#include "writeall.h" +#include "all-io.h" #include "nls.h" #include "pathnames.h" #include "c.h" diff --git a/text-utils/pg.c b/text-utils/pg.c index 2b5144252..0bd827981 100644 --- a/text-utils/pg.c +++ b/text-utils/pg.c @@ -62,7 +62,7 @@ #include "nls.h" #include "xalloc.h" #include "widechar.h" -#include "writeall.h" +#include "all-io.h" #include "closestream.h" #define READBUF LINE_MAX /* size of input buffer */