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

Remove own implementation of hex_to_bin().

Andy Shevchenko committed 16 years ago

Commit 69e44691 parent 96b89f31 file · +3 −6Browse files

Showing the changes to kernel/sysctl_binary.c (1 of 1 file). Show all

Unified · Split

@@ -13,6 +13,7 @@ · 12 unmodified lines
13	13	#include <linux/file.h>
14	14	#include <linux/ctype.h>
15	15	#include <linux/netdevice.h>
	16	+#include <linux/kernel.h>
16	17	#include <linux/slab.h>
17	18
18	19	#ifdef CONFIG_SYSCTL_SYSCALL
@@ -1124,11 +1125,6 @@ out: · 1105 unmodified lines
1124	1125	return result;
1125	1126	}
1126	1127
1127		−static unsigned hex_value(int ch)
1128		−{
1129		− return isdigit(ch) ? ch - '0' : ((ch \| 0x20) - 'a') + 10;
1130		−}
1131		−
1132	1128	static ssize_t bin_uuid(struct file *file,
1133	1129	void __user oldval, size_t oldlen, void __user newval, size_t newlen)
1134	1130	{
@@ -1156,7 +1152,8 @@ static ssize_t bin_uuid(struct file *file, · 21 unmodified lines
1156	1152	if (!isxdigit(str[0]) \|\| !isxdigit(str[1]))
1157	1153	goto out;
1158	1154
1159		− uuid[i] = (hex_value(str[0]) << 4) \| hex_value(str[1]);
	1155	+ uuid[i] = (hex_to_bin(str[0]) << 4) \|
	1156	+ hex_to_bin(str[1]);
1160	1157	str += 2;
1161	1158	if (*str == '-')
1162	1159	str++;