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 c1a80c746847a3161f28c143c487f5ccfcde194f..fb1f1152180aad9d714831a9dfc70e1ec2f2a4ee 100644 (file)
--- 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 7c426ef3de3bd97e5056ef469f6db6cb528b1c61..db3db80522f5fe039f3f5f716f567f6676dfa87f 100644 (file)
--- 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;