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

src: coding style fixes - rule M6

This commit is contained in:
Jeevaka Badrappan 2010-11-19 05:57:22 -08:00 committed by Denis Kenzior
parent 4988741107
commit 2d0cb92155
20 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/audio-settings.c
View File

@ -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)

4
src/call-barring.c
View File

@ -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)

4
src/call-forwarding.c
View File

@ -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)

4
src/call-meter.c
View File

@ -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)

4
src/call-settings.c
View File

@ -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)

10
src/cbs.c
View File

@ -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;
}

4
src/dbus.c
View File

@ -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;

4
src/gprs.c
View File

@ -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)

2
src/history.c
View File

@ -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;
}

8
src/modem.c
View File

@ -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;

2
src/nettime.c
View File

@ -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;
}

4
src/network.c
View File

@ -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)

12
src/phonebook.c
View File

@ -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)

4
src/radio-settings.c
View File

@ -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)

4
src/sim.c
View File

@ -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)

12
src/sms.c
View File

@ -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)

4
src/ssn.c
View File

@ -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)

4
src/stk.c
View File

@ -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)

8
src/ussd.c
View File

@ -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;

10
src/voicecall.c
View File

@ -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;
}