summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--parsing.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/parsing.c b/parsing.c
index c9e4350..151c0fe 100644
--- a/parsing.c
+++ b/parsing.c
@@ -94,25 +94,28 @@ char *parse_user(char *t, char **name, char **email, unsigned long *date)
94 p++; 94 p++;
95 } 95 }
96 return p; 96 return p;
97} 97}
98 98
99#ifdef NO_ICONV 99#ifdef NO_ICONV
100#define reencode(a, b, c) 100#define reencode(a, b, c)
101#else 101#else
102const char *reencode(char **txt, const char *src_enc, const char *dst_enc) 102const char *reencode(char **txt, const char *src_enc, const char *dst_enc)
103{ 103{
104 char *tmp; 104 char *tmp;
105 105
106 if (!txt || !*txt || !src_enc || !dst_enc) 106 if (!txt)
107 return NULL;
108
109 if (!*txt || !src_enc || !dst_enc)
107 return *txt; 110 return *txt;
108 111
109 /* no encoding needed if src_enc equals dst_enc */ 112 /* no encoding needed if src_enc equals dst_enc */
110 if(!strcasecmp(src_enc, dst_enc)) 113 if(!strcasecmp(src_enc, dst_enc))
111 return *txt; 114 return *txt;
112 115
113 tmp = reencode_string(*txt, dst_enc, src_enc); 116 tmp = reencode_string(*txt, dst_enc, src_enc);
114 if (tmp) { 117 if (tmp) {
115 free(*txt); 118 free(*txt);
116 *txt = tmp; 119 *txt = tmp;
117 } 120 }
118 return *txt; 121 return *txt;