citrun

commit 4069f9d5cb573e208ddaf9cdca19b0f0afdc9a10
parent d83de38b08d2ea36a06c9357c3d714d519dadbf1
Author: Kyle Milz <kyle@0x30.net>
Date:   Tue, 21 Jun 2016 19:19:56 -0600

lib: move xread/xwrite to top of file

Diffstat:
M
lib/runtime.c
 | 
88
+++++++++++++++++++++++++++++++++++++++----------------------------------------

1 file changed, 43 insertions(+), 45 deletions(-)
diff --git a/lib/runtime.c b/lib/runtime.c
@@ -24,8 +24,49 @@ int needs_to_link_against_libcitrun;
 
 static void send_metadata(int);
 static void send_execution_data(int);
-static int xread(int d, const void *buf, size_t bytes_total);
-static int xwrite(int d, const void *buf, size_t bytes_total);
+
+static int
+xread(int d, const void *buf, size_t bytes_total)
+{
+	ssize_t bytes_left = bytes_total;
+	size_t bytes_read = 0;
+	ssize_t n;
+
+	while (bytes_left > 0) {
+		n = read(d, (uint8_t *)buf + bytes_read, bytes_left);
+
+		if (n == 0)
+			/* Disconnect */
+			errx(1, "read 0 bytes on socket");
+		if (n < 0)
+			err(1, "read()");
+
+		bytes_read += n;
+		bytes_left -= n;
+	}
+
+	return bytes_read;
+}
+
+static int
+xwrite(int d, const void *buf, size_t bytes_total)
+{
+	int bytes_left = bytes_total;
+	int bytes_wrote = 0;
+	ssize_t n;
+
+	while (bytes_left > 0) {
+		n = write(d, (uint8_t *)buf + bytes_wrote, bytes_left);
+
+		if (n < 0)
+			err(1, "write()");
+
+		bytes_wrote += n;
+		bytes_left -= n;
+	}
+
+	return bytes_wrote;
+}
 
 /* Sets up connection to the server socket and drops into an io loop. */
 static void *
@@ -125,49 +166,6 @@ send_execution_data(int fd)
 	}
 }
 
-static int
-xwrite(int d, const void *buf, size_t bytes_total)
-{
-	int bytes_left = bytes_total;
-	int bytes_wrote = 0;
-	ssize_t n;
-
-	while (bytes_left > 0) {
-		n = write(d, (uint8_t *)buf + bytes_wrote, bytes_left);
-
-		if (n < 0)
-			err(1, "write()");
-
-		bytes_wrote += n;
-		bytes_left -= n;
-	}
-
-	return bytes_wrote;
-}
-
-static int
-xread(int d, const void *buf, size_t bytes_total)
-{
-	ssize_t bytes_left = bytes_total;
-	size_t bytes_read = 0;
-	ssize_t n;
-
-	while (bytes_left > 0) {
-		n = read(d, (uint8_t *)buf + bytes_read, bytes_left);
-
-		if (n == 0)
-			/* Disconnect */
-			errx(1, "read 0 bytes on socket");
-		if (n < 0)
-			err(1, "read()");
-
-		bytes_read += n;
-		bytes_left -= n;
-	}
-
-	return bytes_read;
-}
-
 /* Grab an execution context and start up the control thread.  */
 __attribute__((constructor))
 static void runtime_init()