summaryrefslogtreecommitdiffstats
path: root/drivers/atmodem/sms.c
diff options
context:
space:
mode:
authorJeevaka Badrappan <jeevaka.badrappan@elektrobit.com>2011-01-29 05:34:35 -0800
committerMarcel Holtmann <marcel@holtmann.org>2011-01-29 18:39:37 +0100
commit4258fb591599534f6447c1371e92427ccece5f51 (patch)
treecc63cb91c9421fbce447c1d13248b8abb59f9600 /drivers/atmodem/sms.c
parentac20890cc90e8a36ad1937e53bb19e2f528639d1 (diff)
downloadofono-4258fb591599534f6447c1371e92427ccece5f51.tar.bz2
atmodem: remove NULL check
Diffstat (limited to 'drivers/atmodem/sms.c')
-rw-r--r--drivers/atmodem/sms.c20
1 files changed, 0 insertions, 20 deletions
diff --git a/drivers/atmodem/sms.c b/drivers/atmodem/sms.c
index 83006eb1..9385fbb6 100644
--- a/drivers/atmodem/sms.c
+++ b/drivers/atmodem/sms.c
@@ -106,16 +106,12 @@ static void at_csca_set(struct ofono_sms *sms,
struct cb_data *cbd = cb_data_new(cb, user_data);
char buf[64];
- if (cbd == NULL)
- goto error;
-
snprintf(buf, sizeof(buf), "AT+CSCA=\"%s\",%d", sca->number, sca->type);
if (g_at_chat_send(data->chat, buf, csca_prefix,
at_csca_set_cb, cbd, g_free) > 0)
return;
-error:
g_free(cbd);
CALLBACK_WITH_FAILURE(cb, user_data);
@@ -173,14 +169,10 @@ static void at_csca_query(struct ofono_sms *sms, ofono_sms_sca_query_cb_t cb,
struct sms_data *data = ofono_sms_get_data(sms);
struct cb_data *cbd = cb_data_new(cb, user_data);
- if (cbd == NULL)
- goto error;
-
if (g_at_chat_send(data->chat, "AT+CSCA?", csca_prefix,
at_csca_query_cb, cbd, g_free) > 0)
return;
-error:
g_free(cbd);
CALLBACK_WITH_FAILURE(cb, NULL, user_data);
@@ -227,9 +219,6 @@ static void at_cmgs(struct ofono_sms *sms, unsigned char *pdu, int pdu_len,
char buf[512];
int len;
- if (cbd == NULL)
- goto error;
-
if (mms) {
snprintf(buf, sizeof(buf), "AT+CMMS=%d", mms);
g_at_chat_send(data->chat, buf, none_prefix,
@@ -243,7 +232,6 @@ static void at_cmgs(struct ofono_sms *sms, unsigned char *pdu, int pdu_len,
at_cmgs_cb, cbd, g_free) > 0)
return;
-error:
g_free(cbd);
CALLBACK_WITH_FAILURE(cb, -1, user_data);
@@ -267,16 +255,12 @@ static void at_cgsms_set(struct ofono_sms *sms, int bearer,
struct cb_data *cbd = cb_data_new(cb, user_data);
char buf[64];
- if (cbd == NULL)
- goto error;
-
snprintf(buf, sizeof(buf), "AT+CGSMS=%d", bearer);
if (g_at_chat_send(data->chat, buf, none_prefix,
at_cgsms_set_cb, cbd, g_free) > 0)
return;
-error:
g_free(cbd);
CALLBACK_WITH_FAILURE(cb, user_data);
@@ -319,14 +303,10 @@ static void at_cgsms_query(struct ofono_sms *sms,
struct sms_data *data = ofono_sms_get_data(sms);
struct cb_data *cbd = cb_data_new(cb, user_data);
- if (cbd == NULL)
- goto error;
-
if (g_at_chat_send(data->chat, "AT+CGSMS?", cgsms_prefix,
at_cgsms_query_cb, cbd, g_free) > 0)
return;
-error:
g_free(cbd);
CALLBACK_WITH_FAILURE(cb, -1, user_data);