diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2010-08-16 22:11:21 +0200 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2010-08-16 22:11:21 +0200 |
| commit | de221f87fa2c5e3048a7c93301d4784b05daa5db (patch) | |
| tree | 0f679a6d9ce77cb5978c171b4431b63bfe30c6eb /drivers/stemodem | |
| parent | e4e215e88b4865d7f6fc0ff3f4fa0341e13c981e (diff) | |
| download | ofono-de221f87fa2c5e3048a7c93301d4784b05daa5db.tar.bz2 | |
stemodem: Remove useless NULL checks before g_free
Diffstat (limited to 'drivers/stemodem')
| -rw-r--r-- | drivers/stemodem/gprs-context.c | 9 | ||||
| -rw-r--r-- | drivers/stemodem/voicecall.c | 12 |
2 files changed, 7 insertions, 14 deletions
diff --git a/drivers/stemodem/gprs-context.c b/drivers/stemodem/gprs-context.c index ace9d6e9..d3a50a92 100644 --- a/drivers/stemodem/gprs-context.c +++ b/drivers/stemodem/gprs-context.c @@ -352,8 +352,7 @@ static void ste_cgdcont_cb(gboolean ok, GAtResult *result, gpointer user_data) return; error: - if (ncbd) - g_free(ncbd); + g_free(ncbd); gcd->active_context = 0; @@ -399,8 +398,7 @@ static void ste_gprs_activate_primary(struct ofono_gprs_context *gc, return; error: - if (cbd) - g_free(cbd); + g_free(cbd); CALLBACK_WITH_FAILURE(cb, NULL, 0, NULL, NULL, NULL, NULL, data); } @@ -439,8 +437,7 @@ static void ste_gprs_deactivate_primary(struct ofono_gprs_context *gc, return; error: - if (cbd) - g_free(cbd); + g_free(cbd); CALLBACK_WITH_FAILURE(cb, data); } diff --git a/drivers/stemodem/voicecall.c b/drivers/stemodem/voicecall.c index aa5a071a..5cf38bb4 100644 --- a/drivers/stemodem/voicecall.c +++ b/drivers/stemodem/voicecall.c @@ -222,8 +222,7 @@ static void ste_dial(struct ofono_voicecall *vc, return; error: - if (cbd) - g_free(cbd); + g_free(cbd); CALLBACK_WITH_FAILURE(cb, data); } @@ -248,8 +247,7 @@ static void ste_template(const char *cmd, struct ofono_voicecall *vc, return; error: - if (req) - g_free(req); + g_free(req); CALLBACK_WITH_FAILURE(cb, data); } @@ -315,8 +313,7 @@ static void ste_release_specific(struct ofono_voicecall *vc, int id, return; error: - if (req) - g_free(req); + g_free(req); CALLBACK_WITH_FAILURE(cb, data); } @@ -401,8 +398,7 @@ static void ste_send_dtmf(struct ofono_voicecall *vc, const char *dtmf, return; error: - if (cbd) - g_free(cbd); + g_free(cbd); CALLBACK_WITH_FAILURE(cb, data); } |