From 520a7ec7db3557f356fd9c5bad5a99a66f082ffd Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Sat, 11 Jan 2020 13:48:15 +0100 Subject: modem-helpers: fix warnings with -Wdiscarded-qualifiers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit mm-modem-helpers.c:4019:45: error: initialization discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers] 4019 | { MM_MODEM_3GPP_FACILITY_SIM, "SC" }, | ^~~~ mm-modem-helpers.c:4020:45: error: initialization discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers] 4020 | { MM_MODEM_3GPP_FACILITY_PH_SIM, "PS" }, | ^~~~ mm-modem-helpers.c:4021:45: error: initialization discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers] 4021 | { MM_MODEM_3GPP_FACILITY_PH_FSIM, "PF" }, | ^~~~ mm-modem-helpers.c:4022:45: error: initialization discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers] 4022 | { MM_MODEM_3GPP_FACILITY_FIXED_DIALING, "FD" }, | ^~~~ mm-modem-helpers.c:4023:45: error: initialization discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers] 4023 | { MM_MODEM_3GPP_FACILITY_NET_PERS, "PN" }, | ^~~~ mm-modem-helpers.c:4024:45: error: initialization discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers] 4024 | { MM_MODEM_3GPP_FACILITY_NET_SUB_PERS, "PU" }, | ^~~~ mm-modem-helpers.c:4025:45: error: initialization discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers] 4025 | { MM_MODEM_3GPP_FACILITY_PROVIDER_PERS, "PP" }, | ^~~~ mm-modem-helpers.c:4026:45: error: initialization discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers] 4026 | { MM_MODEM_3GPP_FACILITY_CORP_PERS, "PC" } | ^~~~ --- src/mm-modem-helpers.c | 6 +++--- src/mm-modem-helpers.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/mm-modem-helpers.c b/src/mm-modem-helpers.c index efd24649..9398a286 100644 --- a/src/mm-modem-helpers.c +++ b/src/mm-modem-helpers.c @@ -4011,8 +4011,8 @@ mm_3gpp_parse_pdu_cmgl_response (const gchar *str, * many more facilities defined (for various flavors of call * barring); we only map the ones we care about. */ typedef struct { - MMModem3gppFacility facility; - gchar *acronym; + MMModem3gppFacility facility; + const gchar *acronym; } FacilityAcronym; static const FacilityAcronym facility_acronyms[] = { @@ -4039,7 +4039,7 @@ mm_3gpp_acronym_to_facility (const gchar *str) return MM_MODEM_3GPP_FACILITY_NONE; } -gchar * +const gchar * mm_3gpp_facility_to_acronym (MMModem3gppFacility facility) { guint i; diff --git a/src/mm-modem-helpers.h b/src/mm-modem-helpers.h index 0fea8b0e..c41d1d31 100644 --- a/src/mm-modem-helpers.h +++ b/src/mm-modem-helpers.h @@ -414,8 +414,8 @@ gboolean mm_3gpp_parse_ccwa_service_query_response (const gchar *response, /* Additional 3GPP-specific helpers */ -MMModem3gppFacility mm_3gpp_acronym_to_facility (const gchar *str); -gchar *mm_3gpp_facility_to_acronym (MMModem3gppFacility facility); +MMModem3gppFacility mm_3gpp_acronym_to_facility (const gchar *str); +const gchar *mm_3gpp_facility_to_acronym (MMModem3gppFacility facility); MMModemAccessTechnology mm_string_to_access_tech (const gchar *string); -- cgit v1.2.3-70-g09d2