commit 5c359cc6ab8a0d40c86556ea37378c4a73d8200b
author Andrew Jeffery <andrew@aj.id.au> Tue Apr 18 22:50:07 2023 +0930
committer Andrew Jeffery <andrew@aj.id.au> Fri Apr 21 09:18:14 2023 +0930
tree 9f8eef558be2234bc56678150436805166f58689
parent fd883a881dfc21443cd5c5f1a32002bbf53040f8

obmc-console: Fix bugprone-narrowing-conversions

For example:

```
/mnt/host/andrew/home/andrew/src/openbmc/obmc-console/build/../console-server.c:769:9: error: narrowing conversion from 'ssize_t' (aka 'long') to signed type 'int' is implementation-defined [bugprone-narrowing-conversions,-warnings-as-errors]
                        rc = read(console->tty_fd, buf, sizeof(buf));
                             ^
```

Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Change-Id: I67c158b411f1533ca3b5a62803116e95907e8c5b

console-server.c

diff --git a/console-server.c b/console-server.c
index 32e164c..02219cf 100644
--- a/console-server.c
+++ b/console-server.c
@@ -56,10 +56,10 @@
 	struct ringbuffer *rb;
 
 	struct handler **handlers;
-	int n_handlers;
+	long n_handlers;
 
 	struct poller **pollers;
-	int n_pollers;
+	long n_pollers;
 
 	struct pollfd *pollfds;
 	struct sd_bus *bus;
@@ -461,7 +461,7 @@
 	console->n_handlers = &__stop_handlers - &__start_handlers;
 	console->handlers = &__start_handlers;
 
-	printf("%d handler%s\n", console->n_handlers,
+	printf("%ld handler%s\n", console->n_handlers,
 	       console->n_handlers == 1 ? "" : "s");
 
 	for (i = 0; i < console->n_handlers; i++) {
@@ -524,7 +524,7 @@
 				       int events, void *data)
 {
 	struct poller *poller;
-	int n;
+	long n;
 
 	poller = malloc(sizeof(*poller));
 	poller->remove = false;
@@ -552,7 +552,7 @@
 	       sizeof(*console->pollfds) * MAX_INTERNAL_POLLFD);
 
 	console->pollfds[n].fd = fd;
-	console->pollfds[n].events = events;
+	console->pollfds[n].events = (short)(events & 0x7fff);
 
 	return poller;
 }
@@ -601,7 +601,7 @@
 		if (console->pollers[i] == poller)
 			break;
 
-	console->pollfds[i].events = events;
+	console->pollfds[i].events = (short)(events & 0x7fff);
 }
 
 void console_poller_set_timeout(struct console *console __attribute__((unused)),
@@ -617,7 +617,7 @@
 	timeradd(&now, tv, &poller->timeout);
 }
 
-static int get_poll_timeout(struct console *console, struct timeval *cur_time)
+static long get_poll_timeout(struct console *console, struct timeval *cur_time)
 {
 	struct timeval *earliest, interval;
 	struct poller *poller;
@@ -729,11 +729,10 @@
 
 int run_console(struct console *console)
 {
-	sighandler_t sighandler_save;
+	sighandler_t sighandler_save = signal(SIGINT, sighandler);
 	struct timeval tv;
-	int rc, timeout;
-
-	sighandler_save = signal(SIGINT, sighandler);
+	long timeout;
+	ssize_t rc;
 
 	rc = 0;
 
@@ -756,7 +755,8 @@
 		timeout = get_poll_timeout(console, &tv);
 
 		rc = poll(console->pollfds,
-			  console->n_pollers + MAX_INTERNAL_POLLFD, timeout);
+			  console->n_pollers + MAX_INTERNAL_POLLFD,
+			  (int)timeout);
 
 		if (rc < 0) {
 			if (errno == EINTR) {