From 7ccec0bd71a0451ad9e6c5f9ec63e47fbead8a27 Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Tue, 19 May 2020 11:40:33 +0200 Subject: iface-modem: avoid cast-align errors We can safely cast the data in a GArray to gpointer first, and then to the pointer type we require. mm-iface-modem.c: In function 'after_set_load_current_bands_ready': mm-iface-modem.c:2358:55: error: cast increases required alignment of target type [-Werror=cast-align] requested_str = mm_common_build_bands_string ((MMModemBand *)requested_bands->data, requested_bands->len); ^ mm-iface-modem.c:2359:55: error: cast increases required alignment of target type [-Werror=cast-align] current_str = mm_common_build_bands_string ((MMModemBand *)current_bands->data, current_bands->len); ^ mm-iface-modem.c: In function 'validate_bands': mm-iface-modem.c:2474:48: error: cast increases required alignment of target type [-Werror=cast-align] (const MMModemBand *)supported_bands_array->data, ^ mm-iface-modem.c: In function 'mm_iface_modem_set_current_bands': mm-iface-modem.c:2535:50: error: cast increases required alignment of target type [-Werror=cast-align] bands_string = mm_common_build_bands_string ((MMModemBand *)bands_array->data, ^ --- src/mm-iface-modem.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/mm-iface-modem.c b/src/mm-iface-modem.c index 5b18484a..84104d46 100644 --- a/src/mm-iface-modem.c +++ b/src/mm-iface-modem.c @@ -2355,8 +2355,8 @@ after_set_load_current_bands_ready (MMIfaceModem *self, goto out; } - requested_str = mm_common_build_bands_string ((MMModemBand *)requested_bands->data, requested_bands->len); - current_str = mm_common_build_bands_string ((MMModemBand *)current_bands->data, current_bands->len); + requested_str = mm_common_build_bands_string ((const MMModemBand *)(gconstpointer)requested_bands->data, requested_bands->len); + current_str = mm_common_build_bands_string ((const MMModemBand *)(gconstpointer)current_bands->data, current_bands->len); error = g_error_new (MM_CORE_ERROR, MM_CORE_ERROR_FAILED, "reloaded current bands (%s) different to the requested ones (%s)", current_str, requested_str); @@ -2471,7 +2471,7 @@ validate_bands (const GArray *supported_bands_array, gchar *supported_bands_str; supported_bands_str = (mm_common_build_bands_string ( - (const MMModemBand *)supported_bands_array->data, + (const MMModemBand *)(gconstpointer)supported_bands_array->data, supported_bands_array->len)); g_set_error (error, MM_CORE_ERROR, @@ -2532,8 +2532,7 @@ mm_iface_modem_set_current_bands (MMIfaceModem *self, return; } - bands_string = mm_common_build_bands_string ((MMModemBand *)bands_array->data, - bands_array->len); + bands_string = mm_common_build_bands_string ((const MMModemBand *)(gpointer)bands_array->data, bands_array->len); /* Get list of supported bands */ ctx->supported_bands_array = (mm_common_bands_variant_to_garray ( -- cgit v1.2.3-70-g09d2