diff --git a/src/audio-settings.c b/src/audio-settings.c index 0959909b..bf00c54e 100644 --- a/src/audio-settings.c +++ b/src/audio-settings.c @@ -135,7 +135,7 @@ int ofono_audio_settings_driver_register(const struct ofono_audio_settings_drive if (!d || !d->probe) return -EINVAL; - g_drivers = g_slist_prepend(g_drivers, (void *)d); + g_drivers = g_slist_prepend(g_drivers, (void *) d); return 0; } @@ -147,7 +147,7 @@ void ofono_audio_settings_driver_unregister(const struct ofono_audio_settings_dr if (!d) return; - g_drivers = g_slist_remove(g_drivers, (void *)d); + g_drivers = g_slist_remove(g_drivers, (void *) d); } static void audio_settings_unregister(struct ofono_atom *atom) diff --git a/src/call-barring.c b/src/call-barring.c index f89602ee..db32c0c3 100644 --- a/src/call-barring.c +++ b/src/call-barring.c @@ -1029,7 +1029,7 @@ int ofono_call_barring_driver_register(const struct ofono_call_barring_driver *d if (d->probe == NULL) return -EINVAL; - g_drivers = g_slist_prepend(g_drivers, (void *)d); + g_drivers = g_slist_prepend(g_drivers, (void *) d); return 0; } @@ -1038,7 +1038,7 @@ void ofono_call_barring_driver_unregister(const struct ofono_call_barring_driver { DBG("driver: %p, name: %s", d, d->name); - g_drivers = g_slist_remove(g_drivers, (void *)d); + g_drivers = g_slist_remove(g_drivers, (void *) d); } static void call_barring_unregister(struct ofono_atom *atom) diff --git a/src/call-forwarding.c b/src/call-forwarding.c index 928cda10..715ce02f 100644 --- a/src/call-forwarding.c +++ b/src/call-forwarding.c @@ -1112,7 +1112,7 @@ int ofono_call_forwarding_driver_register(const struct ofono_call_forwarding_dri if (d->probe == NULL) return -EINVAL; - g_drivers = g_slist_prepend(g_drivers, (void *)d); + g_drivers = g_slist_prepend(g_drivers, (void *) d); return 0; } @@ -1121,7 +1121,7 @@ void ofono_call_forwarding_driver_unregister(const struct ofono_call_forwarding_ { DBG("driver: %p, name: %s", d, d->name); - g_drivers = g_slist_remove(g_drivers, (void *)d); + g_drivers = g_slist_remove(g_drivers, (void *) d); } static void call_forwarding_unregister(struct ofono_atom *atom) diff --git a/src/call-meter.c b/src/call-meter.c index 5199b37d..568fe40f 100644 --- a/src/call-meter.c +++ b/src/call-meter.c @@ -667,7 +667,7 @@ int ofono_call_meter_driver_register(const struct ofono_call_meter_driver *d) if (d->probe == NULL) return -EINVAL; - g_drivers = g_slist_prepend(g_drivers, (void *)d); + g_drivers = g_slist_prepend(g_drivers, (void *) d); return 0; } @@ -676,7 +676,7 @@ void ofono_call_meter_driver_unregister(const struct ofono_call_meter_driver *d) { DBG("driver: %p, name: %s", d, d->name); - g_drivers = g_slist_remove(g_drivers, (void *)d); + g_drivers = g_slist_remove(g_drivers, (void *) d); } static void call_meter_unregister(struct ofono_atom *atom) diff --git a/src/call-settings.c b/src/call-settings.c index 23da47e5..29e8300f 100644 --- a/src/call-settings.c +++ b/src/call-settings.c @@ -1193,7 +1193,7 @@ int ofono_call_settings_driver_register(const struct ofono_call_settings_driver if (d->probe == NULL) return -EINVAL; - g_drivers = g_slist_prepend(g_drivers, (void *)d); + g_drivers = g_slist_prepend(g_drivers, (void *) d); return 0; } @@ -1202,7 +1202,7 @@ void ofono_call_settings_driver_unregister(const struct ofono_call_settings_driv { DBG("driver: %p, name: %s", d, d->name); - g_drivers = g_slist_remove(g_drivers, (void *)d); + g_drivers = g_slist_remove(g_drivers, (void *) d); } static void call_settings_unregister(struct ofono_atom *atom) diff --git a/src/cbs.c b/src/cbs.c index 16177952..50e78c29 100644 --- a/src/cbs.c +++ b/src/cbs.c @@ -565,7 +565,7 @@ int ofono_cbs_driver_register(const struct ofono_cbs_driver *d) if (d->probe == NULL) return -EINVAL; - g_drivers = g_slist_prepend(g_drivers, (void *)d); + g_drivers = g_slist_prepend(g_drivers, (void *) d); return 0; } @@ -574,7 +574,7 @@ void ofono_cbs_driver_unregister(const struct ofono_cbs_driver *d) { DBG("driver: %p, name: %s", d, d->name); - g_drivers = g_slist_remove(g_drivers, (void *)d); + g_drivers = g_slist_remove(g_drivers, (void *) d); } static void cbs_unregister(struct ofono_atom *atom) @@ -588,20 +588,20 @@ static void cbs_unregister(struct ofono_atom *atom) ofono_modem_remove_interface(modem, OFONO_CELL_BROADCAST_INTERFACE); if (cbs->topics) { - g_slist_foreach(cbs->topics, (GFunc)g_free, NULL); + g_slist_foreach(cbs->topics, (GFunc) g_free, NULL); g_slist_free(cbs->topics); cbs->topics = NULL; } if (cbs->new_topics) { - g_slist_foreach(cbs->new_topics, (GFunc)g_free, NULL); + g_slist_foreach(cbs->new_topics, (GFunc) g_free, NULL); g_slist_free(cbs->new_topics); cbs->new_topics = NULL; } if (cbs->efcbmid_length) { cbs->efcbmid_length = 0; - g_slist_foreach(cbs->efcbmid_contents, (GFunc)g_free, NULL); + g_slist_foreach(cbs->efcbmid_contents, (GFunc) g_free, NULL); g_slist_free(cbs->efcbmid_contents); cbs->efcbmid_contents = NULL; } diff --git a/src/dbus.c b/src/dbus.c index 8a685aa4..86dbdda2 100644 --- a/src/dbus.c +++ b/src/dbus.c @@ -75,7 +75,7 @@ static void append_array_variant(DBusMessageIter *iter, int type, void *val) DBusMessageIter variant, array; char typesig[2]; char arraysig[3]; - const char **str_array = *(const char ***)val; + const char **str_array = *(const char ***) val; int i; arraysig[0] = DBUS_TYPE_ARRAY; @@ -117,7 +117,7 @@ static void append_dict_variant(DBusMessageIter *iter, int type, void *val) DBusMessageIter variant, array, entry; char typesig[5]; char arraysig[6]; - const void **val_array = *(const void ***)val; + const void **val_array = *(const void ***) val; int i; arraysig[0] = DBUS_TYPE_ARRAY; diff --git a/src/gprs.c b/src/gprs.c index 0f6fb0c5..3de3f2bf 100644 --- a/src/gprs.c +++ b/src/gprs.c @@ -2019,7 +2019,7 @@ int ofono_gprs_context_driver_register(const struct ofono_gprs_context_driver *d if (d->probe == NULL) return -EINVAL; - g_context_drivers = g_slist_prepend(g_context_drivers, (void *)d); + g_context_drivers = g_slist_prepend(g_context_drivers, (void *) d); return 0; } @@ -2028,7 +2028,7 @@ void ofono_gprs_context_driver_unregister(const struct ofono_gprs_context_driver { DBG("driver: %p, name: %s", d, d->name); - g_context_drivers = g_slist_remove(g_context_drivers, (void *)d); + g_context_drivers = g_slist_remove(g_context_drivers, (void *) d); } static void gprs_context_remove(struct ofono_atom *atom) diff --git a/src/history.c b/src/history.c index 0229cf5d..7d3c9278 100644 --- a/src/history.c +++ b/src/history.c @@ -255,7 +255,7 @@ int ofono_history_driver_register(const struct ofono_history_driver *driver) { DBG("driver: %p name: %s", driver, driver->name); - history_drivers = g_slist_prepend(history_drivers, (void *)driver); + history_drivers = g_slist_prepend(history_drivers, (void *) driver); return 0; } diff --git a/src/modem.c b/src/modem.c index 831a36a7..6f108b88 100644 --- a/src/modem.c +++ b/src/modem.c @@ -1059,7 +1059,7 @@ int ofono_devinfo_driver_register(const struct ofono_devinfo_driver *d) if (d->probe == NULL) return -EINVAL; - g_devinfo_drivers = g_slist_prepend(g_devinfo_drivers, (void *)d); + g_devinfo_drivers = g_slist_prepend(g_devinfo_drivers, (void *) d); return 0; } @@ -1068,7 +1068,7 @@ void ofono_devinfo_driver_unregister(const struct ofono_devinfo_driver *d) { DBG("driver: %p, name: %s", d, d->name); - g_devinfo_drivers = g_slist_remove(g_devinfo_drivers, (void *)d); + g_devinfo_drivers = g_slist_remove(g_devinfo_drivers, (void *) d); } static void devinfo_remove(struct ofono_atom *atom) @@ -1572,7 +1572,7 @@ int ofono_modem_driver_register(const struct ofono_modem_driver *d) if (d->probe == NULL) return -EINVAL; - g_driver_list = g_slist_prepend(g_driver_list, (void *)d); + g_driver_list = g_slist_prepend(g_driver_list, (void *) d); return 0; } @@ -1584,7 +1584,7 @@ void ofono_modem_driver_unregister(const struct ofono_modem_driver *d) DBG("driver: %p, name: %s", d, d->name); - g_driver_list = g_slist_remove(g_driver_list, (void *)d); + g_driver_list = g_slist_remove(g_driver_list, (void *) d); for (l = g_modem_list; l; l = l->next) { modem = l->data; diff --git a/src/nettime.c b/src/nettime.c index b17e375b..904deeef 100644 --- a/src/nettime.c +++ b/src/nettime.c @@ -108,7 +108,7 @@ int ofono_nettime_driver_register(const struct ofono_nettime_driver *driver) { DBG("driver: %p name: %s", driver, driver->name); - nettime_drivers = g_slist_prepend(nettime_drivers, (void *)driver); + nettime_drivers = g_slist_prepend(nettime_drivers, (void *) driver); return 0; } diff --git a/src/network.c b/src/network.c index f1d77244..d203bee5 100644 --- a/src/network.c +++ b/src/network.c @@ -1646,7 +1646,7 @@ int ofono_netreg_driver_register(const struct ofono_netreg_driver *d) if (d->probe == NULL) return -EINVAL; - g_drivers = g_slist_prepend(g_drivers, (void *)d); + g_drivers = g_slist_prepend(g_drivers, (void *) d); return 0; } @@ -1655,7 +1655,7 @@ void ofono_netreg_driver_unregister(const struct ofono_netreg_driver *d) { DBG("driver: %p, name: %s", d, d->name); - g_drivers = g_slist_remove(g_drivers, (void *)d); + g_drivers = g_slist_remove(g_drivers, (void *) d); } static void netreg_unregister(struct ofono_atom *atom) diff --git a/src/phonebook.c b/src/phonebook.c index ed768bd7..cae2b14c 100644 --- a/src/phonebook.c +++ b/src/phonebook.c @@ -249,7 +249,7 @@ static void print_merged_entry(struct phonebook_person *person, GString *vcards) vcard_printf_begin(vcards); vcard_printf_text(vcards, person->text); - g_slist_foreach(person->number_list, (GFunc)print_number, vcards); + g_slist_foreach(person->number_list, (GFunc) print_number, vcards); vcard_printf_group(vcards, person->group); vcard_printf_email(vcards, person->email); @@ -264,7 +264,7 @@ static void destroy_merged_entry(struct phonebook_person *person) g_free(person->email); g_free(person->sip_uri); - g_slist_foreach(person->number_list, (GFunc)destroy_number, NULL); + g_slist_foreach(person->number_list, (GFunc) destroy_number, NULL); g_slist_free(person->number_list); g_free(person); @@ -420,9 +420,9 @@ static void export_phonebook_cb(const struct ofono_error *error, void *data) /* convert the collected entries that are already merged to vcard */ phonebook->merge_list = g_slist_reverse(phonebook->merge_list); - g_slist_foreach(phonebook->merge_list, (GFunc)print_merged_entry, + g_slist_foreach(phonebook->merge_list, (GFunc) print_merged_entry, phonebook->vcards); - g_slist_foreach(phonebook->merge_list, (GFunc)destroy_merged_entry, + g_slist_foreach(phonebook->merge_list, (GFunc) destroy_merged_entry, NULL); g_slist_free(phonebook->merge_list); phonebook->merge_list = NULL; @@ -498,7 +498,7 @@ int ofono_phonebook_driver_register(const struct ofono_phonebook_driver *d) if (d->probe == NULL) return -EINVAL; - g_drivers = g_slist_prepend(g_drivers, (void *)d); + g_drivers = g_slist_prepend(g_drivers, (void *) d); return 0; } @@ -507,7 +507,7 @@ void ofono_phonebook_driver_unregister(const struct ofono_phonebook_driver *d) { DBG("driver: %p, name: %s", d, d->name); - g_drivers = g_slist_remove(g_drivers, (void *)d); + g_drivers = g_slist_remove(g_drivers, (void *) d); } static void phonebook_unregister(struct ofono_atom *atom) diff --git a/src/radio-settings.c b/src/radio-settings.c index eb2a42d0..5794221f 100644 --- a/src/radio-settings.c +++ b/src/radio-settings.c @@ -377,7 +377,7 @@ int ofono_radio_settings_driver_register(const struct ofono_radio_settings_drive if (!d || !d->probe) return -EINVAL; - g_drivers = g_slist_prepend(g_drivers, (void *)d); + g_drivers = g_slist_prepend(g_drivers, (void *) d); return 0; } @@ -389,7 +389,7 @@ void ofono_radio_settings_driver_unregister(const struct ofono_radio_settings_dr if (!d) return; - g_drivers = g_slist_remove(g_drivers, (void *)d); + g_drivers = g_slist_remove(g_drivers, (void *) d); } static void radio_settings_unregister(struct ofono_atom *atom) diff --git a/src/sim.c b/src/sim.c index f362565b..c4af079f 100644 --- a/src/sim.c +++ b/src/sim.c @@ -2120,7 +2120,7 @@ int ofono_sim_driver_register(const struct ofono_sim_driver *d) if (d->probe == NULL) return -EINVAL; - g_drivers = g_slist_prepend(g_drivers, (void *)d); + g_drivers = g_slist_prepend(g_drivers, (void *) d); return 0; } @@ -2129,7 +2129,7 @@ void ofono_sim_driver_unregister(const struct ofono_sim_driver *d) { DBG("driver: %p, name: %s", d, d->name); - g_drivers = g_slist_remove(g_drivers, (void *)d); + g_drivers = g_slist_remove(g_drivers, (void *) d); } static void sim_unregister(struct ofono_atom *atom) diff --git a/src/sms.c b/src/sms.c index d6f2a014..12988c8d 100644 --- a/src/sms.c +++ b/src/sms.c @@ -205,7 +205,7 @@ static unsigned int add_sms_handler(struct ofono_watchlist *watchlist, handler->item.destroy = destroy; return __ofono_watchlist_add_item(watchlist, - (struct ofono_watchlist_item *)handler); + (struct ofono_watchlist_item *) handler); } unsigned int __ofono_sms_text_watch_add(struct ofono_sms *sms, @@ -1003,7 +1003,7 @@ static DBusMessage *sms_send_message(DBusConnection *conn, DBusMessage *msg, err = __ofono_sms_txq_submit(sms, msg_list, flags, &uuid, message_queued, msg); - g_slist_foreach(msg_list, (GFunc)g_free, NULL); + g_slist_foreach(msg_list, (GFunc) g_free, NULL); g_slist_free(msg_list); if (err < 0) @@ -1369,13 +1369,13 @@ static void handle_deliver(struct ofono_sms *sms, const struct sms *incoming) return; sms_dispatch(sms, sms_list); - g_slist_foreach(sms_list, (GFunc)g_free, NULL); + g_slist_foreach(sms_list, (GFunc) g_free, NULL); g_slist_free(sms_list); return; } - l = g_slist_append(NULL, (void *)incoming); + l = g_slist_append(NULL, (void *) incoming); sms_dispatch(sms, l); g_slist_free(l); } @@ -1602,7 +1602,7 @@ int ofono_sms_driver_register(const struct ofono_sms_driver *d) if (d->probe == NULL) return -EINVAL; - g_drivers = g_slist_prepend(g_drivers, (void *)d); + g_drivers = g_slist_prepend(g_drivers, (void *) d); return 0; } @@ -1611,7 +1611,7 @@ void ofono_sms_driver_unregister(const struct ofono_sms_driver *d) { DBG("driver: %p, name: %s", d, d->name); - g_drivers = g_slist_remove(g_drivers, (void *)d); + g_drivers = g_slist_remove(g_drivers, (void *) d); } static void sms_unregister(struct ofono_atom *atom) diff --git a/src/ssn.c b/src/ssn.c index b886dba8..64c94b78 100644 --- a/src/ssn.c +++ b/src/ssn.c @@ -150,7 +150,7 @@ int ofono_ssn_driver_register(const struct ofono_ssn_driver *d) if (d->probe == NULL) return -EINVAL; - g_drivers = g_slist_prepend(g_drivers, (void *)d); + g_drivers = g_slist_prepend(g_drivers, (void *) d); return 0; } @@ -159,7 +159,7 @@ void ofono_ssn_driver_unregister(const struct ofono_ssn_driver *d) { DBG("driver: %p, name: %s", d, d->name); - g_drivers = g_slist_remove(g_drivers, (void *)d); + g_drivers = g_slist_remove(g_drivers, (void *) d); } static void ssn_unregister(struct ofono_atom *atom) diff --git a/src/stk.c b/src/stk.c index 18beee69..a58513b2 100644 --- a/src/stk.c +++ b/src/stk.c @@ -2526,7 +2526,7 @@ int ofono_stk_driver_register(const struct ofono_stk_driver *d) if (d->probe == NULL) return -EINVAL; - g_drivers = g_slist_prepend(g_drivers, (void *)d); + g_drivers = g_slist_prepend(g_drivers, (void *) d); return 0; } @@ -2535,7 +2535,7 @@ void ofono_stk_driver_unregister(const struct ofono_stk_driver *d) { DBG("driver: %p, name: %s", d, d->name); - g_drivers = g_slist_remove(g_drivers, (void *)d); + g_drivers = g_slist_remove(g_drivers, (void *) d); } static void stk_unregister(struct ofono_atom *atom) diff --git a/src/ussd.c b/src/ussd.c index 59e0a49e..c4de1770 100644 --- a/src/ussd.c +++ b/src/ussd.c @@ -759,7 +759,7 @@ int ofono_ussd_driver_register(const struct ofono_ussd_driver *d) if (d->probe == NULL) return -EINVAL; - g_drivers = g_slist_prepend(g_drivers, (void *)d); + g_drivers = g_slist_prepend(g_drivers, (void *) d); return 0; } @@ -768,7 +768,7 @@ void ofono_ussd_driver_unregister(const struct ofono_ussd_driver *d) { DBG("driver: %p, name: %s", d, d->name); - g_drivers = g_slist_remove(g_drivers, (void *)d); + g_drivers = g_slist_remove(g_drivers, (void *) d); } static void ussd_unregister(struct ofono_atom *atom) @@ -778,11 +778,11 @@ static void ussd_unregister(struct ofono_atom *atom) struct ofono_modem *modem = __ofono_atom_get_modem(atom); const char *path = __ofono_atom_get_path(atom); - g_slist_foreach(ussd->ss_control_list, (GFunc)ssc_entry_destroy, NULL); + g_slist_foreach(ussd->ss_control_list, (GFunc) ssc_entry_destroy, NULL); g_slist_free(ussd->ss_control_list); ussd->ss_control_list = NULL; - g_slist_foreach(ussd->ss_passwd_list, (GFunc)ssc_entry_destroy, NULL); + g_slist_foreach(ussd->ss_passwd_list, (GFunc) ssc_entry_destroy, NULL); g_slist_free(ussd->ss_passwd_list); ussd->ss_passwd_list = NULL; diff --git a/src/voicecall.c b/src/voicecall.c index bd644326..52baec3a 100644 --- a/src/voicecall.c +++ b/src/voicecall.c @@ -1926,7 +1926,7 @@ static void set_new_ecc(struct ofono_voicecall *vc) { int i = 0; - g_slist_foreach(vc->en_list, (GFunc)g_free, NULL); + g_slist_foreach(vc->en_list, (GFunc) g_free, NULL); g_slist_free(vc->en_list); vc->en_list = NULL; @@ -2026,7 +2026,7 @@ int ofono_voicecall_driver_register(const struct ofono_voicecall_driver *d) if (d->probe == NULL) return -EINVAL; - g_drivers = g_slist_prepend(g_drivers, (void *)d); + g_drivers = g_slist_prepend(g_drivers, (void *) d); return 0; } @@ -2035,7 +2035,7 @@ void ofono_voicecall_driver_unregister(const struct ofono_voicecall_driver *d) { DBG("driver: %p, name: %s", d, d->name); - g_drivers = g_slist_remove(g_drivers, (void *)d); + g_drivers = g_slist_remove(g_drivers, (void *) d); } static void voicecall_unregister(struct ofono_atom *atom) @@ -2077,13 +2077,13 @@ static void voicecall_remove(struct ofono_atom *atom) vc->driver->remove(vc); if (vc->en_list) { - g_slist_foreach(vc->en_list, (GFunc)g_free, NULL); + g_slist_foreach(vc->en_list, (GFunc) g_free, NULL); g_slist_free(vc->en_list); vc->en_list = NULL; } if (vc->new_en_list) { - g_slist_foreach(vc->new_en_list, (GFunc)g_free, NULL); + g_slist_foreach(vc->new_en_list, (GFunc) g_free, NULL); g_slist_free(vc->new_en_list); vc->new_en_list = NULL; }