From: Junio C Hamano <junkio@cox.net>
Date: Wed, 20 Sep 2006 23:04:46 +0000 (-0700)
Subject: Make hexval() available to others.
X-Git-Tag: v1.4.3-rc1~70
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e49521b56d8715f46b93ee6bc95f7de9c6858365;p=git.git

Make hexval() available to others.

builtin-mailinfo.c has its own hexval implementaiton but it can
share the table-lookup one recently implemented in sha1_file.c

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c
index 0c65f9314..b8d7dbc0b 100644
--- a/builtin-mailinfo.c
+++ b/builtin-mailinfo.c
@@ -451,17 +451,6 @@ static int read_one_header_line(char *line, int sz, FILE *in)
 	return ofs;
 }
 
-static unsigned hexval(int c)
-{
-	if (c >= '0' && c <= '9')
-		return c - '0';
-	if (c >= 'a' && c <= 'f')
-		return c - 'a' + 10;
-	if (c >= 'A' && c <= 'F')
-		return c - 'A' + 10;
-	return ~0;
-}
-
 static int decode_q_segment(char *in, char *ot, char *ep, int rfc2047)
 {
 	int c;
diff --git a/cache.h b/cache.h
index 57db7c9b2..d557e75eb 100644
--- a/cache.h
+++ b/cache.h
@@ -278,6 +278,12 @@ enum object_type {
 	OBJ_BAD,
 };
 
+extern signed char hexval_table[256];
+static inline unsigned int hexval(unsigned int c)
+{
+	return hexval_table[c];
+}
+
 /* Convert to/from hex/sha1 representation */
 #define MINIMUM_ABBREV 4
 #define DEFAULT_ABBREV 7
diff --git a/sha1_file.c b/sha1_file.c
index b89edb951..0f9c2b621 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -26,44 +26,40 @@ const unsigned char null_sha1[20];
 
 static unsigned int sha1_file_open_flag = O_NOATIME;
 
-static inline unsigned int hexval(unsigned int c)
-{
-	static signed char val[256] = {
-		 -1, -1, -1, -1, -1, -1, -1, -1,		/* 00-07 */
-		 -1, -1, -1, -1, -1, -1, -1, -1,		/* 08-0f */
-		 -1, -1, -1, -1, -1, -1, -1, -1,		/* 10-17 */
-		 -1, -1, -1, -1, -1, -1, -1, -1,		/* 18-1f */
-		 -1, -1, -1, -1, -1, -1, -1, -1,		/* 20-27 */
-		 -1, -1, -1, -1, -1, -1, -1, -1,		/* 28-2f */
-		  0,  1,  2,  3,  4,  5,  6,  7,		/* 30-37 */
-		  8,  9, -1, -1, -1, -1, -1, -1,		/* 38-3f */
-		 -1, 10, 11, 12, 13, 14, 15, -1,		/* 40-47 */
-		 -1, -1, -1, -1, -1, -1, -1, -1,		/* 48-4f */
-		 -1, -1, -1, -1, -1, -1, -1, -1,		/* 50-57 */
-		 -1, -1, -1, -1, -1, -1, -1, -1,		/* 58-5f */
-		 -1, 10, 11, 12, 13, 14, 15, -1,		/* 60-67 */
-		 -1, -1, -1, -1, -1, -1, -1, -1,		/* 68-67 */
-		 -1, -1, -1, -1, -1, -1, -1, -1,		/* 70-77 */
-		 -1, -1, -1, -1, -1, -1, -1, -1,		/* 78-7f */
-		 -1, -1, -1, -1, -1, -1, -1, -1,		/* 80-87 */
-		 -1, -1, -1, -1, -1, -1, -1, -1,		/* 88-8f */
-		 -1, -1, -1, -1, -1, -1, -1, -1,		/* 90-97 */
-		 -1, -1, -1, -1, -1, -1, -1, -1,		/* 98-9f */
-		 -1, -1, -1, -1, -1, -1, -1, -1,		/* a0-a7 */
-		 -1, -1, -1, -1, -1, -1, -1, -1,		/* a8-af */
-		 -1, -1, -1, -1, -1, -1, -1, -1,		/* b0-b7 */
-		 -1, -1, -1, -1, -1, -1, -1, -1,		/* b8-bf */
-		 -1, -1, -1, -1, -1, -1, -1, -1,		/* c0-c7 */
-		 -1, -1, -1, -1, -1, -1, -1, -1,		/* c8-cf */
-		 -1, -1, -1, -1, -1, -1, -1, -1,		/* d0-d7 */
-		 -1, -1, -1, -1, -1, -1, -1, -1,		/* d8-df */
-		 -1, -1, -1, -1, -1, -1, -1, -1,		/* e0-e7 */
-		 -1, -1, -1, -1, -1, -1, -1, -1,		/* e8-ef */
-		 -1, -1, -1, -1, -1, -1, -1, -1,		/* f0-f7 */
-		 -1, -1, -1, -1, -1, -1, -1, -1,		/* f8-ff */
-	};
-	return val[c];
-}
+signed char hexval_table[256] = {
+	 -1, -1, -1, -1, -1, -1, -1, -1,		/* 00-07 */
+	 -1, -1, -1, -1, -1, -1, -1, -1,		/* 08-0f */
+	 -1, -1, -1, -1, -1, -1, -1, -1,		/* 10-17 */
+	 -1, -1, -1, -1, -1, -1, -1, -1,		/* 18-1f */
+	 -1, -1, -1, -1, -1, -1, -1, -1,		/* 20-27 */
+	 -1, -1, -1, -1, -1, -1, -1, -1,		/* 28-2f */
+	  0,  1,  2,  3,  4,  5,  6,  7,		/* 30-37 */
+	  8,  9, -1, -1, -1, -1, -1, -1,		/* 38-3f */
+	 -1, 10, 11, 12, 13, 14, 15, -1,		/* 40-47 */
+	 -1, -1, -1, -1, -1, -1, -1, -1,		/* 48-4f */
+	 -1, -1, -1, -1, -1, -1, -1, -1,		/* 50-57 */
+	 -1, -1, -1, -1, -1, -1, -1, -1,		/* 58-5f */
+	 -1, 10, 11, 12, 13, 14, 15, -1,		/* 60-67 */
+	 -1, -1, -1, -1, -1, -1, -1, -1,		/* 68-67 */
+	 -1, -1, -1, -1, -1, -1, -1, -1,		/* 70-77 */
+	 -1, -1, -1, -1, -1, -1, -1, -1,		/* 78-7f */
+	 -1, -1, -1, -1, -1, -1, -1, -1,		/* 80-87 */
+	 -1, -1, -1, -1, -1, -1, -1, -1,		/* 88-8f */
+	 -1, -1, -1, -1, -1, -1, -1, -1,		/* 90-97 */
+	 -1, -1, -1, -1, -1, -1, -1, -1,		/* 98-9f */
+	 -1, -1, -1, -1, -1, -1, -1, -1,		/* a0-a7 */
+	 -1, -1, -1, -1, -1, -1, -1, -1,		/* a8-af */
+	 -1, -1, -1, -1, -1, -1, -1, -1,		/* b0-b7 */
+	 -1, -1, -1, -1, -1, -1, -1, -1,		/* b8-bf */
+	 -1, -1, -1, -1, -1, -1, -1, -1,		/* c0-c7 */
+	 -1, -1, -1, -1, -1, -1, -1, -1,		/* c8-cf */
+	 -1, -1, -1, -1, -1, -1, -1, -1,		/* d0-d7 */
+	 -1, -1, -1, -1, -1, -1, -1, -1,		/* d8-df */
+	 -1, -1, -1, -1, -1, -1, -1, -1,		/* e0-e7 */
+	 -1, -1, -1, -1, -1, -1, -1, -1,		/* e8-ef */
+	 -1, -1, -1, -1, -1, -1, -1, -1,		/* f0-f7 */
+	 -1, -1, -1, -1, -1, -1, -1, -1,		/* f8-ff */
+};
 
 int get_sha1_hex(const char *hex, unsigned char *sha1)
 {