svn commit: samba r2380 - in branches/SAMBA_4_0/source/lib: .

tridge at samba.org tridge at samba.org
Fri Sep 17 10:41:54 GMT 2004


Author: tridge
Date: 2004-09-17 10:41:53 +0000 (Fri, 17 Sep 2004)
New Revision: 2380

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

Log:
nicer error reporting in convert_string()



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


Changeset:
Modified: branches/SAMBA_4_0/source/lib/charcnv.c
===================================================================
--- branches/SAMBA_4_0/source/lib/charcnv.c	2004-09-17 09:18:19 UTC (rev 2379)
+++ branches/SAMBA_4_0/source/lib/charcnv.c	2004-09-17 10:41:53 UTC (rev 2380)
@@ -161,12 +161,15 @@
 				break;
 			case E2BIG:
 				reason="No more room"; 
-				DEBUG(0, ("convert_string: Required %d, available %d\n",
-					srclen, 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 */
+				if (from == CH_UNIX) {
+					DEBUG(0,("E2BIG: convert_string(%s,%s): srclen=%d destlen=%d - '%s'\n",
+						 charset_name(from), charset_name(to),
+						 srclen, destlen, (const char *)src));
+				} else {
+					DEBUG(0,("E2BIG: convert_string(%s,%s): srclen=%d destlen=%d\n",
+						 charset_name(from), charset_name(to),
+						 srclen, destlen));
+				}
 		               break;
 			case EILSEQ:
 			       reason="Illegal multibyte sequence";



More information about the samba-cvs mailing list