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

Clean up style issues

This commit is contained in:
Aki Niemi 2010-01-12 10:49:30 +02:00
parent 04a3c6cb09
commit 85df7a952a
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/isimodem/network-registration.c
View File

@ -264,10 +264,8 @@ static void isi_registration_status(struct ofono_netreg *netreg,
return; return;
error: error:
if (cbd)
g_free(cbd);
CALLBACK_WITH_FAILURE(cb, -1, -1, -1, -1, data); CALLBACK_WITH_FAILURE(cb, -1, -1, -1, -1, data);
g_free(cbd);
} }
static bool name_get_resp_cb(GIsiClient *client, const void *restrict data, static bool name_get_resp_cb(GIsiClient *client, const void *restrict data,
@ -663,16 +661,16 @@ static void rat_ind_cb(GIsiClient *client, const void *restrict data,
case NET_RAT_INFO: { case NET_RAT_INFO: {
guint8 info = 0; guint8 info = 0;
if (!g_isi_sb_iter_get_byte(&iter, &nd->rat, 2)) if (!g_isi_sb_iter_get_byte(&iter, &nd->rat, 2)
|| !g_isi_sb_iter_get_byte(&iter, &info, 3))
return; return;
if (!g_isi_sb_iter_get_byte(&iter, &info, 3)) if (info) {
return;
if (info)
if (!g_isi_sb_iter_get_byte(&iter, if (!g_isi_sb_iter_get_byte(&iter,
&nd->gsm_compact, 4)) &nd->gsm_compact, 4))
return; return;
}
break; break;
} }
@ -769,7 +767,8 @@ static bool rssi_resp_cb(GIsiClient *client, const void *restrict data,
return false; return false;
if (msg[1] != NET_CAUSE_OK) { if (msg[1] != NET_CAUSE_OK) {
DBG("Request failed: %s", net_isi_cause_name(msg[1])); DBG("Request failed: %s (0x%02X)",
net_isi_cause_name(msg[1]), msg[1]);
goto error; goto error;
} }

2
drivers/isimodem/phonebook.c
View File

@ -292,7 +292,7 @@ static void reachable_cb(GIsiClient *client, bool alive, uint16_t object,
return; return;
} }
DBG("%s (v.%03d.%03d) reachable", DBG("%s (v%03d.%03d) reachable",
pn_resource_name(g_isi_client_resource(client)), pn_resource_name(g_isi_client_resource(client)),
g_isi_version_major(client), g_isi_version_major(client),
g_isi_version_minor(client)); g_isi_version_minor(client));

4
drivers/isimodem/voicecall.c
View File

@ -1310,7 +1310,7 @@ static void isi_call_verify_cb(GIsiClient *client,
return; return;
} }
DBG("%s (v.%03d.%03d) reachable", DBG("%s (v%03d.%03d) reachable",
pn_resource_name(g_isi_client_resource(client)), pn_resource_name(g_isi_client_resource(client)),
g_isi_version_major(client), g_isi_version_major(client),
g_isi_version_minor(client)); g_isi_version_minor(client));
@ -1347,8 +1347,6 @@ static void isi_voicecall_remove(struct ofono_voicecall *call)
{ {
struct isi_voicecall *data = ofono_voicecall_get_data(call); struct isi_voicecall *data = ofono_voicecall_get_data(call);
DBG("");
if (data) { if (data) {
g_isi_client_destroy(data->client); g_isi_client_destroy(data->client);
g_free(data); g_free(data);