summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2001-07-04 14:41:06 +0000
committerAndrew Tridgell <tridge@samba.org>2001-07-04 14:41:06 +0000
commit681c3100ed4d917edb91d1acd715b25b6f2702a9 (patch)
treecfeb3c29634fd7f77d68f3803fcd638c4df72a68
parent33b550e47ba63782f7a35af265b0b452a9c426dd (diff)
downloadsamba-681c3100ed4d917edb91d1acd715b25b6f2702a9.tar.gz
samba-681c3100ed4d917edb91d1acd715b25b6f2702a9.tar.bz2
samba-681c3100ed4d917edb91d1acd715b25b6f2702a9.zip
more portability fixes
(This used to be commit bf818268516cfbebcdeacbb0528395e9bbb8e442)
-rw-r--r--source3/lib/charcnv.c2
-rw-r--r--source3/lib/iconv.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c
index 154e9971e5..bec34c0d41 100644
--- a/source3/lib/charcnv.c
+++ b/source3/lib/charcnv.c
@@ -92,7 +92,9 @@ static size_t convert_string(smb_iconv_t descriptor,
DEBUG(0, ("Required %d, available %d\n",
srclen, destlen));
break;
+#ifdef EILSEQ
case EILSEQ: reason="Illegal myltybyte sequence"; break;
+#endif
}
DEBUG(0,("Conversion error:%s(%s)\n",reason,inbuf));
/* smb_panic(reason); */
diff --git a/source3/lib/iconv.c b/source3/lib/iconv.c
index 6dfdf3adf1..03e63be5e6 100644
--- a/source3/lib/iconv.c
+++ b/source3/lib/iconv.c
@@ -231,8 +231,6 @@ static struct {
} weird_table[] = {
{'q', "^q^", 3},
{'Q', "^Q^", 3},
- {'x', "\\.q\\.", 5},
- {'X', "\\.Z\\.", 5},
{0, NULL}
};
@@ -248,7 +246,7 @@ static size_t weird_pull(char **inbuf, size_t *inbytesleft,
weird_table[i].len) == 0) {
if (*inbytesleft < weird_table[i].len) {
DEBUG(0,("ERROR: truncated weird string\n"));
- smb_panic("weird_pull");
+ /* smb_panic("weird_pull"); */
} else {
(*outbuf)[0] = weird_table[i].from;
@@ -292,7 +290,7 @@ static size_t weird_push(char **inbuf, size_t *inbytesleft,
(*inbuf)[1] == 0) {
if (*outbytesleft < weird_table[i].len) {
DEBUG(0,("No room for weird character\n"));
- smb_panic("weird_push");
+ /* smb_panic("weird_push"); */
} else {
memcpy(*outbuf, weird_table[i].to,
weird_table[i].len);