obmc-console: Address bugprone-sizeof-expression
Disable the lint where we know the implementation is valid, but do not
disable it globally.
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Change-Id: Ie1640d82138fe91a401188cf966250103a25dde6
diff --git a/console-server.c b/console-server.c
index 4521ef7..8e24da6 100644
--- a/console-server.c
+++ b/console-server.c
@@ -534,17 +534,22 @@
/* add one to our pollers array */
n = console->n_pollers++;
- console->pollers =
- realloc(console->pollers,
- sizeof(*console->pollers) * console->n_pollers);
+ /*
+ * We're managing an array of pointers to aggregates, so don't warn about sizeof() on a
+ * pointer type.
+ */
+ /* NOLINTBEGIN(bugprone-sizeof-expression) */
+ console->pollers = reallocarray(console->pollers, console->n_pollers,
+ sizeof(*console->pollers));
+ /* NOLINTEND(bugprone-sizeof-expression) */
console->pollers[n] = poller;
/* increase pollfds array too */
console->pollfds =
- realloc(console->pollfds,
- sizeof(*console->pollfds) *
- (MAX_INTERNAL_POLLFD + console->n_pollers));
+ reallocarray(console->pollfds,
+ (MAX_INTERNAL_POLLFD + console->n_pollers),
+ sizeof(*console->pollfds));
/* shift the end pollfds up by one */
memcpy(&console->pollfds[n + 1], &console->pollfds[n],
@@ -569,13 +574,19 @@
console->n_pollers--;
- /* remove the item from the pollers array... */
+ /*
+ * Remove the item from the pollers array...
+ *
+ * We're managing an array of pointers to aggregates, so don't warn about sizeof() on a
+ * pointer type.
+ */
+ /* NOLINTBEGIN(bugprone-sizeof-expression) */
memmove(&console->pollers[i], &console->pollers[i + 1],
sizeof(*console->pollers) * (console->n_pollers - i));
- console->pollers =
- realloc(console->pollers,
- sizeof(*console->pollers) * console->n_pollers);
+ console->pollers = reallocarray(console->pollers, console->n_pollers,
+ sizeof(*console->pollers));
+ /* NOLINTEND(bugprone-sizeof-expression) */
/* ... and the pollfds array */
memmove(&console->pollfds[i], &console->pollfds[i + 1],
@@ -583,9 +594,9 @@
(MAX_INTERNAL_POLLFD + console->n_pollers - i));
console->pollfds =
- realloc(console->pollfds,
- sizeof(*console->pollfds) *
- (MAX_INTERNAL_POLLFD + console->n_pollers));
+ reallocarray(console->pollfds,
+ (MAX_INTERNAL_POLLFD + console->n_pollers),
+ sizeof(*console->pollfds));
free(poller);
}