[PATCH 00/11] Remove NULL check for call back data

Open Source Telephony
 help / color / mirror / Atom feed

* [PATCH 00/11] Remove NULL check for call back data
@ 2011-01-29 13:34 Jeevaka Badrappan
  2011-01-29 13:34 ` [PATCH 01/11] atutil: use g_new0 for callback data memory Jeevaka Badrappan
                   ` (11 more replies)
  0 siblings, 12 replies; 13+ messages in thread
From: Jeevaka Badrappan @ 2011-01-29 13:34 UTC (permalink / raw)
  To: ofono

[-- Attachment #1: Type: text/plain, Size: 3083 bytes --]

Hi,

Memory allocation function for callback data change from g_try_new0 to
g_new0. Due to this, NULL check done for callback data is removed.

Regards,
Jeevaka

Jeevaka Badrappan (11):
  atutil: use g_new0 for callback data memory
  atmodem: remove NULL check
  calypsomodem: remove NULL check
  hfpmodem: remove NULL check
  hsomodem: remove NULL check
  huaweimodem: remove NULL check
  ifxmodem: remove NULL check
  mbmmodem: remove NULL check
  stemodem: remove NULL check
  cdmamodem: remove NULL check
  plugins: remove NULL check

 drivers/atmodem/atutil.h                |    5 +---
 drivers/atmodem/call-barring.c          |    6 ++--
 drivers/atmodem/call-forwarding.c       |    8 -----
 drivers/atmodem/call-meter.c            |   28 -------------------
 drivers/atmodem/call-settings.c         |   36 ------------------------
 drivers/atmodem/call-volume.c           |    8 -----
 drivers/atmodem/cbs.c                   |    8 -----
 drivers/atmodem/devinfo.c               |   16 -----------
 drivers/atmodem/gprs.c                  |    8 -----
 drivers/atmodem/network-registration.c  |   24 ----------------
 drivers/atmodem/phonebook.c             |    4 ---
 drivers/atmodem/sim-auth.c              |    2 +-
 drivers/atmodem/sim.c                   |   46 ++-----------------------------
 drivers/atmodem/sms.c                   |   20 -------------
 drivers/atmodem/stk.c                   |    4 +-
 drivers/atmodem/ussd.c                  |    7 -----
 drivers/atmodem/voicecall.c             |    7 -----
 drivers/calypsomodem/stk.c              |    4 +-
 drivers/calypsomodem/voicecall.c        |    4 ---
 drivers/cdmamodem/devinfo.c             |   16 -----------
 drivers/cdmamodem/voicecall.c           |    4 ---
 drivers/hfpmodem/call-volume.c          |    8 -----
 drivers/hfpmodem/network-registration.c |   12 --------
 drivers/hfpmodem/voicecall.c            |    4 ---
 drivers/hsomodem/gprs-context.c         |    7 -----
 drivers/huaweimodem/gprs-context.c      |    8 -----
 drivers/huaweimodem/voicecall.c         |    4 ---
 drivers/ifxmodem/ctm.c                  |    8 -----
 drivers/ifxmodem/stk.c                  |    4 +-
 drivers/ifxmodem/voicecall.c            |    7 -----
 drivers/mbmmodem/gprs-context.c         |    7 -----
 drivers/mbmmodem/stk.c                  |    4 +-
 drivers/stemodem/gprs-context.c         |    6 ----
 drivers/stemodem/voicecall.c            |    7 -----
 plugins/gobi.c                          |    2 +-
 plugins/hso.c                           |    4 ---
 plugins/ifx.c                           |    4 ---
 plugins/mbm.c                           |    4 ---
 plugins/novatel.c                       |    2 +-
 plugins/phonesim.c                      |   12 --------
 plugins/sierra.c                        |    2 +-
 plugins/ste.c                           |    4 ---
 plugins/tc65.c                          |    4 ---
 plugins/zte.c                           |    2 +-
 44 files changed, 20 insertions(+), 371 deletions(-)


^ permalink raw reply	[flat|nested] 13+ messages in thread

* [PATCH 01/11] atutil: use g_new0 for callback data memory
  2011-01-29 13:34 [PATCH 00/11] Remove NULL check for call back data Jeevaka Badrappan
@ 2011-01-29 13:34 ` Jeevaka Badrappan
  2011-01-29 13:34 ` [PATCH 02/11] atmodem: remove NULL check Jeevaka Badrappan
                   ` (10 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Jeevaka Badrappan @ 2011-01-29 13:34 UTC (permalink / raw)
  To: ofono

[-- Attachment #1: Type: text/plain, Size: 546 bytes --]

---
 drivers/atmodem/atutil.h |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/drivers/atmodem/atutil.h b/drivers/atmodem/atutil.h
index 3d13b84..a27de86 100644
--- a/drivers/atmodem/atutil.h
+++ b/drivers/atmodem/atutil.h
@@ -84,10 +84,7 @@ static inline struct cb_data *cb_data_new(void *cb, void *data)
 {
 	struct cb_data *ret;
 
-	ret = g_try_new0(struct cb_data, 1);
-	if (ret == NULL)
-		return ret;
-
+	ret = g_new0(struct cb_data, 1);
 	ret->cb = cb;
 	ret->data = data;
 
-- 
1.7.0.4


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH 02/11] atmodem: remove NULL check
  2011-01-29 13:34 [PATCH 00/11] Remove NULL check for call back data Jeevaka Badrappan
  2011-01-29 13:34 ` [PATCH 01/11] atutil: use g_new0 for callback data memory Jeevaka Badrappan
@ 2011-01-29 13:34 ` Jeevaka Badrappan
  2011-01-29 13:34 ` [PATCH 03/11] calypsomodem: " Jeevaka Badrappan
                   ` (9 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Jeevaka Badrappan @ 2011-01-29 13:34 UTC (permalink / raw)
  To: ofono

[-- Attachment #1: Type: text/plain, Size: 29659 bytes --]

---
 drivers/atmodem/call-barring.c         |    6 ++--
 drivers/atmodem/call-forwarding.c      |    8 -----
 drivers/atmodem/call-meter.c           |   28 -------------------
 drivers/atmodem/call-settings.c        |   36 -------------------------
 drivers/atmodem/call-volume.c          |    8 -----
 drivers/atmodem/cbs.c                  |    8 -----
 drivers/atmodem/devinfo.c              |   16 -----------
 drivers/atmodem/gprs.c                 |    8 -----
 drivers/atmodem/network-registration.c |   24 ----------------
 drivers/atmodem/phonebook.c            |    4 ---
 drivers/atmodem/sim-auth.c             |    2 +-
 drivers/atmodem/sim.c                  |   46 ++-----------------------------
 drivers/atmodem/sms.c                  |   20 --------------
 drivers/atmodem/stk.c                  |    4 +-
 drivers/atmodem/ussd.c                 |    7 -----
 drivers/atmodem/voicecall.c            |    7 -----
 16 files changed, 9 insertions(+), 223 deletions(-)

diff --git a/drivers/atmodem/call-barring.c b/drivers/atmodem/call-barring.c
index 516b470..73820d2 100644
--- a/drivers/atmodem/call-barring.c
+++ b/drivers/atmodem/call-barring.c
@@ -86,7 +86,7 @@ static void at_call_barring_query(struct ofono_call_barring *cb,
 	struct cb_data *cbd = cb_data_new(callback, data);
 	char buf[64];
 
-	if (cbd == NULL || strlen(lock) != 2)
+	if (strlen(lock) != 2)
 		goto error;
 
 	snprintf(buf, sizeof(buf), "AT+CLCK=\"%s\",2", lock);
@@ -121,7 +121,7 @@ static void at_call_barring_set(struct ofono_call_barring *cb, const char *lock,
 	char buf[64];
 	int len;
 
-	if (cbd == NULL || strlen(lock) != 2 || (cls && passwd == NULL))
+	if (strlen(lock) != 2 || (cls && passwd == NULL))
 		goto error;
 
 	len = snprintf(buf, sizeof(buf), "AT+CLCK=\"%s\",%i", lock, enable);
@@ -164,7 +164,7 @@ static void at_call_barring_set_passwd(struct ofono_call_barring *cb,
 	struct cb_data *cbd = cb_data_new(callback, data);
 	char buf[64];
 
-	if (cbd == NULL || strlen(lock) != 2)
+	if (strlen(lock) != 2)
 		goto error;
 
 	snprintf(buf, sizeof(buf), "AT+CPWD=\"%s\",\"%s\",\"%s\"",
diff --git a/drivers/atmodem/call-forwarding.c b/drivers/atmodem/call-forwarding.c
index f11a68e..a5cbd59 100644
--- a/drivers/atmodem/call-forwarding.c
+++ b/drivers/atmodem/call-forwarding.c
@@ -128,9 +128,6 @@ static void at_ccfc_query(struct ofono_call_forwarding *cf, int type, int cls,
 	struct cb_data *cbd = cb_data_new(cb, data);
 	char buf[64];
 
-	if (cbd == NULL)
-		goto error;
-
 	cbd->user = GINT_TO_POINTER(cls);
 
 	if (cls == 7)
@@ -142,7 +139,6 @@ static void at_ccfc_query(struct ofono_call_forwarding *cf, int type, int cls,
 				ccfc_query_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, 0, NULL, data);
@@ -165,14 +161,10 @@ static void at_ccfc_set(struct ofono_call_forwarding *cf, const char *buf,
 	GAtChat *chat = ofono_call_forwarding_get_data(cf);
 	struct cb_data *cbd = cb_data_new(cb, data);
 
-	if (cbd == NULL)
-		goto error;
-
 	if (g_at_chat_send(chat, buf, none_prefix,
 				ccfc_set_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, data);
diff --git a/drivers/atmodem/call-meter.c b/drivers/atmodem/call-meter.c
index 3ab4706..2b91848 100644
--- a/drivers/atmodem/call-meter.c
+++ b/drivers/atmodem/call-meter.c
@@ -116,15 +116,11 @@ static void at_caoc_query(struct ofono_call_meter *cm,
 	GAtChat *chat = ofono_call_meter_get_data(cm);
 	struct cb_data *cbd = cb_data_new(cb, data);
 
-	if (cbd == NULL)
-		goto error;
-
 	cbd->user = "+CAOC:";
 	if (g_at_chat_send(chat, "AT+CAOC=0", caoc_prefix,
 				caoc_cacm_camm_query_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, -1, data);
@@ -137,15 +133,11 @@ static void at_cacm_query(struct ofono_call_meter *cm,
 	GAtChat *chat = ofono_call_meter_get_data(cm);
 	struct cb_data *cbd = cb_data_new(cb, data);
 
-	if (cbd == NULL)
-		goto error;
-
 	cbd->user = "+CACM:";
 	if (g_at_chat_send(chat, "AT+CACM?", cacm_prefix,
 				caoc_cacm_camm_query_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, -1, data);
@@ -169,16 +161,12 @@ static void at_cacm_set(struct ofono_call_meter *cm, const char *passwd,
 	struct cb_data *cbd = cb_data_new(cb, data);
 	char buf[64];
 
-	if (cbd == NULL)
-		goto error;
-
 	snprintf(buf, sizeof(buf), "AT+CACM=\"%s\"", passwd);
 
 	if (g_at_chat_send(chat, buf, none_prefix,
 				generic_set_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, data);
@@ -191,15 +179,11 @@ static void at_camm_query(struct ofono_call_meter *cm,
 	GAtChat *chat = ofono_call_meter_get_data(cm);
 	struct cb_data *cbd = cb_data_new(cb, data);
 
-	if (cbd == NULL)
-		goto error;
-
 	cbd->user = "+CAMM:";
 	if (g_at_chat_send(chat, "AT+CAMM?", camm_prefix,
 				caoc_cacm_camm_query_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, -1, data);
@@ -213,16 +197,12 @@ static void at_camm_set(struct ofono_call_meter *cm,
 	struct cb_data *cbd = cb_data_new(cb, data);
 	char buf[64];
 
-	if (cbd == NULL)
-		goto error;
-
 	snprintf(buf, sizeof(buf), "AT+CAMM=\"%06X\",\"%s\"", accmax, passwd);
 
 	if (g_at_chat_send(chat, buf, none_prefix,
 				generic_set_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, data);
@@ -274,15 +254,11 @@ static void at_cpuc_query(struct ofono_call_meter *cm,
 	GAtChat *chat = ofono_call_meter_get_data(cm);
 	struct cb_data *cbd = cb_data_new(cb, data);
 
-	if (cbd == NULL)
-		goto error;
-
 	cbd->user = "+CPUC:";
 	if (g_at_chat_send(chat, "AT+CPUC?", cpuc_prefix,
 				cpuc_query_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, 0, 0, data);
@@ -296,9 +272,6 @@ static void at_cpuc_set(struct ofono_call_meter *cm, const char *currency,
 	struct cb_data *cbd = cb_data_new(cb, data);
 	char buf[64];
 
-	if (cbd == NULL)
-		goto error;
-
 	snprintf(buf, sizeof(buf), "AT+CPUC=\"%s\",\"%f\",\"%s\"",
 			currency, ppu, passwd);
 
@@ -306,7 +279,6 @@ static void at_cpuc_set(struct ofono_call_meter *cm, const char *currency,
 				generic_set_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, data);
diff --git a/drivers/atmodem/call-settings.c b/drivers/atmodem/call-settings.c
index 5cea233..7e4d92a 100644
--- a/drivers/atmodem/call-settings.c
+++ b/drivers/atmodem/call-settings.c
@@ -86,9 +86,6 @@ static void at_ccwa_query(struct ofono_call_settings *cs, int cls,
 	struct cb_data *cbd = cb_data_new(cb, data);
 	char buf[64];
 
-	if (cbd == NULL)
-		goto error;
-
 	cbd->user = GINT_TO_POINTER(cls);
 
 	if (cls == 7)
@@ -100,7 +97,6 @@ static void at_ccwa_query(struct ofono_call_settings *cs, int cls,
 				ccwa_query_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, 0, data);
@@ -124,16 +120,12 @@ static void at_ccwa_set(struct ofono_call_settings *cs, int mode, int cls,
 	struct cb_data *cbd = cb_data_new(cb, data);
 	char buf[64];
 
-	if (cbd == NULL)
-		goto error;
-
 	snprintf(buf, sizeof(buf), "AT+CCWA=1,%d,%d", mode, cls);
 
 	if (g_at_chat_send(chat, buf, none_prefix,
 				ccwa_set_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, data);
@@ -187,14 +179,10 @@ static void at_clip_query(struct ofono_call_settings *cs,
 	GAtChat *chat = ofono_call_settings_get_data(cs);
 	struct cb_data *cbd = cb_data_new(cb, data);
 
-	if (cbd == NULL)
-		goto error;
-
 	if (g_at_chat_send(chat, "AT+CLIP?", clip_prefix,
 				clip_query_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, -1, data);
@@ -211,14 +199,10 @@ static void at_cdip_query(struct ofono_call_settings *cs,
 	GAtChat *chat = ofono_call_settings_get_data(cs);
 	struct cb_data *cbd = cb_data_new(cb, data);
 
-	if (cbd == NULL)
-		goto error;
-
 	if (g_at_chat_send(chat, "AT+CDIP?", cdip_prefix,
 				cdip_query_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, -1, data);
@@ -235,14 +219,10 @@ static void at_cnap_query(struct ofono_call_settings *cs,
 	GAtChat *chat = ofono_call_settings_get_data(cs);
 	struct cb_data *cbd = cb_data_new(cb, data);
 
-	if (cbd == NULL)
-		goto error;
-
 	if (g_at_chat_send(chat, "AT+CNAP?", cnap_prefix,
 				cnap_query_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, -1, data);
@@ -259,14 +239,10 @@ static void at_colp_query(struct ofono_call_settings *cs,
 	GAtChat *chat = ofono_call_settings_get_data(cs);
 	struct cb_data *cbd = cb_data_new(cb, data);
 
-	if (cbd == NULL)
-		goto error;
-
 	if (g_at_chat_send(chat, "AT+COLP?", colp_prefix,
 				colp_query_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, -1, data);
@@ -308,14 +284,10 @@ static void at_clir_query(struct ofono_call_settings *cs,
 	GAtChat *chat = ofono_call_settings_get_data(cs);
 	struct cb_data *cbd = cb_data_new(cb, data);
 
-	if (cbd == NULL)
-		goto error;
-
 	if (g_at_chat_send(chat, "AT+CLIR?", clir_prefix,
 				clir_query_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, -1, -1, data);
@@ -339,16 +311,12 @@ static void at_clir_set(struct ofono_call_settings *cs, int mode,
 	struct cb_data *cbd = cb_data_new(cb, data);
 	char buf[64];
 
-	if (cbd == NULL)
-		goto error;
-
 	snprintf(buf, sizeof(buf), "AT+CLIR=%d", mode);
 
 	if (g_at_chat_send(chat, buf, none_prefix,
 				clir_set_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, data);
@@ -392,14 +360,10 @@ static void at_colr_query(struct ofono_call_settings *cs,
 	GAtChat *chat = ofono_call_settings_get_data(cs);
 	struct cb_data *cbd = cb_data_new(cb, data);
 
-	if (cbd == NULL)
-		goto error;
-
 	if (g_at_chat_send(chat, "AT+COLR", colr_prefix,
 				colr_query_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, -1, data);
diff --git a/drivers/atmodem/call-volume.c b/drivers/atmodem/call-volume.c
index d3910d4..6d87276 100644
--- a/drivers/atmodem/call-volume.c
+++ b/drivers/atmodem/call-volume.c
@@ -138,9 +138,6 @@ static void at_call_volume_speaker_volume(struct ofono_call_volume *cv,
 	char buf[64];
 	int level;
 
-	if (cbd == NULL)
-		goto error;
-
 	level = ((cvd->clvl_max - cvd->clvl_min) *
 			percent) / 100 + cvd->clvl_min;
 
@@ -150,7 +147,6 @@ static void at_call_volume_speaker_volume(struct ofono_call_volume *cv,
 				cv_generic_set_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, data);
@@ -163,16 +159,12 @@ static void at_call_volume_mute(struct ofono_call_volume *cv, int muted,
 	struct cb_data *cbd = cb_data_new(cb, data);
 	char buf[64];
 
-	if (cbd == NULL)
-		goto error;
-
 	snprintf(buf, sizeof(buf), "AT+CMUT=%d", muted);
 
 	if (g_at_chat_send(cvd->chat, buf, none_prefix,
 				cv_generic_set_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, data);
diff --git a/drivers/atmodem/cbs.c b/drivers/atmodem/cbs.c
index 9b5ae6c..8cc3ef0 100644
--- a/drivers/atmodem/cbs.c
+++ b/drivers/atmodem/cbs.c
@@ -115,9 +115,6 @@ static void at_cbs_set_topics(struct ofono_cbs *cbs, const char *topics,
 
 	DBG("");
 
-	if (cbd == NULL)
-		goto error;
-
 	/* For the Qualcomm based devices it is required to clear
 	 * the list of topics first.  Otherwise setting the new
 	 * topic ranges will fail.
@@ -145,7 +142,6 @@ static void at_cbs_set_topics(struct ofono_cbs *cbs, const char *topics,
 	if (id > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, user_data);
@@ -160,9 +156,6 @@ static void at_cbs_clear_topics(struct ofono_cbs *cbs,
 
 	DBG("");
 
-	if (cbd == NULL)
-		goto error;
-
 	if (data->cscb_mode_1)
 		snprintf(buf, sizeof(buf), "AT+CSCB=1,\"0-65535\"");
 	else
@@ -172,7 +165,6 @@ static void at_cbs_clear_topics(struct ofono_cbs *cbs,
 				at_cscb_set_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, user_data);
diff --git a/drivers/atmodem/devinfo.c b/drivers/atmodem/devinfo.c
index 8d0830b..4c802f1 100644
--- a/drivers/atmodem/devinfo.c
+++ b/drivers/atmodem/devinfo.c
@@ -64,15 +64,11 @@ static void at_query_manufacturer(struct ofono_devinfo *info,
 	struct cb_data *cbd = cb_data_new(cb, data);
 	GAtChat *chat = ofono_devinfo_get_data(info);
 
-	if (cbd == NULL)
-		goto error;
-
 	cbd->user = "+CGMI:";
 
 	if (g_at_chat_send(chat, "AT+CGMI", NULL, attr_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, NULL, data);
@@ -84,15 +80,11 @@ static void at_query_model(struct ofono_devinfo *info,
 	struct cb_data *cbd = cb_data_new(cb, data);
 	GAtChat *chat = ofono_devinfo_get_data(info);
 
-	if (cbd == NULL)
-		goto error;
-
 	cbd->user = "+CGMM:";
 
 	if (g_at_chat_send(chat, "AT+CGMM", NULL, attr_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, NULL, data);
@@ -104,15 +96,11 @@ static void at_query_revision(struct ofono_devinfo *info,
 	struct cb_data *cbd = cb_data_new(cb, data);
 	GAtChat *chat = ofono_devinfo_get_data(info);
 
-	if (cbd == NULL)
-		goto error;
-
 	cbd->user = "+CGMR:";
 
 	if (g_at_chat_send(chat, "AT+CGMR", NULL, attr_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, NULL, data);
@@ -124,15 +112,11 @@ static void at_query_serial(struct ofono_devinfo *info,
 	struct cb_data *cbd = cb_data_new(cb, data);
 	GAtChat *chat = ofono_devinfo_get_data(info);
 
-	if (cbd == NULL)
-		goto error;
-
 	cbd->user = "+CGSN:";
 
 	if (g_at_chat_send(chat, "AT+CGSN", NULL, attr_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, NULL, data);
diff --git a/drivers/atmodem/gprs.c b/drivers/atmodem/gprs.c
index 0127a3a..6e01994 100644
--- a/drivers/atmodem/gprs.c
+++ b/drivers/atmodem/gprs.c
@@ -69,16 +69,12 @@ static void at_gprs_set_attached(struct ofono_gprs *gprs, int attached,
 	struct cb_data *cbd = cb_data_new(cb, data);
 	char buf[64];
 
-	if (cbd == NULL)
-		goto error;
-
 	snprintf(buf, sizeof(buf), "AT+CGATT=%i", attached ? 1 : 0);
 
 	if (g_at_chat_send(gd->chat, buf, none_prefix,
 				at_cgatt_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, data);
@@ -115,9 +111,6 @@ static void at_gprs_registration_status(struct ofono_gprs *gprs,
 	struct gprs_data *gd = ofono_gprs_get_data(gprs);
 	struct cb_data *cbd = cb_data_new(cb, data);
 
-	if (cbd == NULL)
-		goto error;
-
 	cbd->user = gd;
 
 	switch (gd->vendor) {
@@ -143,7 +136,6 @@ static void at_gprs_registration_status(struct ofono_gprs *gprs,
 				at_cgreg_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, -1, data);
diff --git a/drivers/atmodem/network-registration.c b/drivers/atmodem/network-registration.c
index 7b04f19..4913611 100644
--- a/drivers/atmodem/network-registration.c
+++ b/drivers/atmodem/network-registration.c
@@ -186,9 +186,6 @@ static void at_registration_status(struct ofono_netreg *netreg,
 	struct netreg_data *nd = ofono_netreg_get_data(netreg);
 	struct cb_data *cbd = cb_data_new(cb, data);
 
-	if (cbd == NULL)
-		goto error;
-
 	cbd->user = nd;
 
 	switch (nd->vendor) {
@@ -232,7 +229,6 @@ static void at_registration_status(struct ofono_netreg *netreg,
 				at_creg_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, -1, -1, -1, -1, data);
@@ -361,9 +357,6 @@ static void at_current_operator(struct ofono_netreg *netreg,
 	struct cb_data *cbd = cb_data_new(cb, data);
 	gboolean ok;
 
-	if (cbd == NULL)
-		goto error;
-
 	cbd->user = netreg;
 
 	/* Nokia modems have a broken return value for the string
@@ -388,7 +381,6 @@ static void at_current_operator(struct ofono_netreg *netreg,
 	if (ok)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, NULL, data);
@@ -503,14 +495,10 @@ static void at_list_operators(struct ofono_netreg *netreg,
 	struct netreg_data *nd = ofono_netreg_get_data(netreg);
 	struct cb_data *cbd = cb_data_new(cb, data);
 
-	if (cbd == NULL)
-		goto error;
-
 	if (g_at_chat_send(nd->chat, "AT+COPS=?", cops_prefix,
 				cops_list_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, 0, NULL, data);
@@ -533,14 +521,10 @@ static void at_register_auto(struct ofono_netreg *netreg,
 	struct netreg_data *nd = ofono_netreg_get_data(netreg);
 	struct cb_data *cbd = cb_data_new(cb, data);
 
-	if (cbd == NULL)
-		goto error;
-
 	if (g_at_chat_send(nd->chat, "AT+COPS=0", none_prefix,
 				register_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, data);
@@ -554,16 +538,12 @@ static void at_register_manual(struct ofono_netreg *netreg,
 	struct cb_data *cbd = cb_data_new(cb, data);
 	char buf[128];
 
-	if (cbd == NULL)
-		goto error;
-
 	snprintf(buf, sizeof(buf), "AT+COPS=1,2,\"%s%s\"", mcc, mnc);
 
 	if (g_at_chat_send(nd->chat, buf, none_prefix,
 				register_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, data);
@@ -858,9 +838,6 @@ static void at_signal_strength(struct ofono_netreg *netreg,
 	struct netreg_data *nd = ofono_netreg_get_data(netreg);
 	struct cb_data *cbd = cb_data_new(cb, data);
 
-	if (cbd == NULL)
-		goto error;
-
 	cbd->user = nd;
 
 	/*
@@ -877,7 +854,6 @@ static void at_signal_strength(struct ofono_netreg *netreg,
 			return;
 	}
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, -1, data);
diff --git a/drivers/atmodem/phonebook.c b/drivers/atmodem/phonebook.c
index 64aa05e..97213db 100644
--- a/drivers/atmodem/phonebook.c
+++ b/drivers/atmodem/phonebook.c
@@ -368,9 +368,6 @@ static void at_export_entries(struct ofono_phonebook *pb, const char *storage,
 	struct cb_data *cbd = cb_data_new(cb, data);
 	char buf[32];
 
-	if (cbd == NULL)
-		goto error;
-
 	cbd->user = pb;
 
 	snprintf(buf, sizeof(buf), "AT+CPBS=\"%s\"", storage);
@@ -378,7 +375,6 @@ static void at_export_entries(struct ofono_phonebook *pb, const char *storage,
 				at_select_storage_cb, cbd, NULL) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, data);
diff --git a/drivers/atmodem/sim-auth.c b/drivers/atmodem/sim-auth.c
index 3b636bd..9ce810f 100644
--- a/drivers/atmodem/sim-auth.c
+++ b/drivers/atmodem/sim-auth.c
@@ -101,7 +101,7 @@ static void at_discover_apps(struct ofono_sim_auth *sa,
 	struct sim_auth_data *sad = ofono_sim_auth_get_data(sa);
 	struct cb_data *cbd = cb_data_new(cb, data);
 
-	if (cbd && g_at_chat_send(sad->chat, "AT+CUAD", cuad_prefix,
+	if (g_at_chat_send(sad->chat, "AT+CUAD", cuad_prefix,
 					at_discover_apps_cb, cbd, g_free) > 0)
 		return;
 
diff --git a/drivers/atmodem/sim.c b/drivers/atmodem/sim.c
index 548a95c..819864f 100644
--- a/drivers/atmodem/sim.c
+++ b/drivers/atmodem/sim.c
@@ -142,8 +142,6 @@ static void at_sim_read_info(struct ofono_sim *sim, int fileid,
 	}
 
 	cbd = cb_data_new(cb, data);
-	if (cbd == NULL)
-		goto error;
 
 	snprintf(buf, sizeof(buf), "AT+CRSM=192,%i", fileid);
 
@@ -159,7 +157,6 @@ static void at_sim_read_info(struct ofono_sim *sim, int fileid,
 				at_crsm_info_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	CALLBACK_WITH_FAILURE(cb, -1, -1, -1, NULL,
 				EF_STATUS_INVALIDATED, data);
 }
@@ -220,9 +217,6 @@ static void at_sim_read_binary(struct ofono_sim *sim, int fileid,
 	struct cb_data *cbd = cb_data_new(cb, data);
 	char buf[64];
 
-	if (cbd == NULL)
-		goto error;
-
 	snprintf(buf, sizeof(buf), "AT+CRSM=176,%i,%i,%i,%i", fileid,
 			start >> 8, start & 0xff, length);
 
@@ -230,7 +224,6 @@ static void at_sim_read_binary(struct ofono_sim *sim, int fileid,
 				at_crsm_read_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, NULL, 0, data);
@@ -244,9 +237,6 @@ static void at_sim_read_record(struct ofono_sim *sim, int fileid,
 	struct cb_data *cbd = cb_data_new(cb, data);
 	char buf[64];
 
-	if (cbd == NULL)
-		goto error;
-
 	snprintf(buf, sizeof(buf), "AT+CRSM=178,%i,%i,4,%i", fileid,
 			record, length);
 
@@ -254,7 +244,6 @@ static void at_sim_read_record(struct ofono_sim *sim, int fileid,
 				at_crsm_read_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, NULL, 0, data);
@@ -309,7 +298,7 @@ static void at_sim_update_binary(struct ofono_sim *sim, int fileid,
 	char *buf = g_try_new(char, 36 + length * 2);
 	int len, ret;
 
-	if (cbd == NULL || buf == NULL)
+	if (buf == NULL)
 		goto error;
 
 	len = sprintf(buf, "AT+CRSM=214,%i,%i,%i,%i,", fileid,
@@ -342,7 +331,7 @@ static void at_sim_update_record(struct ofono_sim *sim, int fileid,
 	char *buf = g_try_new(char, 36 + length * 2);
 	int len, ret;
 
-	if (cbd == NULL || buf == NULL)
+	if (buf == NULL)
 		goto error;
 
 	len = sprintf(buf, "AT+CRSM=220,%i,%i,4,%i,", fileid,
@@ -374,7 +363,7 @@ static void at_sim_update_cyclic(struct ofono_sim *sim, int fileid,
 	char *buf = g_try_new(char, 36 + length * 2);
 	int len, ret;
 
-	if (cbd == NULL || buf == NULL)
+	if (buf == NULL)
 		goto error;
 
 	len = sprintf(buf, "AT+CRSM=220,%i,0,3,%i,", fileid, length);
@@ -430,14 +419,10 @@ static void at_read_imsi(struct ofono_sim *sim, ofono_sim_imsi_cb_t cb,
 	struct sim_data *sd = ofono_sim_get_data(sim);
 	struct cb_data *cbd = cb_data_new(cb, data);
 
-	if (cbd == NULL)
-		goto error;
-
 	if (g_at_chat_send(sd->chat, "AT+CIMI", NULL,
 				at_cimi_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, NULL, data);
@@ -576,9 +561,6 @@ static void at_pin_retries_query(struct ofono_sim *sim,
 
 	DBG("");
 
-	if (cbd == NULL)
-		goto error;
-
 	switch (sd->vendor) {
 	case OFONO_VENDOR_IFX:
 		if (g_at_chat_send(sd->chat, "AT+XPINCNT", xpincnt_prefix,
@@ -596,7 +578,6 @@ static void at_pin_retries_query(struct ofono_sim *sim,
 		break;
 	}
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, NULL, data);
@@ -663,16 +644,12 @@ static void at_pin_query(struct ofono_sim *sim, ofono_sim_passwd_cb_t cb,
 	struct sim_data *sd = ofono_sim_get_data(sim);
 	struct cb_data *cbd = cb_data_new(cb, data);
 
-	if (cbd == NULL)
-		goto error;
-
 	cbd->user = sim;
 
 	if (g_at_chat_send(sd->chat, "AT+CPIN?", cpin_prefix,
 				at_cpin_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, -1, data);
@@ -772,9 +749,6 @@ static void at_pin_send(struct ofono_sim *sim, const char *passwd,
 	char buf[64];
 	int ret;
 
-	if (cbd == NULL)
-		goto error;
-
 	cbd->user = sd;
 
 	snprintf(buf, sizeof(buf), "AT+CPIN=\"%s\"", passwd);
@@ -787,7 +761,6 @@ static void at_pin_send(struct ofono_sim *sim, const char *passwd,
 	if (ret > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, data);
@@ -802,9 +775,6 @@ static void at_pin_send_puk(struct ofono_sim *sim, const char *puk,
 	char buf[64];
 	int ret;
 
-	if (cbd == NULL)
-		goto error;
-
 	cbd->user = sd;
 
 	snprintf(buf, sizeof(buf), "AT+CPIN=\"%s\",\"%s\"", puk, passwd);
@@ -817,7 +787,6 @@ static void at_pin_send_puk(struct ofono_sim *sim, const char *puk,
 	if (ret > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, data);
@@ -857,9 +826,6 @@ static void at_pin_enable(struct ofono_sim *sim,
 	int ret;
 	unsigned int len = sizeof(at_clck_cpwd_fac) / sizeof(*at_clck_cpwd_fac);
 
-	if (cbd == NULL)
-		goto error;
-
 	if (passwd_type >= len || at_clck_cpwd_fac[passwd_type] == NULL)
 		goto error;
 
@@ -891,9 +857,6 @@ static void at_change_passwd(struct ofono_sim *sim,
 	int ret;
 	unsigned int len = sizeof(at_clck_cpwd_fac) / sizeof(*at_clck_cpwd_fac);
 
-	if (cbd == NULL)
-		goto error;
-
 	if (passwd_type >= len ||
 			at_clck_cpwd_fac[passwd_type] == NULL)
 		goto error;
@@ -954,9 +917,6 @@ static void at_pin_query_enabled(struct ofono_sim *sim,
 	char buf[64];
 	unsigned int len = sizeof(at_clck_cpwd_fac) / sizeof(*at_clck_cpwd_fac);
 
-	if (cbd == NULL)
-		goto error;
-
 	if (passwd_type >= len || at_clck_cpwd_fac[passwd_type] == NULL)
 		goto error;
 
diff --git a/drivers/atmodem/sms.c b/drivers/atmodem/sms.c
index 83006eb..9385fbb 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);
diff --git a/drivers/atmodem/stk.c b/drivers/atmodem/stk.c
index 4de3042..a3b7526 100644
--- a/drivers/atmodem/stk.c
+++ b/drivers/atmodem/stk.c
@@ -153,7 +153,7 @@ static void at_stk_envelope(struct ofono_stk *stk, int length,
 	char *buf = g_try_new(char, 64 + length * 2);
 	int len, ret;
 
-	if (cbd == NULL || buf == NULL)
+	if (buf == NULL)
 		goto error;
 
 	len = sprintf(buf, "AT+CSIM=%i,A0C20000%02hhX",
@@ -236,7 +236,7 @@ static void at_stk_terminal_response(struct ofono_stk *stk, int length,
 	char *buf = g_try_new(char, 64 + length * 2);
 	int len, ret;
 
-	if (cbd == NULL || buf == NULL)
+	if (buf == NULL)
 		goto error;
 
 	len = sprintf(buf, "AT+CSIM=%i,A0140000%02hhX",
diff --git a/drivers/atmodem/ussd.c b/drivers/atmodem/ussd.c
index 8b42926..f8cde2d 100644
--- a/drivers/atmodem/ussd.c
+++ b/drivers/atmodem/ussd.c
@@ -187,9 +187,6 @@ static void at_ussd_request(struct ofono_ussd *ussd, int dcs,
 	char buf[512];
 	enum sms_charset charset;
 
-	if (cbd == NULL)
-		goto error;
-
 	cbd->user = ussd;
 
 	if (!cbs_dcs_decode(dcs, NULL, NULL, &charset,
@@ -273,16 +270,12 @@ static void at_ussd_cancel(struct ofono_ussd *ussd,
 	struct ussd_data *data = ofono_ussd_get_data(ussd);
 	struct cb_data *cbd = cb_data_new(cb, user_data);
 
-	if (cbd == NULL)
-		goto error;
-
 	cbd->user = data;
 
 	if (g_at_chat_send(data->chat, "AT+CUSD=2", none_prefix,
 				cusd_cancel_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, user_data);
diff --git a/drivers/atmodem/voicecall.c b/drivers/atmodem/voicecall.c
index 10cac42..a64269d 100644
--- a/drivers/atmodem/voicecall.c
+++ b/drivers/atmodem/voicecall.c
@@ -374,9 +374,6 @@ static void at_dial(struct ofono_voicecall *vc,
 	struct cb_data *cbd = cb_data_new(cb, data);
 	char buf[256];
 
-	if (cbd == NULL)
-		goto error;
-
 	cbd->user = vc;
 
 	if (ph->type == 145)
@@ -401,7 +398,6 @@ static void at_dial(struct ofono_voicecall *vc,
 				atd_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, data);
@@ -598,9 +594,6 @@ static void at_send_dtmf(struct ofono_voicecall *vc, const char *dtmf,
 	int i;
 	char *buf;
 
-	if (cbd == NULL)
-		goto error;
-
 	cbd->user = vd;
 
 	/* strlen("+VTS=T;") = 7 + initial AT + null */
-- 
1.7.0.4


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH 03/11] calypsomodem: remove NULL check
  2011-01-29 13:34 [PATCH 00/11] Remove NULL check for call back data Jeevaka Badrappan
  2011-01-29 13:34 ` [PATCH 01/11] atutil: use g_new0 for callback data memory Jeevaka Badrappan
  2011-01-29 13:34 ` [PATCH 02/11] atmodem: remove NULL check Jeevaka Badrappan
@ 2011-01-29 13:34 ` Jeevaka Badrappan
  2011-01-29 13:34 ` [PATCH 04/11] hfpmodem: " Jeevaka Badrappan
                   ` (8 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Jeevaka Badrappan @ 2011-01-29 13:34 UTC (permalink / raw)
  To: ofono

[-- Attachment #1: Type: text/plain, Size: 1396 bytes --]

---
 drivers/calypsomodem/stk.c       |    4 ++--
 drivers/calypsomodem/voicecall.c |    4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/calypsomodem/stk.c b/drivers/calypsomodem/stk.c
index 196b9e3..83287f9 100644
--- a/drivers/calypsomodem/stk.c
+++ b/drivers/calypsomodem/stk.c
@@ -101,7 +101,7 @@ static void calypso_stk_envelope(struct ofono_stk *stk, int length,
 
 	DBG("");
 
-	if (cbd == NULL || buf == NULL)
+	if (buf == NULL)
 		goto error;
 
 	len = sprintf(buf, "AT%%SATE=\"");
@@ -148,7 +148,7 @@ static void calypso_stk_terminal_response(struct ofono_stk *stk, int length,
 
 	DBG("");
 
-	if (cbd == NULL || buf == NULL)
+	if (buf == NULL)
 		goto error;
 
 	len = sprintf(buf, "AT%%SATR=\"");
diff --git a/drivers/calypsomodem/voicecall.c b/drivers/calypsomodem/voicecall.c
index 204ed14..01be990 100644
--- a/drivers/calypsomodem/voicecall.c
+++ b/drivers/calypsomodem/voicecall.c
@@ -64,14 +64,10 @@ static void calypso_template(struct ofono_voicecall *vc, const char *cmd,
 	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
 	struct cb_data *cbd = cb_data_new(cb, data);
 
-	if (cbd == NULL)
-		goto error;
-
 	if (g_at_chat_send(vd->chat, cmd, none_prefix,
 				calypso_generic_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, data);
-- 
1.7.0.4


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH 04/11] hfpmodem: remove NULL check
  2011-01-29 13:34 [PATCH 00/11] Remove NULL check for call back data Jeevaka Badrappan
                   ` (2 preceding siblings ...)
  2011-01-29 13:34 ` [PATCH 03/11] calypsomodem: " Jeevaka Badrappan
@ 2011-01-29 13:34 ` Jeevaka Badrappan
  2011-01-29 13:34 ` [PATCH 05/11] hsomodem: " Jeevaka Badrappan
                   ` (7 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Jeevaka Badrappan @ 2011-01-29 13:34 UTC (permalink / raw)
  To: ofono

[-- Attachment #1: Type: text/plain, Size: 3571 bytes --]

---
 drivers/hfpmodem/call-volume.c          |    8 --------
 drivers/hfpmodem/network-registration.c |   12 ------------
 drivers/hfpmodem/voicecall.c            |    4 ----
 3 files changed, 0 insertions(+), 24 deletions(-)

diff --git a/drivers/hfpmodem/call-volume.c b/drivers/hfpmodem/call-volume.c
index 19f57c4..ee4e352 100644
--- a/drivers/hfpmodem/call-volume.c
+++ b/drivers/hfpmodem/call-volume.c
@@ -73,9 +73,6 @@ static void hfp_speaker_volume(struct ofono_call_volume *cv,
 	struct cb_data *cbd = cb_data_new(cb, data);
 	char buf[64];
 
-	if (cbd == NULL)
-		goto error;
-
 	vd->sp_volume = percent;
 
 	snprintf(buf, sizeof(buf), "AT+VGS=%d",
@@ -85,7 +82,6 @@ static void hfp_speaker_volume(struct ofono_call_volume *cv,
 				cv_generic_set_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, data);
@@ -100,9 +96,6 @@ static void hfp_microphone_volume(struct ofono_call_volume *cv,
 	struct cb_data *cbd = cb_data_new(cb, data);
 	char buf[64];
 
-	if (cbd == NULL)
-		goto error;
-
 	vd->mic_volume = percent;
 
 	snprintf(buf, sizeof(buf), "AT+VGM=%d",
@@ -112,7 +105,6 @@ static void hfp_microphone_volume(struct ofono_call_volume *cv,
 				cv_generic_set_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, data);
diff --git a/drivers/hfpmodem/network-registration.c b/drivers/hfpmodem/network-registration.c
index 273490e..23852e7 100644
--- a/drivers/hfpmodem/network-registration.c
+++ b/drivers/hfpmodem/network-registration.c
@@ -236,9 +236,6 @@ static void hfp_registration_status(struct ofono_netreg *netreg,
 	struct cb_data *cbd = cb_data_new(cb, data);
 	gboolean ok;
 
-	if (cbd == NULL)
-		goto error;
-
 	cbd->user = netreg;
 
 	ok = g_at_chat_send(nd->chat, "AT+CIND?", cind_prefix,
@@ -246,7 +243,6 @@ static void hfp_registration_status(struct ofono_netreg *netreg,
 	if (ok)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, -1, -1, -1, -1, data);
@@ -259,9 +255,6 @@ static void hfp_current_operator(struct ofono_netreg *netreg,
 	struct cb_data *cbd = cb_data_new(cb, data);
 	gboolean ok;
 
-	if (cbd == NULL)
-		goto error;
-
 	cbd->user = netreg;
 
 	ok = g_at_chat_send(nd->chat, "AT+COPS=3,0", NULL,
@@ -274,7 +267,6 @@ static void hfp_current_operator(struct ofono_netreg *netreg,
 	if (ok)
 		return;
 
-error:
 	CALLBACK_WITH_FAILURE(cb, NULL, data);
 }
 
@@ -284,16 +276,12 @@ static void hfp_signal_strength(struct ofono_netreg *netreg,
 	struct netreg_data *nd = ofono_netreg_get_data(netreg);
 	struct cb_data *cbd = cb_data_new(cb, data);
 
-	if (cbd == NULL)
-		goto error;
-
 	cbd->user = netreg;
 
 	if (g_at_chat_send(nd->chat, "AT+CIND?", cind_prefix,
 				signal_strength_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, -1, data);
diff --git a/drivers/hfpmodem/voicecall.c b/drivers/hfpmodem/voicecall.c
index d12a5ef..b9bee62 100644
--- a/drivers/hfpmodem/voicecall.c
+++ b/drivers/hfpmodem/voicecall.c
@@ -362,9 +362,6 @@ static void hfp_dial(struct ofono_voicecall *vc,
 	struct cb_data *cbd = cb_data_new(cb, data);
 	char buf[256];
 
-	if (cbd == NULL)
-		goto error;
-
 	cbd->user = vc;
 	if (ph->type == 145)
 		snprintf(buf, sizeof(buf), "ATD+%s", ph->number);
@@ -377,7 +374,6 @@ static void hfp_dial(struct ofono_voicecall *vc,
 				atd_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, data);
-- 
1.7.0.4


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH 05/11] hsomodem: remove NULL check
  2011-01-29 13:34 [PATCH 00/11] Remove NULL check for call back data Jeevaka Badrappan
                   ` (3 preceding siblings ...)
  2011-01-29 13:34 ` [PATCH 04/11] hfpmodem: " Jeevaka Badrappan
@ 2011-01-29 13:34 ` Jeevaka Badrappan
  2011-01-29 13:34 ` [PATCH 06/11] huaweimodem: " Jeevaka Badrappan
                   ` (6 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Jeevaka Badrappan @ 2011-01-29 13:34 UTC (permalink / raw)
  To: ofono

[-- Attachment #1: Type: text/plain, Size: 1039 bytes --]

---
 drivers/hsomodem/gprs-context.c |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/drivers/hsomodem/gprs-context.c b/drivers/hsomodem/gprs-context.c
index d140d2e..c132846 100644
--- a/drivers/hsomodem/gprs-context.c
+++ b/drivers/hsomodem/gprs-context.c
@@ -156,9 +156,6 @@ static void hso_gprs_activate_primary(struct ofono_gprs_context *gc,
 	char buf[AUTH_BUF_LENGTH];
 	int len;
 
-	if (cbd == NULL)
-		goto error;
-
 	gcd->active_context = ctx->cid;
 
 	cbd->user = gc;
@@ -200,9 +197,6 @@ static void hso_gprs_deactivate_primary(struct ofono_gprs_context *gc,
 	struct cb_data *cbd = cb_data_new(cb, data);
 	char buf[128];
 
-	if (cbd == NULL)
-		goto error;
-
 	cbd->user = gc;
 
 	snprintf(buf, sizeof(buf), "AT_OWANCALL=%u,0,1", cid);
@@ -211,7 +205,6 @@ static void hso_gprs_deactivate_primary(struct ofono_gprs_context *gc,
 				at_owancall_down_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, data);
-- 
1.7.0.4


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH 06/11] huaweimodem: remove NULL check
  2011-01-29 13:34 [PATCH 00/11] Remove NULL check for call back data Jeevaka Badrappan
                   ` (4 preceding siblings ...)
  2011-01-29 13:34 ` [PATCH 05/11] hsomodem: " Jeevaka Badrappan
@ 2011-01-29 13:34 ` Jeevaka Badrappan
  2011-01-29 13:34 ` [PATCH 07/11] ifxmodem: " Jeevaka Badrappan
                   ` (5 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Jeevaka Badrappan @ 2011-01-29 13:34 UTC (permalink / raw)
  To: ofono

[-- Attachment #1: Type: text/plain, Size: 1909 bytes --]

---
 drivers/huaweimodem/gprs-context.c |    8 --------
 drivers/huaweimodem/voicecall.c    |    4 ----
 2 files changed, 0 insertions(+), 12 deletions(-)

diff --git a/drivers/huaweimodem/gprs-context.c b/drivers/huaweimodem/gprs-context.c
index 30f423b..bbc9c96 100644
--- a/drivers/huaweimodem/gprs-context.c
+++ b/drivers/huaweimodem/gprs-context.c
@@ -311,9 +311,6 @@ static void huawei_gprs_activate_primary(struct ofono_gprs_context *gc,
 
 	DBG("cid %u", ctx->cid);
 
-	if (cbd == NULL)
-		goto error;
-
 	gcd->active_context = ctx->cid;
 
 	cbd->user = gc;
@@ -328,7 +325,6 @@ static void huawei_gprs_activate_primary(struct ofono_gprs_context *gc,
 				at_cgdcont_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, NULL, 0, NULL, NULL, NULL, NULL, data);
@@ -344,9 +340,6 @@ static void huawei_gprs_deactivate_primary(struct ofono_gprs_context *gc,
 
 	DBG("cid %u", cid);
 
-	if (cbd == NULL)
-		goto error;
-
 	cbd->user = gc;
 
 	snprintf(buf, sizeof(buf), "AT^NDISDUP=%u,0", cid);
@@ -355,7 +348,6 @@ static void huawei_gprs_deactivate_primary(struct ofono_gprs_context *gc,
 				at_ndisdup_down_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, data);
diff --git a/drivers/huaweimodem/voicecall.c b/drivers/huaweimodem/voicecall.c
index aef2a11..a30513a 100644
--- a/drivers/huaweimodem/voicecall.c
+++ b/drivers/huaweimodem/voicecall.c
@@ -99,14 +99,10 @@ static void huawei_template(struct ofono_voicecall *vc, const char *cmd,
 	struct voicecall_data *vd = ofono_voicecall_get_data(vc);
 	struct cb_data *cbd = cb_data_new(cb, data);
 
-	if (cbd == NULL)
-		goto error;
-
 	if (g_at_chat_send(vd->chat, cmd, none_prefix,
 				huawei_generic_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, data);
-- 
1.7.0.4


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH 07/11] ifxmodem: remove NULL check
  2011-01-29 13:34 [PATCH 00/11] Remove NULL check for call back data Jeevaka Badrappan
                   ` (5 preceding siblings ...)
  2011-01-29 13:34 ` [PATCH 06/11] huaweimodem: " Jeevaka Badrappan
@ 2011-01-29 13:34 ` Jeevaka Badrappan
  2011-01-29 13:34 ` [PATCH 08/11] mbmmodem: " Jeevaka Badrappan
                   ` (4 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Jeevaka Badrappan @ 2011-01-29 13:34 UTC (permalink / raw)
  To: ofono

[-- Attachment #1: Type: text/plain, Size: 2742 bytes --]

---
 drivers/ifxmodem/ctm.c       |    8 --------
 drivers/ifxmodem/stk.c       |    4 ++--
 drivers/ifxmodem/voicecall.c |    7 -------
 3 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/drivers/ifxmodem/ctm.c b/drivers/ifxmodem/ctm.c
index b70fe09..7b23a9b 100644
--- a/drivers/ifxmodem/ctm.c
+++ b/drivers/ifxmodem/ctm.c
@@ -88,14 +88,10 @@ static void ifx_query_tty(struct ofono_ctm *ctm, ofono_ctm_query_cb_t cb,
 	struct ctm_data *ctmd = ofono_ctm_get_data(ctm);
 	struct cb_data *cbd = cb_data_new(cb, data);
 
-	if (cbd == NULL)
-		goto error;
-
 	if (g_at_chat_send(ctmd->chat, "AT+XCTMS?", xctms_prefix,
 				xctms_query_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, -1, data);
@@ -121,9 +117,6 @@ static void ifx_set_tty(struct ofono_ctm *ctm, ofono_bool_t enable,
 	struct cb_data *cbd = cb_data_new(cb, data);
 	char buf[20];
 
-	if (cbd == NULL)
-		goto error;
-
 	/* Only FULL TTY mode enabled/disabled */
 	snprintf(buf, sizeof(buf), "AT+XCTMS=%i", enable ? 1 : 0);
 
@@ -131,7 +124,6 @@ static void ifx_set_tty(struct ofono_ctm *ctm, ofono_bool_t enable,
 				xctms_modify_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, data);
diff --git a/drivers/ifxmodem/stk.c b/drivers/ifxmodem/stk.c
index 5951149..f08cf47 100644
--- a/drivers/ifxmodem/stk.c
+++ b/drivers/ifxmodem/stk.c
@@ -104,7 +104,7 @@ static void ifx_stk_envelope(struct ofono_stk *stk, int length,
 
 	DBG("");
 
-	if (cbd == NULL || buf == NULL)
+	if (buf == NULL)
 		goto error;
 
 	len = sprintf(buf, "AT+SATE=\"");
@@ -150,7 +150,7 @@ static void ifx_stk_terminal_response(struct ofono_stk *stk, int length,
 
 	DBG("");
 
-	if (cbd == NULL || buf == NULL)
+	if (buf == NULL)
 		goto error;
 
 	len = sprintf(buf, "AT+SATR=\"");
diff --git a/drivers/ifxmodem/voicecall.c b/drivers/ifxmodem/voicecall.c
index fcd0c7e..716652c 100644
--- a/drivers/ifxmodem/voicecall.c
+++ b/drivers/ifxmodem/voicecall.c
@@ -305,9 +305,6 @@ static void ifx_dial(struct ofono_voicecall *vc,
 	struct cb_data *cbd = cb_data_new(cb, data);
 	char buf[256];
 
-	if (cbd == NULL)
-		goto error;
-
 	cbd->user = vc;
 
 	if (ph->type == 145)
@@ -332,7 +329,6 @@ static void ifx_dial(struct ofono_voicecall *vc,
 				atd_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, data);
@@ -504,9 +500,6 @@ static void ifx_send_dtmf(struct ofono_voicecall *vc, const char *dtmf,
 	int i;
 	char *buf;
 
-	if (cbd == NULL)
-		goto error;
-
 	/* strlen("+VTS=T\;") = 7 + initial AT + null */
 	buf = g_try_new(char, len * 7 + 3);
 	if (buf == NULL)
-- 
1.7.0.4


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH 08/11] mbmmodem: remove NULL check
  2011-01-29 13:34 [PATCH 00/11] Remove NULL check for call back data Jeevaka Badrappan
                   ` (6 preceding siblings ...)
  2011-01-29 13:34 ` [PATCH 07/11] ifxmodem: " Jeevaka Badrappan
@ 2011-01-29 13:34 ` Jeevaka Badrappan
  2011-01-29 13:34 ` [PATCH 09/11] stemodem: " Jeevaka Badrappan
                   ` (3 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Jeevaka Badrappan @ 2011-01-29 13:34 UTC (permalink / raw)
  To: ofono

[-- Attachment #1: Type: text/plain, Size: 1529 bytes --]

---
 drivers/mbmmodem/gprs-context.c |    7 -------
 drivers/mbmmodem/stk.c          |    4 ++--
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/drivers/mbmmodem/gprs-context.c b/drivers/mbmmodem/gprs-context.c
index b9b4574..322f96d 100644
--- a/drivers/mbmmodem/gprs-context.c
+++ b/drivers/mbmmodem/gprs-context.c
@@ -364,9 +364,6 @@ static void mbm_gprs_activate_primary(struct ofono_gprs_context *gc,
 
 	DBG("cid %u", ctx->cid);
 
-	if (cbd == NULL)
-		goto error;
-
 	gcd->active_context = ctx->cid;
 
 	cbd->user = gc;
@@ -408,16 +405,12 @@ static void mbm_gprs_deactivate_primary(struct ofono_gprs_context *gc,
 
 	DBG("cid %u", cid);
 
-	if (cbd == NULL)
-		goto error;
-
 	cbd->user = gc;
 
 	if (g_at_chat_send(gcd->chat, "AT*ENAP=0", none_prefix,
 				at_enap_down_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, data);
diff --git a/drivers/mbmmodem/stk.c b/drivers/mbmmodem/stk.c
index d0a9f3b..99c08c2 100644
--- a/drivers/mbmmodem/stk.c
+++ b/drivers/mbmmodem/stk.c
@@ -88,7 +88,7 @@ static void mbm_stk_envelope(struct ofono_stk *stk, int length,
 
 	DBG("");
 
-	if (cbd == NULL || buf == NULL)
+	if (buf == NULL)
 		goto error;
 
 	len = sprintf(buf, "AT*STKE=\"");
@@ -134,7 +134,7 @@ static void mbm_stk_terminal_response(struct ofono_stk *stk, int length,
 
 	DBG("");
 
-	if (cbd == NULL || buf == NULL)
+	if (buf == NULL)
 		goto error;
 
 	len = sprintf(buf, "AT*STKR=\"");
-- 
1.7.0.4


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH 09/11] stemodem: remove NULL check
  2011-01-29 13:34 [PATCH 00/11] Remove NULL check for call back data Jeevaka Badrappan
                   ` (7 preceding siblings ...)
  2011-01-29 13:34 ` [PATCH 08/11] mbmmodem: " Jeevaka Badrappan
@ 2011-01-29 13:34 ` Jeevaka Badrappan
  2011-01-29 13:34 ` [PATCH 10/11] cdmamodem: " Jeevaka Badrappan
                   ` (2 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Jeevaka Badrappan @ 2011-01-29 13:34 UTC (permalink / raw)
  To: ofono

[-- Attachment #1: Type: text/plain, Size: 1659 bytes --]

---
 drivers/stemodem/gprs-context.c |    6 ------
 drivers/stemodem/voicecall.c    |    7 -------
 2 files changed, 0 insertions(+), 13 deletions(-)

diff --git a/drivers/stemodem/gprs-context.c b/drivers/stemodem/gprs-context.c
index 0be4238..e247f35 100644
--- a/drivers/stemodem/gprs-context.c
+++ b/drivers/stemodem/gprs-context.c
@@ -383,9 +383,6 @@ static void ste_gprs_activate_primary(struct ofono_gprs_context *gc,
 	GSList *l;
 	struct conn_info *conn;
 
-	if (cbd == NULL)
-		goto error_no_device;
-
 	gcd->active_context = ctx->cid;
 	cbd->user = gc;
 
@@ -448,9 +445,6 @@ static void ste_gprs_deactivate_primary(struct ofono_gprs_context *gc,
 	char buf[64];
 	GSList *l;
 
-	if (cbd == NULL)
-		goto error;
-
 	gcd->active_context = id;
 	cbd->user = gc;
 
diff --git a/drivers/stemodem/voicecall.c b/drivers/stemodem/voicecall.c
index 5210483..1c7c0bd 100644
--- a/drivers/stemodem/voicecall.c
+++ b/drivers/stemodem/voicecall.c
@@ -187,9 +187,6 @@ static void ste_dial(struct ofono_voicecall *vc,
 	struct cb_data *cbd = cb_data_new(cb, data);
 	char buf[256];
 
-	if (cbd == NULL)
-		goto error;
-
 	cbd->user = vc;
 
 	if (ph->type == 145)
@@ -214,7 +211,6 @@ static void ste_dial(struct ofono_voicecall *vc,
 				atd_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, data);
@@ -370,9 +366,6 @@ static void ste_send_dtmf(struct ofono_voicecall *vc, const char *dtmf,
 	int s;
 	char *buf;
 
-	if (cbd == NULL)
-		goto error;
-
 	/* strlen("AT+VTS=) = 7 + NULL */
 	buf = g_try_new(char, strlen(dtmf) + 8);
 	if (buf == NULL)
-- 
1.7.0.4


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH 10/11] cdmamodem: remove NULL check
  2011-01-29 13:34 [PATCH 00/11] Remove NULL check for call back data Jeevaka Badrappan
                   ` (8 preceding siblings ...)
  2011-01-29 13:34 ` [PATCH 09/11] stemodem: " Jeevaka Badrappan
@ 2011-01-29 13:34 ` Jeevaka Badrappan
  2011-01-29 13:34 ` [PATCH 11/11] plugins: " Jeevaka Badrappan
  2011-01-29 17:23 ` [PATCH 00/11] Remove NULL check for call back data Denis Kenzior
  11 siblings, 0 replies; 13+ messages in thread
From: Jeevaka Badrappan @ 2011-01-29 13:34 UTC (permalink / raw)
  To: ofono

[-- Attachment #1: Type: text/plain, Size: 2586 bytes --]

---
 drivers/cdmamodem/devinfo.c   |   16 ----------------
 drivers/cdmamodem/voicecall.c |    4 ----
 2 files changed, 0 insertions(+), 20 deletions(-)

diff --git a/drivers/cdmamodem/devinfo.c b/drivers/cdmamodem/devinfo.c
index dfc7fd5..9603e05 100644
--- a/drivers/cdmamodem/devinfo.c
+++ b/drivers/cdmamodem/devinfo.c
@@ -65,15 +65,11 @@ static void cdma_query_manufacturer(struct ofono_devinfo *info,
 	struct cb_data *cbd = cb_data_new(cb, data);
 	GAtChat *chat = ofono_devinfo_get_data(info);
 
-	if (cbd == NULL)
-		goto error;
-
 	cbd->user = "AT+GMI";
 
 	if (g_at_chat_send(chat, "AT+GMI", NULL, attr_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, NULL, data);
@@ -85,15 +81,11 @@ static void cdma_query_model(struct ofono_devinfo *info,
 	struct cb_data *cbd = cb_data_new(cb, data);
 	GAtChat *chat = ofono_devinfo_get_data(info);
 
-	if (cbd == NULL)
-		goto error;
-
 	cbd->user = "AT+GMM";
 
 	if (g_at_chat_send(chat, "AT+GMM", NULL, attr_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, NULL, data);
@@ -105,15 +97,11 @@ static void cdma_query_revision(struct ofono_devinfo *info,
 	struct cb_data *cbd = cb_data_new(cb, data);
 	GAtChat *chat = ofono_devinfo_get_data(info);
 
-	if (cbd == NULL)
-		goto error;
-
 	cbd->user = "AT+GMR";
 
 	if (g_at_chat_send(chat, "AT+GMR", NULL, attr_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, NULL, data);
@@ -125,15 +113,11 @@ static void cdma_query_serial(struct ofono_devinfo *info,
 	struct cb_data *cbd = cb_data_new(cb, data);
 	GAtChat *chat = ofono_devinfo_get_data(info);
 
-	if (cbd == NULL)
-		goto error;
-
 	cbd->user = "AT+GSN";
 
 	if (g_at_chat_send(chat, "AT+GSN", NULL, attr_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, NULL, data);
diff --git a/drivers/cdmamodem/voicecall.c b/drivers/cdmamodem/voicecall.c
index 94ec74b..cabed6a 100644
--- a/drivers/cdmamodem/voicecall.c
+++ b/drivers/cdmamodem/voicecall.c
@@ -54,16 +54,12 @@ static void cdma_template(const char *cmd, struct ofono_cdma_voicecall *vc,
 	struct voicecall_data *vd = ofono_cdma_voicecall_get_data(vc);
 	struct cb_data *cbd = cb_data_new(cb, data);
 
-	if (cbd == NULL)
-		goto error;
-
 	cbd->user = vc;
 
 	if (g_at_chat_send(vd->chat, cmd, none_prefix,
 				result_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, data);
-- 
1.7.0.4


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH 11/11] plugins: remove NULL check
  2011-01-29 13:34 [PATCH 00/11] Remove NULL check for call back data Jeevaka Badrappan
                   ` (9 preceding siblings ...)
  2011-01-29 13:34 ` [PATCH 10/11] cdmamodem: " Jeevaka Badrappan
@ 2011-01-29 13:34 ` Jeevaka Badrappan
  2011-01-29 17:23 ` [PATCH 00/11] Remove NULL check for call back data Denis Kenzior
  11 siblings, 0 replies; 13+ messages in thread
From: Jeevaka Badrappan @ 2011-01-29 13:34 UTC (permalink / raw)
  To: ofono

[-- Attachment #1: Type: text/plain, Size: 5830 bytes --]

---
 plugins/gobi.c     |    2 +-
 plugins/hso.c      |    4 ----
 plugins/ifx.c      |    4 ----
 plugins/mbm.c      |    4 ----
 plugins/novatel.c  |    2 +-
 plugins/phonesim.c |   12 ------------
 plugins/sierra.c   |    2 +-
 plugins/ste.c      |    4 ----
 plugins/tc65.c     |    4 ----
 plugins/zte.c      |    2 +-
 10 files changed, 4 insertions(+), 36 deletions(-)

diff --git a/plugins/gobi.c b/plugins/gobi.c
index 1a5830d..e2f988d 100644
--- a/plugins/gobi.c
+++ b/plugins/gobi.c
@@ -251,7 +251,7 @@ static void gobi_set_online(struct ofono_modem *modem, ofono_bool_t online,
 
 	DBG("modem %p %s", modem, online ? "online" : "offline");
 
-	if (cbd == NULL || data->chat == NULL)
+	if (data->chat == NULL)
 		goto error;
 
 	if (g_at_chat_send(data->chat, command, NULL,
diff --git a/plugins/hso.c b/plugins/hso.c
index 990be6d..4594c52 100644
--- a/plugins/hso.c
+++ b/plugins/hso.c
@@ -346,13 +346,9 @@ static void hso_set_online(struct ofono_modem *modem, ofono_bool_t online,
 
 	DBG("modem %p %s", modem, online ? "online" : "offline");
 
-	if (cbd == NULL)
-		goto error;
-
 	if (g_at_chat_send(chat, command, NULL, set_online_cb, cbd, g_free))
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, cbd->data);
diff --git a/plugins/ifx.c b/plugins/ifx.c
index 79cd150..411c012 100644
--- a/plugins/ifx.c
+++ b/plugins/ifx.c
@@ -661,14 +661,10 @@ static void ifx_set_online(struct ofono_modem *modem, ofono_bool_t online,
 
 	DBG("%p %s", modem, online ? "online" : "offline");
 
-	if (cbd == NULL)
-		goto error;
-
 	if (g_at_chat_send(data->dlcs[AUX_DLC], command, NULL,
 					set_online_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, cbd->data);
diff --git a/plugins/mbm.c b/plugins/mbm.c
index e826240..600b358 100644
--- a/plugins/mbm.c
+++ b/plugins/mbm.c
@@ -470,13 +470,9 @@ static void mbm_set_online(struct ofono_modem *modem, ofono_bool_t online,
 
 	DBG("modem %p %s", modem, online ? "online" : "offline");
 
-	if (cbd == NULL)
-		goto error;
-
 	if (g_at_chat_send(chat, command, NULL, set_online_cb, cbd, g_free))
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, cbd->data);
diff --git a/plugins/novatel.c b/plugins/novatel.c
index fbd1216..1948c49 100644
--- a/plugins/novatel.c
+++ b/plugins/novatel.c
@@ -309,7 +309,7 @@ static void novatel_set_online(struct ofono_modem *modem, ofono_bool_t online,
 
 	DBG("modem %p %s", modem, online ? "online" : "offline");
 
-	if (cbd == NULL || chat == NULL)
+	if (chat == NULL)
 		goto error;
 
 	if (g_at_chat_send(chat, command, NULL, set_online_cb, cbd, g_free))
diff --git a/plugins/phonesim.c b/plugins/phonesim.c
index 28306b5..2b36fe0 100644
--- a/plugins/phonesim.c
+++ b/plugins/phonesim.c
@@ -143,9 +143,6 @@ static void phonesim_deactivate_primary(struct ofono_gprs_context *gc,
 	struct cb_data *cbd = cb_data_new(cb, data);
 	char buf[128];
 
-	if (cbd == NULL)
-		goto error;
-
 	cbd->user = gc;
 
 	snprintf(buf, sizeof(buf), "AT+CGACT=0,%u", id);
@@ -154,7 +151,6 @@ static void phonesim_deactivate_primary(struct ofono_gprs_context *gc,
 				at_cgact_down_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, data);
@@ -273,14 +269,10 @@ static void phonesim_ctm_query(struct ofono_ctm *ctm,
 
 	DBG("");
 
-	if (!cbd)
-		goto error;
-
 	if (g_at_chat_send(chat, "AT+PTTY?", ptty_prefix,
 				ctm_query_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, 0, data);
@@ -305,16 +297,12 @@ static void phonesim_ctm_set(struct ofono_ctm *ctm, ofono_bool_t enable,
 
 	DBG("");
 
-	if (!cbd)
-		goto error;
-
 	snprintf(buf, sizeof(buf), "AT+PTTY=%d", enable);
 
 	if (g_at_chat_send(chat, buf, none_prefix,
 				ctm_set_cb, cbd, g_free) > 0)
 		return;
 
-error:
 	CALLBACK_WITH_FAILURE(cb, data);
 	g_free(cbd);
 }
diff --git a/plugins/sierra.c b/plugins/sierra.c
index b3edcf4..f387b98 100644
--- a/plugins/sierra.c
+++ b/plugins/sierra.c
@@ -195,7 +195,7 @@ static void sierra_set_online(struct ofono_modem *modem, ofono_bool_t online,
 
 	DBG("modem %p %s", modem, online ? "online" : "offline");
 
-	if (cbd == NULL || data->chat == NULL)
+	if (data->chat == NULL)
 		goto error;
 
 	if (g_at_chat_send(data->chat, command, NULL,
diff --git a/plugins/ste.c b/plugins/ste.c
index 6b44780..0b02a0d 100644
--- a/plugins/ste.c
+++ b/plugins/ste.c
@@ -320,13 +320,9 @@ static void ste_set_online(struct ofono_modem *modem, ofono_bool_t online,
 
 	DBG("modem %p %s", modem, online ? "online" : "offline");
 
-	if (cbd == NULL)
-		goto error;
-
 	if (g_at_chat_send(chat, command, NULL, set_online_cb, cbd, g_free))
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, cbd->data);
diff --git a/plugins/tc65.c b/plugins/tc65.c
index 60f66e7..f58f33d 100644
--- a/plugins/tc65.c
+++ b/plugins/tc65.c
@@ -159,13 +159,9 @@ static void tc65_set_online(struct ofono_modem *modem, ofono_bool_t online,
 
 	DBG("modem %p %s", modem, online ? "online" : "offline");
 
-	if (cbd == NULL)
-		goto error;
-
 	if (g_at_chat_send(chat, command, NULL, set_online_cb, cbd, g_free))
 		return;
 
-error:
 	g_free(cbd);
 
 	CALLBACK_WITH_FAILURE(cb, cbd->data);
diff --git a/plugins/zte.c b/plugins/zte.c
index 4693d93..822098d 100644
--- a/plugins/zte.c
+++ b/plugins/zte.c
@@ -250,7 +250,7 @@ static void zte_set_online(struct ofono_modem *modem, ofono_bool_t online,
 
 	DBG("modem %p %s", modem, online ? "online" : "offline");
 
-	if (cbd == NULL || chat == NULL)
+	if (chat == NULL)
 		goto error;
 
 	if (g_at_chat_send(chat, command, NULL, set_online_cb, cbd, g_free))
-- 
1.7.0.4


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* Re: [PATCH 00/11] Remove NULL check for call back data
  2011-01-29 13:34 [PATCH 00/11] Remove NULL check for call back data Jeevaka Badrappan
                   ` (10 preceding siblings ...)
  2011-01-29 13:34 ` [PATCH 11/11] plugins: " Jeevaka Badrappan
@ 2011-01-29 17:23 ` Denis Kenzior
  11 siblings, 0 replies; 13+ messages in thread
From: Denis Kenzior @ 2011-01-29 17:23 UTC (permalink / raw)
  To: ofono

[-- Attachment #1: Type: text/plain, Size: 316 bytes --]

Hi Jeevaka,

On 01/29/2011 07:34 AM, Jeevaka Badrappan wrote:
> Hi,
> 
> Memory allocation function for callback data change from g_try_new0 to
> g_new0. Due to this, NULL check done for callback data is removed.
> 
> Regards,
> Jeevaka
> 

All 11 patches have been applied, thanks.

Regards,
-Denis

^ permalink raw reply	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2011-01-29 17:23 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-29 13:34 [PATCH 00/11] Remove NULL check for call back data Jeevaka Badrappan
2011-01-29 13:34 ` [PATCH 01/11] atutil: use g_new0 for callback data memory Jeevaka Badrappan
2011-01-29 13:34 ` [PATCH 02/11] atmodem: remove NULL check Jeevaka Badrappan
2011-01-29 13:34 ` [PATCH 03/11] calypsomodem: " Jeevaka Badrappan
2011-01-29 13:34 ` [PATCH 04/11] hfpmodem: " Jeevaka Badrappan
2011-01-29 13:34 ` [PATCH 05/11] hsomodem: " Jeevaka Badrappan
2011-01-29 13:34 ` [PATCH 06/11] huaweimodem: " Jeevaka Badrappan
2011-01-29 13:34 ` [PATCH 07/11] ifxmodem: " Jeevaka Badrappan
2011-01-29 13:34 ` [PATCH 08/11] mbmmodem: " Jeevaka Badrappan
2011-01-29 13:34 ` [PATCH 09/11] stemodem: " Jeevaka Badrappan
2011-01-29 13:34 ` [PATCH 10/11] cdmamodem: " Jeevaka Badrappan
2011-01-29 13:34 ` [PATCH 11/11] plugins: " Jeevaka Badrappan
2011-01-29 17:23 ` [PATCH 00/11] Remove NULL check for call back data Denis Kenzior

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox