From c8b62bcbb5e18b3ca643acedee7fda0c45460b62 Mon Sep 17 00:00:00 2001
From: "Luke T. Shumaker" <lukeshu@lukeshu.com>
Date: Wed, 4 Jun 2025 21:48:59 -0600
Subject: host: Avoid the "error" sym

---
 lib9p/tests/testclient-sess.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'lib9p/tests/testclient-sess.c')

diff --git a/lib9p/tests/testclient-sess.c b/lib9p/tests/testclient-sess.c
index 276f932..d466eea 100644
--- a/lib9p/tests/testclient-sess.c
+++ b/lib9p/tests/testclient-sess.c
@@ -6,13 +6,16 @@
 
 #include <arpa/inet.h>  /* for htons(), inet_addr() */
 #include <errno.h>
-#include <error.h>
 #include <netinet/in.h> /* for struct sockaddr{,_in} */
 #include <stdlib.h>     /* for atoi() */
 #include <sys/socket.h> /* for socket(), connect() */
 #include <sys/uio.h>    /* for writev() */
 #include <unistd.h>     /* for read() */
 
+#define error __error
+#include <error.h>
+#undef error
+
 #include <lib9p/core.h>
 #include <libmisc/assert.h>
 #include <libmisc/endian.h>
@@ -28,7 +31,7 @@ static void _send9p(int fd, struct lib9p_ctx *ctx, enum lib9p_msg_type typ, void
 		exp += buf.iov[i].iov_len;
 	ssize_t act = writev(fd, buf.iov, buf.iov_cnt);
 	if (act < 0)
-		error(1, errno, "writev");
+		__error(1, errno, "writev");
 	assert((size_t)act == exp);
 }
 
@@ -41,7 +44,7 @@ static void _recv9p(int fd) {
 	while (done < goal) {
 		ssize_t n = read(fd, &buf[done], goal-done);
 		if (n < 0)
-			error(1, errno, "read");
+			__error(1, errno, "read");
 		done += n;
 	}
 	goal = uint32le_decode(buf);
@@ -49,7 +52,7 @@ static void _recv9p(int fd) {
 	while (done < goal) {
 		ssize_t n = read(fd, &buf[done], goal-done);
 		if (n < 0)
-			error(1, errno, "read");
+			__error(1, errno, "read");
 		done += n;
 	}
 }
@@ -58,7 +61,7 @@ static void _recv9p(int fd) {
 
 int main(int argc, char *argv[]) {
 	if (argc != 2)
-		error(2, 0, "Usage: %s SERVER_PORT", argv[0]);
+		__error(2, 0, "Usage: %s SERVER_PORT", argv[0]);
 	uint16_t server_port = atoi(argv[1]);
 
 	union {
@@ -71,9 +74,9 @@ int main(int argc, char *argv[]) {
 
 	int fd = socket(AF_INET, SOCK_STREAM, 0);
 	if (fd < 0)
-		error(1, errno, "socket");
+		__error(1, errno, "socket");
 	if (connect(fd, &server_addr.gen, sizeof(server_addr)) < 0)
-		error(1, errno, "connect");
+		__error(1, errno, "connect");
 
 	struct lib9p_ctx ctx = {
 		.max_msg_size = 16*1024,
-- 
cgit v1.2.3-2-g168b