From d404065a82187c8e71cf82e95ab503ff00608722 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 9 Mar 2016 11:49:42 +0100 Subject: [PATCH] lib/linux_version: avoid major and minor shadowing Signed-off-by: Karel Zak --- lib/linux_version.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/linux_version.c b/lib/linux_version.c index 2bcc2cc65b..22f6a02d7d 100644 --- a/lib/linux_version.c +++ b/lib/linux_version.c @@ -1,25 +1,24 @@ #include #include +#include "c.h" #include "linux_version.h" int get_linux_version (void) { static int kver = -1; struct utsname uts; - int major = 0; - int minor = 0; - int teeny = 0; + int x = 0, y = 0, z = 0; int n; if (kver != -1) return kver; - if (uname (&uts)) + if (uname(&uts)) return kver = 0; - n = sscanf(uts.release, "%d.%d.%d", &major, &minor, &teeny); + n = sscanf(uts.release, "%d.%d.%d", &x, &y, &z); if (n < 1 || n > 3) return kver = 0; - return kver = KERNEL_VERSION(major, minor, teeny); + return kver = KERNEL_VERSION(x, y, y); } -- 2.47.2