[PATCH 1/3] drivers/isimodem: fix GCC 6.0 errors

[PATCH 1/3] drivers/isimodem: fix GCC 6.0 errors

[Kuba Pawlak]

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

From: Kuba Pawlak <kuba.t.pawlak@gmail.com>

-Werror=misleading-indentation
---
 drivers/isimodem/voicecall.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/isimodem/voicecall.c b/drivers/isimodem/voicecall.c
index 460e34e519a2c8bf5930f421b14e1c974cd49d63..d6d4ea37d66a646be305f8aefa6879b4cd8f0bab 100644
--- a/drivers/isimodem/voicecall.c
+++ b/drivers/isimodem/voicecall.c
@@ -1715,7 +1715,7 @@ static void isi_release_specific(struct ofono_voicecall *ovc, int id,
 
 		if ((status->mode_info & CALL_MODE_ORIGINATOR))
 			cause = CALL_CAUSE_BUSY_USER_REQUEST;
-			break;
+		break;
 	}
 
 	isi_call_release_req(ovc, id, CALL_CAUSE_TYPE_CLIENT, cause, cb, data);
-- 
1.9.3

Intel Deutschland GmbH
Registered Address: Am Campeon 10-12, 85579 Neubiberg, Germany
Tel: +49 89 99 8853-0, www.intel.de
Managing Directors: Christin Eisenschmid, Christian Lamprechter
Chairperson of the Supervisory Board: Nicole Lau
Registered Office: Munich
Commercial Register: Amtsgericht Muenchen HRB 186928

[PATCH 2/3] plugins/nokia-gpio: fix glibc 2.23.9+ issues

[Kuba Pawlak]

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

From: Kuba Pawlak <kuba.t.pawlak@gmail.com>

readdir_r’ is deprecated [-Werror=deprecated-declarations]
---
 plugins/nokia-gpio.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/plugins/nokia-gpio.c b/plugins/nokia-gpio.c
index 57aad8d0962a41c1e1b41579d046f3a0e4d28096..7a93106c02c2435d5a1920cbfbc9a862ebd192e3 100644
--- a/plugins/nokia-gpio.c
+++ b/plugins/nokia-gpio.c
@@ -635,7 +635,7 @@ static int gpio_probe_links(void)
 	char const *gpiodir = "/sys/class/gpio";
 	char const *cmtdir = "/dev/cmt";
 	DIR *gpio;
-	struct dirent *d, entry[1];
+	struct dirent *d;
 
 	if (file_exists(cmtdir)) {
 		DBG("Using %s", cmtdir);
@@ -657,16 +657,11 @@ static int gpio_probe_links(void)
 		return -(errno = ENODEV);
 	}
 
