Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sysctl: don't use own implementation of hex_to_bin()

Browse source 
Remove own implementation of hex_to_bin().

Signed-off-by: Andy Shevchenko <ext-andriy.shevchenko@nokia.com>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Andy Shevchenko 2010-05-24 14:33:26 -07:00 committed by Linus Torvalds
parent 96b89f323d
commit 69e4469a39
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
kernel/sysctl_binary.c
View file

@ -13,6 +13,7 @@
#include <linux/file.h> #include <linux/file.h>
#include <linux/ctype.h> #include <linux/ctype.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/kernel.h>
#include <linux/slab.h> #include <linux/slab.h>
#ifdef CONFIG_SYSCTL_SYSCALL #ifdef CONFIG_SYSCTL_SYSCALL
@ -1124,11 +1125,6 @@ static ssize_t bin_ulongvec(struct file *file,
return result; return result;
} }
static unsigned hex_value(int ch)
{
return isdigit(ch) ? ch - '0' : ((ch | 0x20) - 'a') + 10;
}
static ssize_t bin_uuid(struct file *file, static ssize_t bin_uuid(struct file *file,
void __user *oldval, size_t oldlen, void __user *newval, size_t newlen) void __user *oldval, size_t oldlen, void __user *newval, size_t newlen)
{ {
@ -1156,7 +1152,8 @@ static ssize_t bin_uuid(struct file *file,
if (!isxdigit(str[0]) || !isxdigit(str[1])) if (!isxdigit(str[0]) || !isxdigit(str[1]))
goto out; goto out;
uuid[i] = (hex_value(str[0]) << 4) | hex_value(str[1]); uuid[i] = (hex_to_bin(str[0]) << 4) |
hex_to_bin(str[1]);
str += 2; str += 2;
if (*str == '-') if (*str == '-')
str++; str++;