radio-settings: Fixup various style issues

This commit is contained in:
Denis Kenzior 2010-10-20 16:51:51 -05:00
parent ffa9edfb82
commit cbe433c9ee
1 changed files with 14 additions and 13 deletions

View File

@ -47,9 +47,9 @@ struct ofono_radio_settings {
struct ofono_atom *atom; struct ofono_atom *atom;
}; };
static const char *radio_access_mode_to_string(enum ofono_radio_access_mode mode) static const char *radio_access_mode_to_string(enum ofono_radio_access_mode m)
{ {
switch (mode) { switch (m) {
case OFONO_RADIO_ACCESS_MODE_ANY: case OFONO_RADIO_ACCESS_MODE_ANY:
return "any"; return "any";
case OFONO_RADIO_ACCESS_MODE_GSM: case OFONO_RADIO_ACCESS_MODE_GSM:
@ -74,6 +74,7 @@ static int string_to_radio_access_mode(const char *mode)
return OFONO_RADIO_ACCESS_MODE_UMTS; return OFONO_RADIO_ACCESS_MODE_UMTS;
if (g_strcmp0(mode, "lte") == 0) if (g_strcmp0(mode, "lte") == 0)
return OFONO_RADIO_ACCESS_MODE_LTE; return OFONO_RADIO_ACCESS_MODE_LTE;
return -1; return -1;
} }
@ -96,8 +97,8 @@ static DBusMessage *radio_get_properties_reply(DBusMessage *msg,
OFONO_PROPERTIES_ARRAY_SIGNATURE, OFONO_PROPERTIES_ARRAY_SIGNATURE,
&dict); &dict);
ofono_dbus_dict_append(&dict, "TechnologyPreference", DBUS_TYPE_STRING, ofono_dbus_dict_append(&dict, "TechnologyPreference",
&mode); DBUS_TYPE_STRING, &mode);
dbus_message_iter_close_container(&iter, &dict); dbus_message_iter_close_container(&iter, &dict);
@ -121,9 +122,9 @@ static void radio_set_rat_mode(struct ofono_radio_settings *rs,
str_mode = radio_access_mode_to_string(rs->mode); str_mode = radio_access_mode_to_string(rs->mode);
ofono_dbus_signal_property_changed(conn, path, ofono_dbus_signal_property_changed(conn, path,
OFONO_RADIO_SETTINGS_INTERFACE, OFONO_RADIO_SETTINGS_INTERFACE,
"TechnologyPreference", DBUS_TYPE_STRING, "TechnologyPreference",
&str_mode); DBUS_TYPE_STRING, &str_mode);
} }
static void radio_mode_set_callback(const struct ofono_error *error, void *data) static void radio_mode_set_callback(const struct ofono_error *error, void *data)
@ -165,8 +166,8 @@ static void radio_rat_mode_query_callback(const struct ofono_error *error,
__ofono_dbus_pending_reply(&rs->pending, reply); __ofono_dbus_pending_reply(&rs->pending, reply);
} }
static DBusMessage *radio_get_properties(DBusConnection *conn, DBusMessage *msg, static DBusMessage *radio_get_properties(DBusConnection *conn,
void *data) DBusMessage *msg, void *data)
{ {
struct ofono_radio_settings *rs = data; struct ofono_radio_settings *rs = data;
@ -241,10 +242,10 @@ static DBusMessage *radio_set_property(DBusConnection *conn, DBusMessage *msg,
} }
static GDBusMethodTable radio_methods[] = { static GDBusMethodTable radio_methods[] = {
{ "GetProperties", "", "a{sv}", radio_get_properties, { "GetProperties", "", "a{sv}", radio_get_properties,
G_DBUS_METHOD_FLAG_ASYNC }, G_DBUS_METHOD_FLAG_ASYNC },
{ "SetProperty", "sv", "", radio_set_property, { "SetProperty", "sv", "", radio_set_property,
G_DBUS_METHOD_FLAG_ASYNC }, G_DBUS_METHOD_FLAG_ASYNC },
{ } { }
}; };