ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lib/linux_version: avoid major and minor shadowing 

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2016-03-09 11:49:42 +01:00
parent a3e1c47acc
commit d404065a82
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/linux_version.c
View File

@ -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);
}