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

hfpmodem: Remove useless NULL checks before g_free

This commit is contained in:
Marcel Holtmann 2010-08-16 22:06:00 +02:00
parent 3ea7893108
commit 41133da001
3 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/hfpmodem/call-volume.c
View File

@ -86,8 +86,7 @@ static void hfp_speaker_volume(struct ofono_call_volume *cv,
return;
error:
if (cbd)
g_free(cbd);
g_free(cbd);
CALLBACK_WITH_FAILURE(cb, data);
}
@ -114,8 +113,7 @@ static void hfp_microphone_volume(struct ofono_call_volume *cv,
return;
error:
if (cbd)
g_free(cbd);
g_free(cbd);
CALLBACK_WITH_FAILURE(cb, data);
}

6
drivers/hfpmodem/network-registration.c
View File

@ -247,8 +247,7 @@ static void hfp_registration_status(struct ofono_netreg *netreg,
return;
error:
if (cbd)
g_free(cbd);
g_free(cbd);
CALLBACK_WITH_FAILURE(cb, -1, -1, -1, -1, data);
}
@ -295,8 +294,7 @@ static void hfp_signal_strength(struct ofono_netreg *netreg,
return;
error:
if (cbd)
g_free(cbd);
g_free(cbd);
CALLBACK_WITH_FAILURE(cb, -1, data);
}

12
drivers/hfpmodem/voicecall.c
View File

@ -380,8 +380,7 @@ static void hfp_dial(struct ofono_voicecall *vc,
return;
error:
if (cbd)
g_free(cbd);
g_free(cbd);
CALLBACK_WITH_FAILURE(cb, data);
}
@ -406,8 +405,7 @@ static void hfp_template(const char *cmd, struct ofono_voicecall *vc,
return;
error:
if (req)
g_free(req);
g_free(req);
CALLBACK_WITH_FAILURE(cb, data);
}
@ -523,8 +521,7 @@ static void hfp_release_specific(struct ofono_voicecall *vc, int id,
return;
error:
if (req)
g_free(req);
g_free(req);
CALLBACK_WITH_FAILURE(cb, data);
}
@ -612,8 +609,7 @@ static void hfp_send_dtmf(struct ofono_voicecall *vc, const char *dtmf,
return;
error:
if (req)
g_free(req);
g_free(req);
CALLBACK_WITH_FAILURE(cb, data);
}