aboutsummaryrefslogtreecommitdiff
path: root/pretty.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-09-12 15:34:36 -0700
committerJunio C Hamano <gitster@pobox.com>2016-09-12 15:34:36 -0700
commite4ec05ed93bede22b0d79ab58997f0fc170929e9 (patch)
treef2e445694b466952e89b616977832a641432db9b /pretty.c
parent27853a85edce65afd73c8bb0ca7adf0a4468def3 (diff)
parentd23309733a5b2a9e1adc304ee50c5a5ed7a087c2 (diff)
downloadgit-e4ec05ed93bede22b0d79ab58997f0fc170929e9.tar.gz
git-e4ec05ed93bede22b0d79ab58997f0fc170929e9.tar.xz
Merge branch 'rs/hex2chr'
* rs/hex2chr: introduce hex2chr() for converting two hexadecimal digits to a character
Diffstat (limited to 'pretty.c')
-rw-r--r--pretty.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/pretty.c b/pretty.c
index 9609afb51..9788bd8f3 100644
--- a/pretty.c
+++ b/pretty.c
@@ -1065,7 +1065,7 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
const struct commit *commit = c->commit;
const char *msg = c->message;
struct commit_list *p;
- int h1, h2;
+ int ch;
/* these are independent of the commit */
switch (placeholder[0]) {
@@ -1089,14 +1089,11 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
return 1;
case 'x':
/* %x00 == NUL, %x0a == LF, etc. */
- if (0 <= (h1 = hexval_table[0xff & placeholder[1]]) &&
- h1 <= 16 &&
- 0 <= (h2 = hexval_table[0xff & placeholder[2]]) &&
- h2 <= 16) {
- strbuf_addch(sb, (h1<<4)|h2);
- return 3;
- } else
+ ch = hex2chr(placeholder + 1);
+ if (ch < 0)
return 0;
+ strbuf_addch(sb, ch);
+ return 3;
case 'w':
if (placeholder[1] == '(') {
unsigned long width = 0, indent1 = 0, indent2 = 0;