svn commit: samba r2393 - in trunk/source/lib: .
jra at samba.org
jra at samba.org
Fri Sep 17 19:53:19 GMT 2004
Author: jra
Date: 2004-09-17 19:53:17 +0000 (Fri, 17 Sep 2004)
New Revision: 2393
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/trunk/source/lib&rev=2393&nolog=1
Log:
Steal the nicer error message from Samba4 :-).
Jeremy.
Modified:
trunk/source/lib/charcnv.c
Changeset:
Modified: trunk/source/lib/charcnv.c
===================================================================
--- trunk/source/lib/charcnv.c 2004-09-17 19:53:12 UTC (rev 2392)
+++ trunk/source/lib/charcnv.c 2004-09-17 19:53:17 UTC (rev 2393)
@@ -229,14 +229,18 @@
break;
case E2BIG:
reason="No more room";
- if (!conv_silent)
- DEBUG(3, ("convert_string_internal: Required %lu, available %lu\n",
- (unsigned long)srclen, (unsigned long)destlen));
- /* we are not sure we need srclen bytes,
- may be more, may be less.
- We only know we need more than destlen
- bytes ---simo */
- break;
+ if (!conv_silent) {
+ if (from == CH_UNIX) {
+ DEBUG(3,("E2BIG: convert_string(%s,%s): srclen=%u destlen=%u - '%s'\n",
+ charset_name(from), charset_name(to),
+ (unsigned int)srclen, (unsigned int)destlen, (const char *)src));
+ } else {
+ DEBUG(3,("E2BIG: convert_string(%s,%s): srclen=%u destlen=%u\n",
+ charset_name(from), charset_name(to),
+ (unsigned int)srclen, (unsigned int)destlen));
+ }
+ }
+ break;
case EILSEQ:
reason="Illegal multibyte sequence";
if (!conv_silent)
More information about the samba-cvs
mailing list