svn commit: samba r4102 - in branches/SAMBA_4_0/source/librpc: idl
ndr
metze at samba.org
metze at samba.org
Wed Dec 8 11:30:26 GMT 2004
Author: metze
Date: 2004-12-08 11:30:26 +0000 (Wed, 08 Dec 2004)
New Revision: 4102
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=4102
Log:
more uint64 vs HYPER_T fixes
NOTE:
[u]int64 uses 4 Byte alignment
and HYPER_T uses 8 Byte alignment
metze
Modified:
branches/SAMBA_4_0/source/librpc/idl/drsblobs.idl
branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl
branches/SAMBA_4_0/source/librpc/ndr/libndr.h
branches/SAMBA_4_0/source/librpc/ndr/ndr_basic.c
Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/drsblobs.idl
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl/drsblobs.idl 2004-12-08 11:02:47 UTC (rev 4101)
+++ branches/SAMBA_4_0/source/librpc/idl/drsblobs.idl 2004-12-08 11:30:26 UTC (rev 4102)
@@ -16,8 +16,8 @@
uint32 version;
NTTIME_1sec orginating_time;
GUID orginating_dsa; /* the 'invocationId' ? */
- uint64 orginating_usn;
- uint64 local_usn;
+ HYPER_T orginating_usn;
+ HYPER_T local_usn;
} replPropertyMetaData1;
typedef struct {
@@ -47,7 +47,7 @@
*/
typedef struct {
GUID invocation_id_guid; /* the 'invocationId' field of the CN=NTDS Settings object */
- uint64 highest_usn; /* updated after a full replication cycle */
+ HYPER_T highest_usn; /* updated after a full replication cycle */
} replUpToDateVector1;
typedef struct {
@@ -58,7 +58,7 @@
typedef struct {
GUID invocation_id_guid; /* the 'invocationId' field of the CN=NTDS Settings object */
- uint64 highest_usn; /* updated after a full replication cycle */
+ HYPER_T highest_usn; /* updated after a full replication cycle */
NTTIME_1sec last_success;
} replUpToDateVector2;
@@ -104,9 +104,9 @@
uint32 replica_flags;
uint8 schedule[84];
uint32 reserved;
- uint64 tmp_highest_usn; /* updated after each object update */
- uint64 reserved_usn;
- uint64 highest_usn; /* updated after a full replication cycle */
+ HYPER_T tmp_highest_usn; /* updated after each object update */
+ HYPER_T reserved_usn;
+ HYPER_T highest_usn; /* updated after a full replication cycle */
GUID source_dsa_obj_guid; /* the 'objectGuid' field of the CN=NTDS Settings object */
GUID source_dsa_invocation_id; /* the 'invocationId' field of the CN=NTDS Settings object */
GUID transport_guid;
Modified: branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl 2004-12-08 11:02:47 UTC (rev 4101)
+++ branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl 2004-12-08 11:30:26 UTC (rev 4102)
@@ -526,7 +526,7 @@
} drsuapi_DsReplicaAttrValMetaData2Ctr;
typedef struct {
- uint64 u1; /* session number? */
+ HYPER_T u1; /* session number? */
uint32 u2;
uint32 u3;
GUID bind_guid;
@@ -556,7 +556,7 @@
uint32 u3;
uint32 u4;
uint32 u5;
- uint64 u6;
+ HYPER_T u6;
uint32 u7;
} drsuapi_DsReplica06;
Modified: branches/SAMBA_4_0/source/librpc/ndr/libndr.h
===================================================================
--- branches/SAMBA_4_0/source/librpc/ndr/libndr.h 2004-12-08 11:02:47 UTC (rev 4101)
+++ branches/SAMBA_4_0/source/librpc/ndr/libndr.h 2004-12-08 11:30:26 UTC (rev 4102)
@@ -200,12 +200,18 @@
#define ndr_size_uint16(t, p, flags) (NDR_SIZE_ALIGN(t, 2, flags) + 2)
#define ndr_size_int32(t, p, flags) (NDR_SIZE_ALIGN(t, 4, flags) + 4)
#define ndr_size_uint32(t, p, flags) (NDR_SIZE_ALIGN(t, 4, flags) + 4)
-#define ndr_size_int64(t, p, flags) (NDR_SIZE_ALIGN(t, 8, flags) + 8)
-#define ndr_size_uint64(t, p, flags) (NDR_SIZE_ALIGN(t, 8, flags) + 8)
#define ndr_size_ptr(t, p, flags) (NDR_SIZE_ALIGN(t, 4, flags) + 4)
+/*
+ * [u]int64 uses 4 Byte alignment
+ * and HYPER_T uses 8 Byte alignment
+ */
+#define ndr_size_int64(t, p, flags) (NDR_SIZE_ALIGN(t, 4, flags) + 8)
+#define ndr_size_uint64(t, p, flags) (NDR_SIZE_ALIGN(t, 4, flags) + 8)
+#define ndr_size_HYPER_T(t, p, flags) (NDR_SIZE_ALIGN(t, 8, flags) + 8)
+
#define ndr_size_NTTIME(t, p, flags) ndr_size_uint64(t, p, flags)
-#define ndr_size_NTTIME_1sec(t, p, flags) ndr_size_NTTIME(t, p, flags)
+#define ndr_size_NTTIME_1sec(t, p, flags) ndr_size_HYPER_T(t, p, flags)
#define ndr_size_WERROR(t, p, flags) ndr_size_uint32(t, p, flags)
#define ndr_size_NTSTATUS(t, p, flags) ndr_size_uint32(t, p, flags)
Modified: branches/SAMBA_4_0/source/librpc/ndr/ndr_basic.c
===================================================================
--- branches/SAMBA_4_0/source/librpc/ndr/ndr_basic.c 2004-12-08 11:02:47 UTC (rev 4101)
+++ branches/SAMBA_4_0/source/librpc/ndr/ndr_basic.c 2004-12-08 11:30:26 UTC (rev 4102)
@@ -960,7 +960,7 @@
NTSTATUS ndr_push_NTTIME_1sec(struct ndr_push *ndr, NTTIME t)
{
t /= 10000000;
- NDR_CHECK(ndr_push_uint64(ndr, t));
+ NDR_CHECK(ndr_push_HYPER_T(ndr, t));
return NT_STATUS_OK;
}
@@ -969,7 +969,7 @@
*/
NTSTATUS ndr_pull_NTTIME_1sec(struct ndr_pull *ndr, NTTIME *t)
{
- NDR_CHECK(ndr_pull_uint64(ndr, t));
+ NDR_CHECK(ndr_pull_HYPER_T(ndr, t));
(*t) *= 10000000;
return NT_STATUS_OK;
}
More information about the samba-cvs
mailing list