more portability fixes

diff --git a/source/lib/charcnv.c b/source/lib/charcnv.c
index 154e9971e560b08e00210a16c7b2a4b838230a1c..bec34c0d419acbe964a834d151519377a41df628 100644 (file)
--- a/source/lib/charcnv.c
+++ b/source/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/source/lib/iconv.c b/source/lib/iconv.c
index 6dfdf3adf15cd7cf2463c6b3c88f2c4396cb8079..03e63be5e672718570057d9c13ef94cd4ecf3c93 100644 (file)
--- a/source/lib/iconv.c
+++ b/source/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);