svn commit: samba r7182 - in branches/SAMBA_4_0/source/librpc: idl
ndr
metze at samba.org
metze at samba.org
Thu Jun 2 00:19:58 GMT 2005
Author: metze
Date: 2005-06-02 00:19:57 +0000 (Thu, 02 Jun 2005)
New Revision: 7182
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=7182
Log:
remove current support for RELATIVE_CURRENT, this will be replaced with a better aproach later
metze
Modified:
branches/SAMBA_4_0/source/librpc/idl/idl_types.h
branches/SAMBA_4_0/source/librpc/idl/spoolss.idl
branches/SAMBA_4_0/source/librpc/ndr/libndr.h
branches/SAMBA_4_0/source/librpc/ndr/ndr.c
Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/idl_types.h
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl/idl_types.h 2005-06-02 00:18:06 UTC (rev 7181)
+++ branches/SAMBA_4_0/source/librpc/idl/idl_types.h 2005-06-02 00:19:57 UTC (rev 7182)
@@ -110,7 +110,4 @@
*/
#define NDR_PAHEX LIBNDR_PRINT_ARRAY_HEX
-/* this enables spoolss style relative ptrs */
-#define RELATIVE_CURRENT LIBNDR_FLAG_RELATIVE_CURRENT
-
#define bool8 uint8
Modified: branches/SAMBA_4_0/source/librpc/idl/spoolss.idl
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl/spoolss.idl 2005-06-02 00:18:06 UTC (rev 7181)
+++ branches/SAMBA_4_0/source/librpc/idl/spoolss.idl 2005-06-02 00:19:57 UTC (rev 7182)
@@ -791,7 +791,7 @@
[out] uint32 count
);
- typedef [flag(RELATIVE_CURRENT)] struct {
+ typedef struct {
[relative] nstring *port_name;
} spoolss_PortInfo1;
Modified: branches/SAMBA_4_0/source/librpc/ndr/libndr.h
===================================================================
--- branches/SAMBA_4_0/source/librpc/ndr/libndr.h 2005-06-02 00:18:06 UTC (rev 7181)
+++ branches/SAMBA_4_0/source/librpc/ndr/libndr.h 2005-06-02 00:19:57 UTC (rev 7182)
@@ -126,10 +126,6 @@
/* used to check if alignment padding is zero */
#define LIBNDR_FLAG_PAD_CHECK (1<<28)
-/* used to indicate spoolss style relative pointers (relative to current
- offset, not base) */
-#define LIBNDR_FLAG_RELATIVE_CURRENT (1<<29)
-
/* set if an object uuid will be present */
#define LIBNDR_FLAG_OBJECT_PRESENT (1<<30)
Modified: branches/SAMBA_4_0/source/librpc/ndr/ndr.c
===================================================================
--- branches/SAMBA_4_0/source/librpc/ndr/ndr.c 2005-06-02 00:18:06 UTC (rev 7181)
+++ branches/SAMBA_4_0/source/librpc/ndr/ndr.c 2005-06-02 00:19:57 UTC (rev 7182)
@@ -598,12 +598,7 @@
*/
NTSTATUS ndr_pull_relative_ptr1(struct ndr_pull *ndr, const void *p, uint32_t rel_offset)
{
- if (ndr->flags & LIBNDR_FLAG_RELATIVE_CURRENT) {
- return ndr_token_store(ndr, &ndr->relative_list, p,
- rel_offset + ndr->offset - 4);
- } else {
- return ndr_token_store(ndr, &ndr->relative_list, p, rel_offset);
- }
+ return ndr_token_store(ndr, &ndr->relative_list, p, rel_offset);
}
/*
@@ -645,11 +640,7 @@
NDR_CHECK(ndr_push_align(ndr, 4));
ndr_push_save(ndr, &save);
NDR_CHECK(ndr_token_retrieve(&ndr->relative_list, p, &ndr->offset));
- if (ndr->flags & LIBNDR_FLAG_RELATIVE_CURRENT) {
- NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, save.offset - ndr->offset));
- } else {
- NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, save.offset));
- }
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, save.offset));
ndr_push_restore(ndr, &save);
return NT_STATUS_OK;
}
More information about the samba-cvs
mailing list