global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-13 10:23:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fake reencoding success under NO_ICONV instead of returning NULL."

Browse Source 
We have a working iconv now, so this workaround is no longer needed.
This commit is contained in:
Steffen Prohaska
2008-07-03 07:56:21 +02:00
parent adf63bc4e3
commit 861bebb425
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
utf8.c
View File

@@ -388,11 +388,4 @@ char *reencode_string(const char *in, const char *out_encoding, const char *in_e
iconv_close(conv);
return out;
}
#else
char *reencode_string(const char *in, const char *out_encoding, const char *in_encoding)
{
if (!in_encoding)
return NULL;
return xstrdup(in);
}
#endif

4
utf8.h
View File

@@ -10,6 +10,10 @@ int is_encoding_utf8(const char *name);
int print_wrapped_text(const char *text, int indent, int indent2, int len);
#ifndef NO_ICONV
char *reencode_string(const char *in, const char *out_encoding, const char *in_encoding);
#else
#define reencode_string(a,b,c) NULL
#endif
#endif