From 6f0647d503e8384e666dcbd83b3d21f32af2d4a5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 5 Mar 2021 18:02:28 +0100 Subject: [PATCH] Drop some (size_t) casts Upcasts of the same type are automatic, so no need for an explicit cast. --- src/libsystemd/sd-bus/bus-message.c | 6 ++---- src/shared/format-table.h | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c index 040206026f1..b25064b6721 100644 --- a/src/libsystemd/sd-bus/bus-message.c +++ b/src/libsystemd/sd-bus/bus-message.c @@ -161,8 +161,7 @@ static void *message_extend_fields(sd_bus_message *m, size_t align, size_t sz, b start = ALIGN_TO(old_size, align); new_size = start + sz; - if (new_size < start || - new_size > (size_t) UINT32_MAX) + if (new_size < start || new_size > UINT32_MAX) goto poison; if (old_size == new_size) @@ -1337,8 +1336,7 @@ static void *message_extend_body( added = padding + sz; /* Check for 32bit overflows */ - if (end_body > (size_t) UINT32_MAX || - end_body < start_body) { + if (end_body < start_body || end_body > UINT32_MAX) { m->poisoned = true; return NULL; } diff --git a/src/shared/format-table.h b/src/shared/format-table.h index 02a85ee94bd..d1935456f0a 100644 --- a/src/shared/format-table.h +++ b/src/shared/format-table.h @@ -102,9 +102,9 @@ void table_set_cell_height_max(Table *t, size_t height); int table_set_empty_string(Table *t, const char *empty); int table_set_display_all(Table *t); int table_set_display_internal(Table *t, size_t first_column, ...); -#define table_set_display(...) table_set_display_internal(__VA_ARGS__, (size_t) SIZE_MAX) +#define table_set_display(...) table_set_display_internal(__VA_ARGS__, SIZE_MAX) int table_set_sort_internal(Table *t, size_t first_column, ...); -#define table_set_sort(...) table_set_sort_internal(__VA_ARGS__, (size_t) SIZE_MAX) +#define table_set_sort(...) table_set_sort_internal(__VA_ARGS__, SIZE_MAX) int table_set_reverse(Table *t, size_t column, bool b); int table_hide_column_from_display(Table *t, size_t column); -- 2.47.3