From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Date: Tue, 17 Jan 2017 15:07:31 +0000 (-0500)
Subject: x is never reused, no need to shift it
X-Git-Tag: v2.10.0-rc1~63
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=157b2d445425611ab8ada02e34204cd9134c2acc;p=lttng-tools.git

x is never reused, no need to shift it

Also remove noise in scanbuild report.

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/src/bin/lttng-sessiond/ust-metadata.c b/src/bin/lttng-sessiond/ust-metadata.c
index c1a80c746..fb1f11521 100644
--- a/src/bin/lttng-sessiond/ust-metadata.c
+++ b/src/bin/lttng-sessiond/ust-metadata.c
@@ -74,7 +74,6 @@ int fls(unsigned int x)
 		r -= 2;
 	}
 	if (!(x & 0x80000000U)) {
-		x <<= 1;
 		r -= 1;
 	}
 	return r;
diff --git a/src/common/compat/string.h b/src/common/compat/string.h
index 7c426ef3d..db3db8052 100644
--- a/src/common/compat/string.h
+++ b/src/common/compat/string.h
@@ -117,7 +117,6 @@ static inline int lttng_fls(int val)
 		r -= 2;
 	}
 	if (!(x & 0x80000000U)) {
-		x <<= 1;
 		r -= 1;
 	}
 	return r;