r12651: Remove STR_LARGE_SIZE as it's no longer used
authorJelmer Vernooij <jelmer@samba.org>
Sat, 31 Dec 2005 14:57:43 +0000 (14:57 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 18:49:35 +0000 (13:49 -0500)
(This used to be commit 8e95aee6fba4d3632f4718428bdb1f07cb58fab4)

source4/librpc/idl/idl_types.h
source4/librpc/ndr/libndr.h
source4/librpc/ndr/ndr_string.c

index 98a8d1c093e17540a01d244d93298effcf88fabc..054aef608b78bf97e6af5c0fb61a2cf00c6a1e99 100644 (file)
@@ -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
index 86962bd563bb463cb865fa36e658561883f29046..e5234ac7eda7d4238f4751e6b632c46c7f53db31 100644 (file)
@@ -115,7 +115,6 @@ struct ndr_print {
 #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)
 
 
index fbccdb6bedbde04f6e6d8e3a5b18f60b8103e09d..9eb26c2c83e34b379344c3bfa2233e51a41b72ec 100644 (file)
@@ -65,7 +65,6 @@ NTSTATUS ndr_pull_string(struct ndr_pull *ndr, int ndr_flags, const char **s)
        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 @@ NTSTATUS ndr_pull_string(struct ndr_pull *ndr, int ndr_flags, const char **s)
                }
                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 @@ NTSTATUS ndr_push_string(struct ndr_push *ndr, int ndr_flags, const char *s)
 
        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));