sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

util: Fix implicit enum conversion 

GCC10 complains about the following:

src/smsutil.c: In function ‘sms_text_prepare_with_alphabet’:
src/smsutil.c:3594:8: error: implicit conversion from ‘enum sms_alphabet’ to ‘enum gsm_dialect’ [-Werror=enum-conversion]
 3594 |        alphabet, &used_locking,

smsutil and util has an enum each for representing
the same thing; The SMS alphabet. They share the same
values, so an explicit type cast makes GCC happy.
This commit is contained in:
Richard Röjfors 2020-12-20 11:18:27 +00:00 committed by Denis Kenzior
parent 66cd5df5d7
commit 429a5a57da
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/smsutil.c
View File

@ -3575,6 +3575,7 @@ GSList *sms_text_prepare_with_alphabet(const char *to, const char *utf8,
GSList *r = NULL; GSList *r = NULL;
enum gsm_dialect used_locking; enum gsm_dialect used_locking;
enum gsm_dialect used_single; enum gsm_dialect used_single;
enum gsm_dialect dialect;
memset(&template, 0, sizeof(struct sms)); memset(&template, 0, sizeof(struct sms));
template.type = SMS_TYPE_SUBMIT; template.type = SMS_TYPE_SUBMIT;
@ -3586,12 +3587,14 @@ GSList *sms_text_prepare_with_alphabet(const char *to, const char *utf8,
template.submit.vp.relative = 0xA7; /* 24 Hours */ template.submit.vp.relative = 0xA7; /* 24 Hours */
sms_address_from_string(&template.submit.daddr, to); sms_address_from_string(&template.submit.daddr, to);
/* There are two enums for the same thing */
dialect = (enum gsm_dialect)alphabet;
/* /*
* UDHI, UDL, UD and DCS actually depend on the contents of * UDHI, UDL, UD and DCS actually depend on the contents of
* the text, and also on the GSM dialect we use to encode it. * the text, and also on the GSM dialect we use to encode it.
*/ */
gsm_encoded = convert_utf8_to_gsm_best_lang(utf8, -1, NULL, &written, 0, gsm_encoded = convert_utf8_to_gsm_best_lang(utf8, -1, NULL, &written, 0,
alphabet, &used_locking, dialect, &used_locking,
&used_single); &used_single);
if (!gsm_encoded) { if (!gsm_encoded) {
size_t converted; size_t converted;