svn commit: samba r2392 - in branches/SAMBA_3_0/source/lib: .

[jra at samba.org]

Author: jra
Date: 2004-09-17 19:53:12 +0000 (Fri, 17 Sep 2004)
New Revision: 2392

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_3_0/source/lib&rev=2392&nolog=1

Log:
Steal the nicer error message from Samba4 :-).
Jeremy.

Modified:
   branches/SAMBA_3_0/source/lib/charcnv.c


Changeset:
Modified: branches/SAMBA_3_0/source/lib/charcnv.c
===================================================================
--- branches/SAMBA_3_0/source/lib/charcnv.c	2004-09-17 17:34:08 UTC (rev 2391)
+++ branches/SAMBA_3_0/source/lib/charcnv.c	2004-09-17 19:53:12 UTC (rev 2392)
@@ -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)