host: Avoid the "error" sym

3 files changed, 25 insertions, 17 deletions

diff --git a/libhw_cr/host_alarmclock.c b/libhw_cr/host_alarmclock.c
index ac2093c..325f7e0 100644
--- a/libhw_cr/host_alarmclock.c
+++ b/libhw_cr/host_alarmclock.c
@@ -5,9 +5,12 @@
  */
 
 #include <errno.h>
-#include <error.h>
 #include <signal.h>
 
+#define error __error
+#include <error.h>
+#undef error
+
 #include <libcr/coroutine.h>
 #include <libmisc/assert.h>
 
@@ -27,7 +30,7 @@ static uint64_t hostclock_get_time_ns(struct hostclock *alarmclock) {
 	struct timespec ts;
 
 	if (clock_gettime(alarmclock->clock_id, &ts) != 0)
-		error(1, errno, "clock_gettime(%d)", (int)alarmclock->clock_id);
+		__error(1, errno, "clock_gettime(%d)", (int)alarmclock->clock_id);
 
 	return ns_from_host_ns_time(ts);
 }
@@ -52,7 +55,7 @@ static void hostclock_handle_sig_alarm(int LM_UNUSED(sig), siginfo_t *info, void
 			.it_interval = {},
 		};
 		if (timer_settime(alarmclock->timer_id, TIMER_ABSTIME, &alarmspec, NULL) != 0)
-			error(1, errno, "timer_settime");
+			__error(1, errno, "timer_settime");
 	}
 }
 
@@ -93,9 +96,9 @@ static bool hostclock_add_trigger(struct hostclock *alarmclock,
 			.sa_sigaction = hostclock_handle_sig_alarm,
 		};
 		if (sigaction(how_to_notify.sigev_signo, &action, NULL) != 0)
-			error(1, errno, "sigaction");
+			__error(1, errno, "sigaction");
 		if (timer_create(alarmclock->clock_id, &how_to_notify, &alarmclock->timer_id) != 0)
-			error(1, errno, "timer_create(%d)", (int)alarmclock->clock_id);
+			__error(1, errno, "timer_create(%d)", (int)alarmclock->clock_id);
 		alarmclock->initialized = true;
 	}
 	if (alarmclock->queue == trigger) {
@@ -104,7 +107,7 @@ static bool hostclock_add_trigger(struct hostclock *alarmclock,
 			.it_interval = {},
 		};
 		if (timer_settime(alarmclock->timer_id, TIMER_ABSTIME, &alarmspec, NULL) != 0)
-			error(1, errno, "timer_settime");
+			__error(1, errno, "timer_settime");
 	}
 	cr_restore_interrupts(saved);
 
diff --git a/libhw_cr/host_net.c b/libhw_cr/host_net.c
index c8d4472..6093792 100644
--- a/libhw_cr/host_net.c
+++ b/libhw_cr/host_net.c
@@ -7,7 +7,9 @@
 #define _GNU_SOURCE     /* for pthread_sigqueue(3gnu) */
 /* misc */
 #include <errno.h>      /* for errno, EAGAIN, EINVAL */
+#define error __error
 #include <error.h>      /* for error(3gnu) */
+#undef error
 #include <stdlib.h>     /* for abs(), shutdown(), SHUT_RD, SHUT_WR, SHUT_RDWR */
 #include <unistd.h>     /* for read(), write() */
 /* net */
@@ -63,7 +65,7 @@ static void hostnet_init(void) {
 	action.sa_flags = SA_SIGINFO;
 	action.sa_sigaction = hostnet_handle_sig_io;
 	if (sigaction(hostnet_sig_io, &action, NULL) < 0)
-		error(1, errno, "sigaction");
+		__error(1, errno, "sigaction");
 }
 
 #define WAKE_COROUTINE(args) do {                               \
@@ -136,15 +138,15 @@ void hostnet_tcp_listener_init(struct hostnet_tcp_listener *self, uint16_t port)
 	addr.in.sin_port = htons(port);
 	listenerfd = socket(AF_INET, SOCK_STREAM, 0);
 	if (listenerfd < 0)
-		error(1, errno, "socket");
+		__error(1, errno, "socket");
 	if (setsockopt(listenerfd, SOL_SOCKET, SO_REUSEADDR, &(int){1}, sizeof(int)) < 0)
-		error(1, errno, "setsockopt(fd=%d, SO_REUSEADDR=1)", listenerfd);
+		__error(1, errno, "setsockopt(fd=%d, SO_REUSEADDR=1)", listenerfd);
 	if (setsockopt(listenerfd, SOL_SOCKET, SO_REUSEPORT, &(int){1}, sizeof(int)) < 0)
-		error(1, errno, "setsockopt(fd=%d, SO_REUSEPORT=1)", listenerfd);
+		__error(1, errno, "setsockopt(fd=%d, SO_REUSEPORT=1)", listenerfd);
 	if (bind(listenerfd, &addr.gen, sizeof addr) < 0)
-		error(1, errno, "bind(fd=%d)", listenerfd);
+		__error(1, errno, "bind(fd=%d)", listenerfd);
 	if (listen(listenerfd, 0) < 0)
-		error(1, errno, "listen(fd=%d)", listenerfd);
+		__error(1, errno, "listen(fd=%d)", listenerfd);
 
 	self->fd = listenerfd;
 }
@@ -375,11 +377,11 @@ void hostnet_udp_conn_init(struct hostnet_udp_conn *self, uint16_t port) {
 	addr.in.sin_port = htons(port);
 	fd = socket(AF_INET, SOCK_DGRAM, 0);
 	if (fd < 0)
-		error(1, errno, "socket");
+		__error(1, errno, "socket");
 	if (setsockopt(fd, SOL_SOCKET, SO_BROADCAST, &(int){1}, sizeof(int)) < 0)
-		error(1, errno, "setsockopt(fd=%d, SO_BROADCAST=1)", fd);
+		__error(1, errno, "setsockopt(fd=%d, SO_BROADCAST=1)", fd);
 	if (bind(fd, &addr.gen, sizeof addr) < 0)
-		error(1, errno, "bind");
+		__error(1, errno, "bind");
 
 	self->fd = fd;
 	self->read_deadline_ns = 0;
diff --git a/libhw_cr/host_util.c b/libhw_cr/host_util.c
index 8cacd57..d0f01d7 100644
--- a/libhw_cr/host_util.c
+++ b/libhw_cr/host_util.c
@@ -4,9 +4,12 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-#include <error.h>  /* for error(3gnu) */
 #include <signal.h> /* for SIGRTMIN, SIGRTMAX */
 
+#define error __error
+#include <error.h>
+#undef error
+
 #include <libhw/generic/alarmclock.h> /* for {X}S_PER_S */
 
 #include "host_util.h"
@@ -18,7 +21,7 @@ int host_sigrt_alloc(void) {
 		next = SIGRTMIN;
 	int ret = next++;
 	if (ret > SIGRTMAX)
-		error(1, 0, "SIGRTMAX exceeded");
+		__error(1, 0, "SIGRTMAX exceeded");
 	return ret;
 }