Merge branch 'stable'

1 files changed, 4 insertions, 0 deletions

diff --git a/parsing.c b/parsing.c
index c8f3048..f3f3b15 100644
--- a/parsing.c
+++ b/parsing.c
@@ -75,62 +75,66 @@ char *parse_user(char *t, char **name, char **email, unsigned long *date)
 		} else if (mode == 1 && *p == '\n') {
 			*name = substr(t, p);
 			p++;
 			break;
 		} else if (mode == 2 && *p == '>') {
 			*email = substr(t, p + 1);
 			t = p;
 			mode++;
 		} else if (mode == 2 && *p == '\n') {
 			*email = substr(t, p);
 			p++;
 			break;
 		} else if (mode == 3 && isdigit(*p)) {
 			*date = atol(p);
 			mode++;
 		} else if (*p == '\n') {
 			p++;
 			break;
 		}
 		p++;
 	}
 	return p;
 }
 
+#ifdef NO_ICONV
+#define reencode(a, b, c)
+#else
 const char *reencode(char **txt, const char *src_enc, const char *dst_enc)
 {
 	char *tmp;
 
 	if (!txt || !*txt || !src_enc || !dst_enc)
 		return *txt;
 
 	tmp = reencode_string(*txt, src_enc, dst_enc);
 	if (tmp) {
 		free(*txt);
 		*txt = tmp;
 	}
 	return *txt;
 }
+#endif
 
 struct commitinfo *cgit_parse_commit(struct commit *commit)
 {
 	struct commitinfo *ret;
 	char *p = commit->buffer, *t = commit->buffer;
 
 	ret = xmalloc(sizeof(*ret));
 	ret->commit = commit;
 	ret->author = NULL;
 	ret->author_email = NULL;
 	ret->committer = NULL;
 	ret->committer_email = NULL;
 	ret->subject = NULL;
 	ret->msg = NULL;
 	ret->msg_encoding = NULL;
 
 	if (p == NULL)
 		return ret;
 
 	if (strncmp(p, "tree ", 5))
 		die("Bad commit: %s", sha1_to_hex(commit->object.sha1));
 	else
 		p += 46; // "tree " + hex[40] + "\n"