From c86bf160a7f47998b39aace6bdaf2a0d35909f11 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sat, 28 Dec 2013 16:53:31 +0200 Subject: [PATCH] Replace unnecessary hex_value() with hex2byte() There is no need to maintain two functions for doing the same type of hex-to-binary conversion. Signed-hostap: Jouni Malinen --- src/wps/httpread.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/src/wps/httpread.c b/src/wps/httpread.c index ad4f4a1dc..e2f7c7c63 100644 --- a/src/wps/httpread.c +++ b/src/wps/httpread.c @@ -129,19 +129,6 @@ static int word_eq(char *s1, char *s2) } -/* convert hex to binary - * Requires that c have been previously tested true with isxdigit(). - */ -static int hex_value(int c) -{ - if (isdigit(c)) - return c - '0'; - if (islower(c)) - return 10 + c - 'a'; - return 10 + c - 'A'; -} - - static void httpread_timeout_handler(void *eloop_data, void *user_ctx); /* httpread_destroy -- if h is non-NULL, clean up @@ -295,8 +282,7 @@ static int httpread_hdr_analyze(struct httpread *h) int c = *rawuri; if (c == '%' && isxdigit(rawuri[1]) && isxdigit(rawuri[2])) { - *uri++ = (hex_value(rawuri[1]) << 4) | - hex_value(rawuri[2]); + *uri++ = hex2byte(rawuri + 1); rawuri += 3; } else { *uri++ = c;