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-from-image.c | 26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

(limited to 'src/vu-from-image.c')

diff --git a/src/vu-from-image.c b/src/vu-from-image.c
index 1a5ec0c..12209e2 100644
--- a/src/vu-from-image.c
+++ b/src/vu-from-image.c
@@ -1,5 +1,4 @@
 /* See LICENSE file for copyright and license details. */
-#include "arg.h"
 #include "util.h"
 
 #include <arpa/inet.h>
@@ -8,6 +7,8 @@
 #include <string.h>
 #include <unistd.h>
 
+USAGE("[-h] [-f | -p]")
+
 static double
 get_value(void *buffer)
 {
@@ -25,21 +26,15 @@ get_value(void *buffer)
 	return ret;
 }
 
-static void
-usage(void)
-{
-	eprintf("usage: [-h] [-f | -p] %s\n", argv0);
-}
-
 int
 main(int argc, char *argv[])
 {
 	int pipe_rw[2];
 	int i, old_fd;
-	pid_t pid;
+	pid_t pid = 0;
 	int status;
 	char buf[8096];
-	size_t ptr, ptw, n;
+	size_t ptr, n;
 	char *p;
 	ssize_t r;
 	double red, green, blue, pixel[4];
@@ -164,10 +159,8 @@ header_done:
 		eprintf("%s\n", conv_fail_msg);
 
 	if (!headless) {
-		printf("%s %s xyza\n%cuivf", width, height, 0);
-		fflush(stdout);
-		if (ferror(stdout))
-			eprintf("<stdout>:");
+		printf("1 %s %s xyza\n%cuivf", width, height, 0);
+		efflush(stdout, "<stdout>");
 	}
 
 	for (;;) {
@@ -178,12 +171,7 @@ header_done:
 			pixel[3] = get_value(buf + ptr + 12);
 
 			srgb_to_ciexyz(red, green, blue, pixel + 0, pixel + 1, pixel + 2);
-
-			for (ptw = 0; ptw < sizeof(pixel); ptw += (size_t)r) {
-				r = write(STDOUT_FILENO, (char *)pixel + ptw, sizeof(pixel) - ptw);
-				if (r < 0)
-					eprintf("write <stdout>:");
-			}
+			ewriteall(STDOUT_FILENO, pixel, sizeof(pixel), "<stdout>");
 		}
 		r = read(pipe_rw[0], buf, sizeof(buf));
 		if (r < 0)
-- 
cgit v1.2.3-70-g09d2