svn commit: samba r25258 - in branches: SAMBA_3_2/source/lib SAMBA_3_2_0/source/lib

[obnox at samba.org]

Author: obnox
Date: 2007-09-20 12:42:15 +0000 (Thu, 20 Sep 2007)
New Revision: 25258

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25258

Log:
Fix a panic message and remove superfluous return after the call to smb_panic().

Michael


Modified:
   branches/SAMBA_3_2/source/lib/charcnv.c
   branches/SAMBA_3_2_0/source/lib/charcnv.c


Changeset:
Modified: branches/SAMBA_3_2/source/lib/charcnv.c
===================================================================
--- branches/SAMBA_3_2/source/lib/charcnv.c	2007-09-20 11:02:27 UTC (rev 25257)
+++ branches/SAMBA_3_2/source/lib/charcnv.c	2007-09-20 12:42:15 UTC (rev 25258)
@@ -1409,8 +1409,7 @@
 
 	if (dest_len == (size_t)-1) {
 		/* No longer allow dest_len of -1. */
-		smb_panic("push_utf8 - invalid dest_len of -1");
-		return 0;
+		smb_panic("pull_ucs2 - invalid dest_len of -1");
 	}
 
 	if (ucs2_align(base_ptr, src, flags)) {

Modified: branches/SAMBA_3_2_0/source/lib/charcnv.c
===================================================================
--- branches/SAMBA_3_2_0/source/lib/charcnv.c	2007-09-20 11:02:27 UTC (rev 25257)
+++ branches/SAMBA_3_2_0/source/lib/charcnv.c	2007-09-20 12:42:15 UTC (rev 25258)
@@ -1409,8 +1409,7 @@
 
 	if (dest_len == (size_t)-1) {
 		/* No longer allow dest_len of -1. */
-		smb_panic("push_utf8 - invalid dest_len of -1");
-		return 0;
+		smb_panic("pull_ucs2 - invalid dest_len of -1");
 	}
 
 	if (ucs2_align(base_ptr, src, flags)) {