From: Karel Zak <kzak@redhat.com>
Date: Wed, 9 Mar 2016 10:49:42 +0000 (+0100)
Subject: lib/linux_version: avoid major and minor shadowing
X-Git-Tag: v2.28-rc1~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d404065a;p=thirdparty%2Futil-linux.git

lib/linux_version: avoid major and minor shadowing

Signed-off-by: Karel Zak <kzak@redhat.com>
---

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 <stdio.h>
 #include <sys/utsname.h>
 
+#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);
 }