From 3b455ee5df3b567d76cd1ca024fc01a028ef8855 Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Wed, 16 Feb 2022 21:09:15 +0000 Subject: [PATCH] dvd-sector-copy.c: Hoist `carefully_write' up near the system utilities. --- dvd-sector-copy.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/dvd-sector-copy.c b/dvd-sector-copy.c index b2fa881..b0cd78d 100644 --- a/dvd-sector-copy.c +++ b/dvd-sector-copy.c @@ -81,6 +81,23 @@ static void bail_syserr(int err, const char *fmt, ...) exit(2); } +static void carefully_write(int fd, const void *buf, size_t sz) +{ + const unsigned char *p = buf; + ssize_t n; + + if (fd < 0) return; + while (sz) { + n = write(fd, p, sz); + if (n < 0) { + if (errno == EINTR) continue; + bail_syserr(errno, "failed to write to output file"); + } + if (!n) bail("unexpected short write to output file"); + p += n; sz -= n; + } +} + #define DEFVEC(vtype, etype) \ typedef struct { etype *v; size_t n, sz; } vtype #define VEC_INIT { 0, 0, 0 } @@ -390,23 +407,6 @@ again: return (n); } -static void carefully_write(int fd, const void *buf, size_t sz) -{ - const unsigned char *p = buf; - ssize_t n; - - if (fd < 0) return; - while (sz) { - n = write(fd, p, sz); - if (n < 0) { - if (errno == EINTR) continue; - bail_syserr(errno, "failed to write to output file"); - } - if (!n) bail("unexpected short write to output file"); - p += n; sz -= n; - } -} - static void emit(int outfd, secaddr start, secaddr end) { #define BUFSECTORS 512 -- 2.11.0