-	while (readdir_r(gpio, entry, &d) == 0) {
+	while ((d = readdir(gpio)) != NULL) {
 		char nn[PATH_MAX], name[PATH_MAX], from[PATH_MAX], to[PATH_MAX];
 		FILE *nf;
 		size_t len;
 
-		if (d == NULL) {
-			(void) closedir(gpio);
-			return 0;
-		}
-
 		snprintf(nn, sizeof nn, "%s/%s/name", gpiodir, d->d_name);
 
 		nf = fopen(nn, "rb");
-- 
1.9.3

Intel Deutschland GmbH
Registered Address: Am Campeon 10-12, 85579 Neubiberg, Germany
Tel: +49 89 99 8853-0, www.intel.de
Managing Directors: Christin Eisenschmid, Christian Lamprechter
Chairperson of the Supervisory Board: Nicole Lau
Registered Office: Munich
Commercial Register: Amtsgericht Muenchen HRB 186928

[PATCH 3/3] unit: fix GCC 6.0 compilation issues

[Kuba Pawlak]

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

From: Kuba Pawlak <kuba.t.pawlak@gmail.com>

-Werror=unused-const-variable
---
 unit/test-rilmodem-cb.c | 23 -----------------------
 unit/test-stkutil.c     | 33 ---------------------------------
 2 files changed, 56 deletions(-)

diff --git a/unit/test-rilmodem-cb.c b/unit/test-rilmodem-cb.c
index d5b1d07ddb5354b0726bcfac615ebffa9925df3e..43c6fa173d6b2bf17e11c6766a370a628256d590 100644
--- a/unit/test-rilmodem-cb.c
+++ b/unit/test-rilmodem-cb.c
@@ -234,29 +234,6 @@ static const struct cb_data testdata_query_invalid_3 = {
 	.error_type = OFONO_ERROR_TYPE_FAILURE,
 };
 
-/*
- * The following structure contains test data for a
- * RIL_REQUEST_GET_FACILITY_LOCK reply with an incomplete
- * integer parameter, which will trigger a malformed parcel
- * error.
- */
-static const guchar reply_get_facility_lock_data_invalid_4[] = {
-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00
-};
-
-static const struct cb_data testdata_query_invalid_4 = {
-	.start_func = trigger_query,
-	.lock = "OI",
-	.cls = BEARER_CLASS_VOICE,
-	.rtd = {
-		.req_data = req_get_facility_lock_parcel_1,
-		.req_size = sizeof(req_get_facility_lock_parcel_1),
-		.rsp_data = reply_get_facility_lock_data_invalid_4,
-		.rsp_size = sizeof(reply_get_facility_lock_data_invalid_4),
-	},
-	.error_type = OFONO_ERROR_TYPE_FAILURE,
-};
-
 /* RIL_REQUEST_SET_FACILITY_LOCK witht the following parameters:
  *
  * facility="OI" (outgoing international calls)
diff --git a/unit/test-stkutil.c b/unit/test-stkutil.c
index 77ec3530b38c3f192c305d4128e1bcff89e2c927..bf6776eaf408c65effea7bbf2bc1dfa36cc4c0cb 100644
--- a/unit/test-stkutil.c
+++ b/unit/test-stkutil.c
@@ -16867,11 +16867,6 @@ static const struct terminal_response_test get_input_response_data_181 = {
 	},
 };
 
-static const unsigned char get_input_response_191b[] = {
-	0x81, 0x03, 0x01, 0x23, 0x01, 0x82, 0x02, 0x82,
-	0x81, 0x83, 0x01, 0x00, 0x8d, 0x00,
-};
-
 static const struct terminal_response_test get_input_response_data_191 = {
 	/* Either get_input_response_191a or get_input_response_191b is ok */
 	.pdu = get_input_response_191a,
@@ -17349,11 +17344,6 @@ static const unsigned char poll_interval_response_111a[] = {
 	0x81, 0x83, 0x01, 0x00, 0x84, 0x02, 0x00, 0x01,
 };
 
-static const unsigned char poll_interval_response_111b[] = {
-	0x81, 0x03, 0x01, 0x03, 0x00, 0x82, 0x02, 0x82,
-	0x81, 0x83, 0x01, 0x00, 0x84, 0x02, 0x01, 0x3c,
-};
-
 static const struct terminal_response_test poll_interval_response_data_111a = {
 	/* Either poll_interval_response_111a or b is ok */
 	.pdu = poll_interval_response_111a,
@@ -17476,26 +17466,6 @@ static const struct terminal_response_test refresh_response_data_131a = {
 	},
 };
 
-static const unsigned char refresh_response_131b[] = {
-	0x81, 0x03, 0x01, 0x01, 0x02, 0x82, 0x02, 0x82,
-	0x81, 0x83, 0x01, 0x03,
-};
-
-static const struct terminal_response_test refresh_response_data_131b = {
-	.pdu = refresh_response_131b,
-	.pdu_len = sizeof(refresh_response_131b),
-	.response = {
-		.number = 1,
-		.type = STK_COMMAND_TYPE_REFRESH,
-		.qualifier = 0x02, /* USIM Initialization & File Change */
-		.src = STK_DEVICE_IDENTITY_TYPE_TERMINAL,
-		.dst = STK_DEVICE_IDENTITY_TYPE_UICC,
-		.result = {
-			.type = STK_RESULT_TYPE_REFRESH_WITH_EFS,
-		},
-	},
-};
-
 static const unsigned char refresh_response_141a[] = {
 	0x81, 0x03, 0x01, 0x01, 0x00, 0x82, 0x02, 0x82,
 	0x81, 0x83, 0x01, 0x00,
@@ -18338,9 +18308,6 @@ static const unsigned char provide_local_info_response_131[] = {
 	0x06, 0x45, 0x91, 0xa4, 0x90,
 };
 
-static const short bcch_channels_131[] = {
-};
-
 static const struct terminal_response_test
 		provide_local_info_response_data_131 = {
 	.pdu = provide_local_info_response_131,
-- 
1.9.3

Intel Deutschland GmbH
Registered Address: Am Campeon 10-12, 85579 Neubiberg, Germany
Tel: +49 89 99 8853-0, www.intel.de
Managing Directors: Christin Eisenschmid, Christian Lamprechter
Chairperson of the Supervisory Board: Nicole Lau
Registered Office: Munich
Commercial Register: Amtsgericht Muenchen HRB 186928

Re: [PATCH 1/3] drivers/isimodem: fix GCC 6.0 errors

[Denis Kenzior]

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

Hi Kuba,

On 04/18/2016 06:45 AM, Kuba Pawlak wrote:
> From: Kuba Pawlak <kuba.t.pawlak@gmail.com>
>
> -Werror=misleading-indentation
> ---
>   drivers/isimodem/voicecall.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>

All three applied, thanks.

Regards,
-Denis