linux-bluetooth.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] Remove not needed total variable in get_ltk_info
@ 2012-03-05 18:58 Szymon Janc
  2012-03-05 19:35 ` Johan Hedberg
  0 siblings, 1 reply; 2+ messages in thread
From: Szymon Janc @ 2012-03-05 18:58 UTC (permalink / raw)
  To: linux-bluetooth; +Cc: Szymon Janc

This variable is not really needed and was mostly dead assigned.
---
 src/adapter.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/adapter.c b/src/adapter.c
index 3c23971..acb845e 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -1776,10 +1776,9 @@ static struct smp_ltk_info *get_ltk_info(const char *addr, const char *value)
 {
 	struct smp_ltk_info *ltk;
 	char *ptr;
-	int i, ret, total;
+	int i, ret;
 
-	total = strlen(value);
-	if (total < 60) {
+	if (strlen(value) < 60) {
 		error("Unexpectedly short (%zu) LTK", strlen(value));
 		return NULL;
 	}
@@ -1791,7 +1790,6 @@ static struct smp_ltk_info *get_ltk_info(const char *addr, const char *value)
 	str2buf(value, ltk->val, sizeof(ltk->val));
 
 	ptr = (char *) value + 2 * sizeof(ltk->val) + 1;
-	total -= 2 * sizeof(ltk->val) + 1;
 
 	ret = sscanf(ptr, " %hhd %hhd %hhd %hhd %hd %n",
 					(uint8_t *) &ltk->addr_type,
@@ -1802,7 +1800,6 @@ static struct smp_ltk_info *get_ltk_info(const char *addr, const char *value)
 		return NULL;
 	}
 	ptr += i;
-	total -= i;
 
 	str2buf(ptr, ltk->rand, sizeof(ltk->rand));
 
-- 
1.7.9.1



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

* Re: [PATCH] Remove not needed total variable in get_ltk_info
  2012-03-05 18:58 [PATCH] Remove not needed total variable in get_ltk_info Szymon Janc
@ 2012-03-05 19:35 ` Johan Hedberg
  0 siblings, 0 replies; 2+ messages in thread
From: Johan Hedberg @ 2012-03-05 19:35 UTC (permalink / raw)
  To: Szymon Janc; +Cc: linux-bluetooth

Hi Szymon,

On Mon, Mar 05, 2012, Szymon Janc wrote:
> This variable is not really needed and was mostly dead assigned.
> ---
>  src/adapter.c |    7 ++-----
>  1 files changed, 2 insertions(+), 5 deletions(-)

Applied. Thanks.

Johan

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

end of thread, other threads:[~2012-03-05 19:35 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-05 18:58 [PATCH] Remove not needed total variable in get_ltk_info Szymon Janc
2012-03-05 19:35 ` Johan Hedberg

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).