From b7a82c980fe7e0c1f9029b55be97422428d65d5a Mon Sep 17 00:00:00 2001
From: Mattias Andrée <maandree@kth.se>
Date: Wed, 11 Jan 2017 09:11:51 +0100
Subject: Clean up code
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mattias Andrée <maandree@kth.se>
---
 src/vu-flip.c | 71 +++++++++++------------------------------------------------
 1 file changed, 13 insertions(+), 58 deletions(-)

(limited to 'src/vu-flip.c')

diff --git a/src/vu-flip.c b/src/vu-flip.c
index d28d1cf..98e0d58 100644
--- a/src/vu-flip.c
+++ b/src/vu-flip.c
@@ -1,81 +1,36 @@
 /* See LICENSE file for copyright and license details. */
-#include "arg.h"
 #include "stream.h"
 #include "util.h"
 
-#include <fcntl.h>
-#include <inttypes.h>
 #include <string.h>
 #include <unistd.h>
 
-static void
-usage(void)
-{
-	eprintf("usage: %s\n", argv0);
-}
+USAGE("")
 
 int
 main(int argc, char *argv[])
 {
 	struct stream stream;
-	char *buf, *row;
-	size_t ptr, n, i, j, hm, row_size;
-	ssize_t r;
-
-	ARGBEGIN {
-	default:
-		usage();
-	} ARGEND;
+	size_t n, ptr, row_size;
+	char *buf;
 
-	if (argc)
-		usage();
+	ENOFLAGS(argc);
 
 	stream.file = "<stdin>";
 	stream.fd = STDIN_FILENO;
 	einit_stream(&stream);
 	fprint_stream_head(stdout, &stream);
-	fflush(stdout);
-	if (ferror(stdout))
-		eprintf("<stdout>:");
+	efflush(stdout, "<stdout>");
 
-	if (stream.width > SIZE_MAX / stream.pixel_size)
-		eprintf("<stdin>: video is too wide\n");
-	row_size = stream.width * stream.pixel_size;
-	if (!(row = malloc(row_size)))
-		eprintf("malloc:");
-	if (row_size > SIZE_MAX / stream.height)
-		eprintf("<stdin>: video frame is too large\n");
-	n = row_size * stream.height;
-	if (!(buf = malloc(n)))
-		eprintf("malloc:");
+	echeck_frame_size(stream.width, stream.height, stream.pixel_size, 0, stream.file);
+	n = stream.height * (row_size = stream.width * stream.pixel_size);
+	buf = emalloc(n);
 
-	hm = stream.height - 1;
-	memcpy(buf, stream.buf, ptr = stream.ptr);
-	for (;;) {
-		for (; ptr < n; ptr += (size_t)r) {
-			r = read(stream.fd, buf + ptr, n - ptr);
-			if (r < 0) {
-				eprintf("read %s:", stream.file);
-			} else if (r == 0) {
-				if (!ptr)
-					break;
-				eprintf("%s: incomplete frame", stream.file);
-			}
-		}
-		if (!ptr)
-			break;
-		for (i = 0; i < stream.height >> 1; i++) {
-			j = hm - i;
-			memcpy(row, buf + i * row_size, row_size);
-			memcpy(buf + i * row_size, buf + j * row_size, row_size);
-			memcpy(buf + j * row_size, row, row_size);
-		}
-		for (ptr = 0; ptr < n; ptr += (size_t)r) {
-			r = write(STDOUT_FILENO, buf + ptr, n - ptr);
-			if (r < 0)
-				eprintf("write <stdout>");
-		}
-	}
+	memcpy(buf, stream.buf, stream.ptr);
+	while (eread_frame(&stream, buf, n))
+		for (ptr = n; ptr;)
+			ewriteall(STDOUT_FILENO, buf + (ptr -= row_size), row_size, "<stdout>");
 
+	free(buf);
 	return 0;
 }
-- 
cgit v1.2.3-70-g09d2