sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-27 03:21:53 +03:00
Code

more portability fixes

Browse Source
This commit is contained in:
Andrew Tridgell 0001-01-01 00:00:00 +00:00
parent 7a5c24c219
commit bf81826851
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/lib/charcnv.c
View File

@ -92,7 +92,9 @@ static size_t convert_string(smb_iconv_t descriptor,
DEBUG(0, ("Required %d, available %d\n", DEBUG(0, ("Required %d, available %d\n",
srclen, destlen)); srclen, destlen));
break; break;
#ifdef EILSEQ
case EILSEQ: reason="Illegal myltybyte sequence"; break; case EILSEQ: reason="Illegal myltybyte sequence"; break;
#endif
} }
DEBUG(0,("Conversion error:%s(%s)\n",reason,inbuf)); DEBUG(0,("Conversion error:%s(%s)\n",reason,inbuf));
/* smb_panic(reason); */ /* smb_panic(reason); */

6
source/lib/iconv.c
View File

@ -231,8 +231,6 @@ static struct {
} weird_table[] = { } weird_table[] = {
{'q', "^q^", 3}, {'q', "^q^", 3},
{'Q', "^Q^", 3}, {'Q', "^Q^", 3},
{'x', "\\.q\\.", 5},
{'X', "\\.Z\\.", 5},
{0, NULL} {0, NULL}
}; };
@ -248,7 +246,7 @@ static size_t weird_pull(char **inbuf, size_t *inbytesleft,
weird_table[i].len) == 0) { weird_table[i].len) == 0) {
if (*inbytesleft < weird_table[i].len) { if (*inbytesleft < weird_table[i].len) {
DEBUG(0,("ERROR: truncated weird string\n")); DEBUG(0,("ERROR: truncated weird string\n"));
smb_panic("weird_pull"); /* smb_panic("weird_pull"); */
} else { } else {
(*outbuf)[0] = weird_table[i].from; (*outbuf)[0] = weird_table[i].from;
@ -292,7 +290,7 @@ static size_t weird_push(char **inbuf, size_t *inbytesleft,
(*inbuf)[1] == 0) { (*inbuf)[1] == 0) {
if (*outbytesleft < weird_table[i].len) { if (*outbytesleft < weird_table[i].len) {
DEBUG(0,("No room for weird character\n")); DEBUG(0,("No room for weird character\n"));
smb_panic("weird_push"); /* smb_panic("weird_push"); */
} else { } else {
memcpy(*outbuf, weird_table[i].to, memcpy(*outbuf, weird_table[i].to,
weird_table[i].len); weird_table[i].len);