[PATCH 1/7] sms: remove set but not used var

[PATCH 1/7] sms: remove set but not used var

[Gustavo F. Padovan]

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

---
 src/sms.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/src/sms.c b/src/sms.c
index 2940762..323c5ad 100644
--- a/src/sms.c
+++ b/src/sms.c
@@ -754,9 +754,6 @@ static gboolean tx_next(gpointer user_data)
 	int send_mms = 0;
 	struct tx_queue_entry *entry = g_queue_peek_head(sms->txq);
 	struct pending_pdu *pdu = &entry->pdus[entry->cur_pdu];
-	struct ofono_error error;
-
-	error.type = OFONO_ERROR_TYPE_NO_ERROR;
 
 	DBG("tx_next: %p", entry);
 
-- 
1.7.5.1

[PATCH 2/7] gprs: remove set but not used var

[Gustavo F. Padovan]

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

---
 src/gprs.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/src/gprs.c b/src/gprs.c
index 9d6e829..559a43d 100644
--- a/src/gprs.c
+++ b/src/gprs.c
@@ -276,14 +276,11 @@ static void gprs_cid_release(struct ofono_gprs *gprs, unsigned int id)
 static gboolean assign_context(struct pri_context *ctx)
 {
 	struct idmap *cidmap = ctx->gprs->cid_map;
-	unsigned int cid_min;
 	GSList *l;
 
 	if (cidmap == NULL)
 		return FALSE;
 
-	cid_min = idmap_get_min(cidmap);
-
 	ctx->context.cid = gprs_cid_alloc(ctx->gprs);
 	if (ctx->context.cid == 0)
 		return FALSE;
-- 
1.7.5.1

[PATCH 3/7] simutil: remove set but not used var

[Gustavo F. Padovan]

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

---
 src/simutil.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/simutil.c b/src/simutil.c
index 85681b7..554a89a 100644
--- a/src/simutil.c
+++ b/src/simutil.c
@@ -724,11 +724,10 @@ gboolean comprehension_tlv_builder_set_length(
 	unsigned char *tlv = builder->pdu + builder->pos;
 	unsigned int tag_size = CTLV_TAG_FIELD_SIZE(tlv[0]);
 	unsigned int len_size, new_len_size;
-	unsigned int ctlv_len, new_ctlv_len;
+	unsigned int new_ctlv_len;
 	unsigned int len;
 
 	len_size = CTLV_LEN_FIELD_SIZE(tlv[tag_size]);
-	ctlv_len = tag_size + len_size + builder->len;
 	new_len_size = BTLV_LEN_FIELD_SIZE_NEEDED(new_len);
 	new_ctlv_len = tag_size + new_len_size + new_len;
 
-- 
1.7.5.1

[PATCH 4/7] udev: remove set but not used var

[Gustavo F. Padovan]

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

---
 plugins/udev.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/plugins/udev.c b/plugins/udev.c
index cbb596d..0234fc0 100644
--- a/plugins/udev.c
+++ b/plugins/udev.c
@@ -105,7 +105,7 @@ static void add_mbm(struct ofono_modem *modem,
 					struct udev_device *udev_device)
 {
 	const char *desc, *devnode;
-	const char *device, *data, *network, *gps;
+	const char *device, *data, *network;
 	int registered;
 
 	desc = udev_device_get_sysattr_value(udev_device, "device/interface");
@@ -157,7 +157,6 @@ static void add_mbm(struct ofono_modem *modem,
 	device  = ofono_modem_get_string(modem, MODEM_DEVICE);
 	data = ofono_modem_get_string(modem, DATA_DEVICE);
 	network = ofono_modem_get_string(modem, NETWORK_INTERFACE);
-	gps = ofono_modem_get_string(modem, GPS_DEVICE);
 
 	if (device != NULL && data != NULL && network != NULL) {
 		ofono_modem_set_integer(modem, "Registered", 1);
-- 
1.7.5.1

[PATCH 5/7] gobi: remove set but not used var

[Gustavo F. Padovan]

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

---
 plugins/gobi.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/plugins/gobi.c b/plugins/gobi.c
index b559f33..dcc41af 100644
--- a/plugins/gobi.c
+++ b/plugins/gobi.c
@@ -288,7 +288,6 @@ static void gobi_post_sim(struct ofono_modem *modem)
 static void gobi_post_online(struct ofono_modem *modem)
 {
 	struct gobi_data *data = ofono_modem_get_data(modem);
-	struct ofono_gprs *gprs;
 
 	DBG("%p", modem);
 
@@ -297,8 +296,7 @@ static void gobi_post_online(struct ofono_modem *modem)
 	ofono_cbs_create(modem, OFONO_VENDOR_GOBI, "atmodem", data->chat);
 	ofono_ussd_create(modem, OFONO_VENDOR_GOBI, "atmodem", data->chat);
 
-	gprs = ofono_gprs_create(modem, OFONO_VENDOR_GOBI,
-						"atmodem", data->chat);
+	ofono_gprs_create(modem, OFONO_VENDOR_GOBI, "atmodem", data->chat);
 }
 
 static struct ofono_modem_driver gobi_driver = {
-- 
1.7.5.1

[PATCH 6/7] tools: remove set but not used var

[Gustavo F. Padovan]

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

---
 tools/huawei-audio.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/tools/huawei-audio.c b/tools/huawei-audio.c
index 084241e..c7b78aa 100644
--- a/tools/huawei-audio.c
+++ b/tools/huawei-audio.c
@@ -430,7 +430,6 @@ static void check_interfaces(struct modem_data *modem, DBusMessageIter *iter)
 {
 	DBusMessageIter entry;
 	gboolean has_callmanager = FALSE;
-	gboolean has_audiosettings = FALSE;
 
 	dbus_message_iter_recurse(iter, &entry);
 
@@ -442,9 +441,6 @@ static void check_interfaces(struct modem_data *modem, DBusMessageIter *iter)
 		if (g_str_equal(interface, OFONO_CALLMANAGER_INTERFACE) == TRUE)
 			has_callmanager = TRUE;
 
-		if (g_str_equal(interface, OFONO_AUDIO_INTERFACE) == TRUE)
-			has_audiosettings = TRUE;
-
 		dbus_message_iter_next(&entry);
 	}
 
-- 
1.7.5.1

[PATCH 7/7] add -Wno-unused-but-set-variable to CFLAGS

[Gustavo F. Padovan]

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

---
 acinclude.m4 |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index ac29c2b..18c019d 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -17,6 +17,7 @@ AC_DEFUN([COMPILER_FLAGS], [
 	if (test "$USE_MAINTAINER_MODE" = "yes"); then
 		CFLAGS="$CFLAGS -Werror -Wextra"
 		CFLAGS="$CFLAGS -Wno-unused-parameter"
+		CFLAGS="$CFLAGS -Wno-unused-but-set-variable"
 		CFLAGS="$CFLAGS -Wno-missing-field-initializers"
 		CFLAGS="$CFLAGS -Wdeclaration-after-statement"
 		CFLAGS="$CFLAGS -Wmissing-declarations"
-- 
1.7.5.1

Re: [PATCH 1/7] sms: remove set but not used var

[Denis Kenzior]

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

Hi Gustavo,

On 05/20/2011 02:03 PM, Gustavo F. Padovan wrote:
> ---
>  src/sms.c |    3 ---
>  1 files changed, 0 insertions(+), 3 deletions(-)
> 

Nice catch.  Patch has been applied, thanks.

Regards,
-Denis

Re: [PATCH 2/7] gprs: remove set but not used var

[Denis Kenzior]

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

Hi Gustavo,

On 05/20/2011 02:03 PM, Gustavo F. Padovan wrote:
> ---
>  src/gprs.c |    3 ---
>  1 files changed, 0 insertions(+), 3 deletions(-)
> 

Nice catch, patch has been applied.  Thanks.

Regards,
-Denis

Re: [PATCH 3/7] simutil: remove set but not used var

[Denis Kenzior]

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

Hi Gustavo,

On 05/20/2011 02:03 PM, Gustavo F. Padovan wrote:
> ---
>  src/simutil.c |    3 +--
>  1 files changed, 1 insertions(+), 2 deletions(-)
> 

Nice catch, patch has been applied.  Thanks.

Regards,
-Denis

Re: [PATCH 4/7] udev: remove set but not used var

[Denis Kenzior]

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

Hi Gustavo,

On 05/20/2011 02:03 PM, Gustavo F. Padovan wrote:
> ---
>  plugins/udev.c |    3 +--
>  1 files changed, 1 insertions(+), 2 deletions(-)
> 

Nice catch, patch has been applied.  Thanks.

Regards,
-Denis

Re: [PATCH 5/7] gobi: remove set but not used var

[Denis Kenzior]

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

Hi Gustavo,

On 05/20/2011 02:03 PM, Gustavo F. Padovan wrote:
> ---
>  plugins/gobi.c |    4 +---
>  1 files changed, 1 insertions(+), 3 deletions(-)
> 

Nice catch, patch has been applied.  Thanks.

Regards,
-Denis