Merge branch 'lukeshu/error'

1 files changed, 12 insertions, 9 deletions

diff --git a/lib9p/tests/testclient-sess.c b/lib9p/tests/testclient-sess.c
index 276f932..0cec6c6 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>
@@ -21,14 +24,14 @@
 
 static void _send9p(int fd, struct lib9p_ctx *ctx, enum lib9p_msg_type typ, void *body) {
 	struct lib9p_Tmsg_send_buf buf;
-	bool err = lib9p_Tmsg_marshal(ctx, typ, body, &buf);
-	assert(!err);
+	error err = lib9p_Tmsg_marshal(ctx, typ, body, &buf);
+	assert(ERROR_IS_NULL(err));
 	size_t exp = 0;
 	for (size_t i = 0; i < buf.iov_cnt; i++)
 		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,