summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Dieter Wallnöfer <mwallnoefer@yahoo.de>2008-09-18 16:15:05 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-10-21 14:40:41 +0200
commit2a267e6da524c5dc69b3e2d97114f17461567856 (patch)
treec848455d51b68af6ea11bd59f50a080b0e55d103
parentf10227958bef70df7609aeec5dcc834a601bd945 (diff)
downloadsamba-2a267e6da524c5dc69b3e2d97114f17461567856.tar.gz
samba-2a267e6da524c5dc69b3e2d97114f17461567856.tar.bz2
samba-2a267e6da524c5dc69b3e2d97114f17461567856.zip
Revert "Fix for the empty string (REG_SZ) problem"
This reverts commit d994520885301f1dfd04363bab05c9238ce5ae05. This shouldn't be fixed in the general character conversion library but directly in the registry library.
-rw-r--r--source4/lib/charset/iconv.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/source4/lib/charset/iconv.c b/source4/lib/charset/iconv.c
index 9b15cfb3cc..d4f930b462 100644
--- a/source4/lib/charset/iconv.c
+++ b/source4/lib/charset/iconv.c
@@ -600,14 +600,6 @@ static size_t utf8_push(void *cd, const char **inbuf, size_t *inbytesleft,
uint8_t *c = (uint8_t *)*outbuf;
const uint8_t *uc = (const uint8_t *)*inbuf;
- /* Special case: Windows (e.g. "regedit") also expects an empty buffer
- with length 1 as a valid empty UTF8 string */
- if (in_left == 1 && uc[0] == 0 && out_left >= 1) {
- c[0] = uc[0];
- in_left -= 1;
- out_left -= 1;
- }
-
while (in_left >= 2 && out_left >= 1) {
unsigned int codepoint;