diff options
| author | Lars Hjemli | 2011-05-23 23:26:10 +0200 |
|---|---|---|
| committer | Lars Hjemli | 2011-05-23 23:26:10 +0200 |
| commit | 652a5a18db3b0409fedfaf8c5720446d87628ba0 (patch) | |
| tree | cefa386058d968217af24374b93972820a9b43a8 /parsing.c | |
| parent | Merge branch 'dm/disable-clone' (diff) | |
| parent | fix virtual-root if script-name is "" (diff) | |
| download | cgit-652a5a18db3b0409fedfaf8c5720446d87628ba0.tar.gz cgit-652a5a18db3b0409fedfaf8c5720446d87628ba0.zip | |
Merge branch 'stable'
Diffstat (limited to 'parsing.c')
| -rw-r--r-- | parsing.c | 5 |
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 | |||
| @@ -103,7 +103,10 @@ const 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 */ |