From d3c2535fae5f6df4e23caca23d08167140d0b1ee Mon Sep 17 00:00:00 2001
From: Denis Kenzior <denkenz@gmail.com>
Date: Thu, 4 Feb 2010 00:12:50 -0600
Subject: [PATCH] Fix: Dead Assignments

---
 drivers/atmodem/call-barring.c | 6 ++----
 drivers/atmodem/voicecall.c    | 3 +--
 unit/test-sms.c                | 1 +
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/atmodem/call-barring.c b/drivers/atmodem/call-barring.c
index cdf992e8..10f17fb0 100644
--- a/drivers/atmodem/call-barring.c
+++ b/drivers/atmodem/call-barring.c
@@ -86,12 +86,11 @@ static void at_call_barring_query(struct ofono_call_barring *cb,
 	GAtChat *chat = ofono_call_barring_get_data(cb);
 	struct cb_data *cbd = cb_data_new(callback, data);
 	char buf[64];
-	int len;
 
 	if (!cbd || strlen(lock) != 2)
 		goto error;
 
-	len = sprintf(buf, "AT+CLCK=\"%s\",2", lock);
+	sprintf(buf, "AT+CLCK=\"%s\",2", lock);
 
 	if (g_at_chat_send(chat, buf, clck_prefix,
 				clck_query_cb, cbd, g_free) > 0)
@@ -134,8 +133,7 @@ static void at_call_barring_set(struct ofono_call_barring *cb, const char *lock,
 				",\"%s\"", passwd);
 		/* Assume cls == 7 means use defaults */
 		if (cls != 7)
-			len += snprintf(buf + len, sizeof(buf) - len,
-					",%i", cls);
+			snprintf(buf + len, sizeof(buf) - len, ",%i", cls);
 	}
 
 	if (g_at_chat_send(chat, buf, none_prefix,
diff --git a/drivers/atmodem/voicecall.c b/drivers/atmodem/voicecall.c
index d26fc4a7..903b2dd2 100644
--- a/drivers/atmodem/voicecall.c
+++ b/drivers/atmodem/voicecall.c
@@ -617,7 +617,6 @@ static void cring_notify(GAtResult *result, gpointer user_data)
 	GAtResultIter iter;
 	const char *line;
 	int type;
-	struct ofono_call *call;
 
 	dump_response("cring_notify", TRUE, result);
 
@@ -654,7 +653,7 @@ static void cring_notify(GAtResult *result, gpointer user_data)
 		type = 9;
 
 	/* Generate an incoming call */
-	call = create_call(vc, type, 1, 4, NULL, 128, 2);
+	create_call(vc, type, 1, 4, NULL, 128, 2);
 
 	/* We have a call, and call type but don't know the number and
 	 * must wait for the CLIP to arrive before announcing the call.
diff --git a/unit/test-sms.c b/unit/test-sms.c
index 36b70ba1..b242913e 100644
--- a/unit/test-sms.c
+++ b/unit/test-sms.c
@@ -823,6 +823,7 @@ static void test_prepare_concat()
 			g_print("PDU Len: %ld\n", len);
 
 		ok = sms_decode(pdu, len, TRUE, len - 1, &decoded);
+		g_assert(ok);
 
 		if (g_test_verbose())
 			g_print("Pdu udl: %d\n", (int)decoded.submit.udl);