Messages in this thread Patch in this message | | | From | Andy Shevchenko <> | Subject | [PATCH] fat: don't use custom hex_to_bin() | Date | Fri, 23 Sep 2011 14:32:12 +0300 |
| |
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> --- fs/fat/namei_vfat.c | 22 ++++++---------------- 1 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/fs/fat/namei_vfat.c b/fs/fat/namei_vfat.c index bb3f29c..09cec4c 100644 --- a/fs/fat/namei_vfat.c +++ b/fs/fat/namei_vfat.c @@ -21,6 +21,8 @@ #include <linux/slab.h> #include <linux/buffer_head.h> #include <linux/namei.h> +#include <linux/kernel.h> + #include "fat.h" /* @@ -505,7 +507,6 @@ xlate_to_uni(const unsigned char *name, int len, unsigned char *outname, struct nls_table *nls) { const unsigned char *ip; - unsigned char nc; unsigned char *op; unsigned int ec; int i, k, fill; @@ -530,21 +531,10 @@ xlate_to_uni(const unsigned char *name, int len, unsigned char *outname, return -EINVAL; ec = 0; for (k = 1; k < 5; k++) { - nc = ip[k]; - ec <<= 4; - if (nc >= '0' && nc <= '9') { - ec |= nc - '0'; - continue; - } - if (nc >= 'a' && nc <= 'f') { - ec |= nc - ('a' - 10); - continue; - } - if (nc >= 'A' && nc <= 'F') { - ec |= nc - ('A' - 10); - continue; - } - return -EINVAL; + int val = hex_to_bin(ip[k]); + if (val < 0) + return -EINVAL; + ec = (ec << 4) | val; } *op++ = ec & 0xFF; *op++ = ec >> 8; -- 1.7.6.3
| |