svn commit: samba r12651 - in branches/SAMBA_4_0/source/librpc: idl ndr

[jelmer at samba.org]

Author: jelmer
Date: 2005-12-31 14:57:43 +0000 (Sat, 31 Dec 2005)
New Revision: 12651

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

Log:
Remove STR_LARGE_SIZE as it's no longer used

Modified:
   branches/SAMBA_4_0/source/librpc/idl/idl_types.h
   branches/SAMBA_4_0/source/librpc/ndr/libndr.h
   branches/SAMBA_4_0/source/librpc/ndr/ndr_string.c


Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/idl_types.h
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl/idl_types.h	2005-12-31 14:29:13 UTC (rev 12650)
+++ branches/SAMBA_4_0/source/librpc/idl/idl_types.h	2005-12-31 14:57:43 UTC (rev 12651)
@@ -10,7 +10,6 @@
 #define STR_CONFORMANT  LIBNDR_FLAG_STR_CONFORMANT
 #define STR_CHARLEN	LIBNDR_FLAG_STR_CHARLEN
 #define STR_UTF8	LIBNDR_FLAG_STR_UTF8
-#define STR_LARGE_SIZE	LIBNDR_FLAG_STR_LARGE_SIZE
 
 /*
   a UCS2 string prefixed with [size], 32 bits

Modified: branches/SAMBA_4_0/source/librpc/ndr/libndr.h
===================================================================
--- branches/SAMBA_4_0/source/librpc/ndr/libndr.h	2005-12-31 14:29:13 UTC (rev 12650)
+++ branches/SAMBA_4_0/source/librpc/ndr/libndr.h	2005-12-31 14:57:43 UTC (rev 12651)
@@ -115,7 +115,6 @@
 #define LIBNDR_FLAG_STR_CHARLEN		(1<<11)
 #define LIBNDR_FLAG_STR_UTF8		(1<<12)
 #define LIBNDR_FLAG_STR_FIXLEN15	(1<<13)
-#define LIBNDR_FLAG_STR_LARGE_SIZE	(1<<14)
 #define LIBNDR_STRING_FLAGS		(0x7FFC)
 
 

Modified: branches/SAMBA_4_0/source/librpc/ndr/ndr_string.c
===================================================================
--- branches/SAMBA_4_0/source/librpc/ndr/ndr_string.c	2005-12-31 14:29:13 UTC (rev 12650)
+++ branches/SAMBA_4_0/source/librpc/ndr/ndr_string.c	2005-12-31 14:57:43 UTC (rev 12651)
@@ -65,7 +65,6 @@
 	switch (flags & LIBNDR_STRING_FLAGS) {
 	case LIBNDR_FLAG_STR_LEN4|LIBNDR_FLAG_STR_SIZE4:
 	case LIBNDR_FLAG_STR_LEN4|LIBNDR_FLAG_STR_SIZE4|LIBNDR_FLAG_STR_NOTERM:
-	case LIBNDR_FLAG_STR_LEN4|LIBNDR_FLAG_STR_SIZE4|LIBNDR_FLAG_STR_NOTERM|LIBNDR_FLAG_STR_LARGE_SIZE:
 		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &len1));
 		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &ofs));
 		if (ofs != 0) {
@@ -94,16 +93,8 @@
 		}
 		NDR_CHECK(ndr_pull_advance(ndr, (len2 + c_len_term)*byte_mul));
 
-		if (ndr->flags & LIBNDR_FLAG_STR_LARGE_SIZE) {
-			if (len1 != 0 && len2 == 0) {
-				DEBUG(6,("len1[%u] != (len2[%u]) '%s'\n", len1, len2, as));
-			} else if (len1 != (len2 + 1)) {
-				DEBUG(6,("len1[%u] != (len2[%u]+1) '%s'\n", len1, len2, as));
-			}
-		} else {
-			if (len1 != len2) {
-				DEBUG(6,("len1[%u] != len2[%u] '%s'\n", len1, len2, as));
-			}
+		if (len1 != len2) {
+			DEBUG(6,("len1[%u] != len2[%u] '%s'\n", len1, len2, as));
 		}
 
 		/* this is a way of detecting if a string is sent with the wrong
@@ -351,7 +342,6 @@
 
 	case LIBNDR_FLAG_STR_LEN4|LIBNDR_FLAG_STR_SIZE4|LIBNDR_FLAG_STR_NOTERM:
 		c_len_term = 0;
-	case LIBNDR_FLAG_STR_LEN4|LIBNDR_FLAG_STR_SIZE4|LIBNDR_FLAG_STR_NOTERM|LIBNDR_FLAG_STR_LARGE_SIZE:
 		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, c_len+c_len_term));
 		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
 		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, c_len));