sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-31 01:48:16 +03:00
Code

r5036: changed HYPER_T to the more standard "hyper"

Browse Source
This commit is contained in:
Andrew Tridgell 2005-01-27 06:33:07 +00:00 committed by Gerald (Jerry) Carter
parent f36e4cf686
commit 1d1a9c11ee
10 changed files with 77 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
source/build/pidl/util.pm
View File

@ -282,29 +282,28 @@ sub bitmap_type_decl($)
my %type_alignments =
(
"char" => 1,
"int8" => 1,
"uint8" => 1,
"short" => 2,
"wchar_t" => 2,
"int16" => 2,
"uint16" => 2,
"long" => 4,
"int32" => 4,
"uint32" => 4,
"dlong" => 4,
"udlong" => 4,
"NTTIME" => 4,
"NTTIME_1sec" => 4,
"time_t" => 4,
"DATA_BLOB" => 4,
"char" => 1,
"int8" => 1,
"uint8" => 1,
"short" => 2,
"wchar_t" => 2,
"int16" => 2,
"uint16" => 2,
"long" => 4,
"int32" => 4,
"uint32" => 4,
"dlong" => 4,
"udlong" => 4,
"NTTIME" => 4,
"NTTIME_1sec" => 4,
"time_t" => 4,
"DATA_BLOB" => 4,
"error_status_t" => 4,
"WERROR" => 4,
"boolean32" => 4,
"unsigned32" => 4,
"hyper" => 8,
"HYPER_T" => 8,
"NTTIME_hyper" => 8
"WERROR" => 4,
"boolean32" => 4,
"unsigned32" => 4,
"hyper" => 8,
"NTTIME_hyper" => 8
);
sub is_scalar_type($)
@ -538,8 +537,6 @@ my %type_mappings =
"dlong" => "int64_t",
"udlong" => "uint64_t",
"hyper" => "uint64_t",
"HYPER_T" => "uint64_t",
"hyper" => "uint64_t",
"NTTIME_1sec" => "NTTIME",
"NTTIME_hyper" => "NTTIME"
);

8
source/librpc/idl/dcom.idl
View File

@ -157,8 +157,8 @@ interface ObjectRpcBaseTypes
{
uint32 flags; /* STDOBJREF flags (see above) */
uint32 cPublicRefs; /* count of references passed */
HYPER_T oxid; /* oxid of server with this oid */
HYPER_T oid; /* oid of object with this ipid */
hyper oxid; /* oxid of server with this oid */
hyper oid; /* oid of object with this ipid */
GUID ipid; /* ipid of interface pointer to this object */
} STDOBJREF;
@ -346,9 +346,9 @@ interface IRemUnknown : IUnknown
]
interface ISystemActivator : IClassActivator
{
WERROR ISystemActivatorRemoteCreateInstance([in] HYPER_T unknown1, /* OXID ? */
WERROR ISystemActivatorRemoteCreateInstance([in] hyper unknown1, /* OXID ? */
[in] MInterfacePointer iface,
[in] HYPER_T unknown2,
[in] hyper unknown2,
[out] uint32 unknown3,
[out] MInterfacePointer iface);
}

14
source/librpc/idl/drsblobs.idl
View File

@ -16,8 +16,8 @@ interface drsblobs {
uint32 version;
NTTIME_1sec orginating_time;
GUID orginating_dsa; /* the 'invocationId' ? */
HYPER_T orginating_usn;
HYPER_T local_usn;
hyper orginating_usn;
hyper local_usn;
} replPropertyMetaData1;
typedef struct {
@ -47,7 +47,7 @@ interface drsblobs {
*/
typedef struct {
GUID invocation_id_guid; /* the 'invocationId' field of the CN=NTDS Settings object */
HYPER_T highest_usn; /* updated after a full replication cycle */
hyper highest_usn; /* updated after a full replication cycle */
} replUpToDateVector1;
typedef struct {
@ -58,7 +58,7 @@ interface drsblobs {
typedef struct {
GUID invocation_id_guid; /* the 'invocationId' field of the CN=NTDS Settings object */
HYPER_T highest_usn; /* updated after a full replication cycle */
hyper highest_usn; /* updated after a full replication cycle */
NTTIME_1sec last_success;
} replUpToDateVector2;
@ -104,9 +104,9 @@ interface drsblobs {
uint32 replica_flags;
uint8 schedule[84];
uint32 reserved;
HYPER_T tmp_highest_usn; /* updated after each object update */
HYPER_T reserved_usn;
HYPER_T highest_usn; /* updated after a full replication cycle */
hyper tmp_highest_usn; /* updated after each object update */
hyper reserved_usn;
hyper 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;

30
source/librpc/idl/drsuapi.idl
View File

@ -432,8 +432,8 @@ interface drsuapi
GUID source_dsa_obj_guid;
GUID source_dsa_invocation_id;
GUID transport_obj_guid;
HYPER_T tmp_highest_usn;
HYPER_T highest_usn;
hyper tmp_highest_usn;
hyper highest_usn;
NTTIME last_success;
NTTIME last_attempt;
WERROR result_last_attempt;
@ -448,7 +448,7 @@ interface drsuapi
typedef struct {
GUID source_dsa_invocation_id;
HYPER_T highest_usn;
hyper highest_usn;
} drsuapi_DsReplicaCoursor;
typedef struct {
@ -462,8 +462,8 @@ interface drsuapi
uint32 version;
NTTIME originating_last_changed;
GUID originating_dsa_invocation_id;
HYPER_T originating_usn;
HYPER_T local_usn;
hyper originating_usn;
hyper local_usn;
} drsuapi_DsReplicaObjMetaData;
typedef struct {
@ -515,8 +515,8 @@ interface drsuapi
uint32 version;
NTTIME originating_last_changed;
GUID originating_dsa_invocation_id;
HYPER_T originating_usn;
HYPER_T local_usn;
hyper originating_usn;
hyper local_usn;
} drsuapi_DsReplicaAttrValMetaData;
typedef struct {
@ -527,7 +527,7 @@ interface drsuapi
typedef struct {
GUID source_dsa_invocation_id;
HYPER_T highest_usn;
hyper highest_usn;
NTTIME last_sync_success;
} drsuapi_DsReplicaCoursor2;
@ -539,7 +539,7 @@ interface drsuapi
typedef struct {
GUID source_dsa_invocation_id;
HYPER_T highest_usn;
hyper highest_usn;
NTTIME last_sync_success;
unistr *source_dsa_obj_dn;
} drsuapi_DsReplicaCoursor3;
@ -555,8 +555,8 @@ interface drsuapi
uint32 version;
NTTIME originating_last_changed;
GUID originating_dsa_invocation_id;
HYPER_T originating_usn;
HYPER_T local_usn;
hyper originating_usn;
hyper local_usn;
unistr *originating_dsa_obj_dn;
} drsuapi_DsReplicaObjMetaData2;
@ -576,8 +576,8 @@ interface drsuapi
uint32 version;
NTTIME originating_last_changed;
GUID originating_dsa_invocation_id;
HYPER_T originating_usn;
HYPER_T local_usn;
hyper originating_usn;
hyper local_usn;
unistr *originating_dsa_obj_dn;
} drsuapi_DsReplicaAttrValMetaData2;
@ -588,7 +588,7 @@ interface drsuapi
} drsuapi_DsReplicaAttrValMetaData2Ctr;
typedef struct {
HYPER_T u1; /* session number? */
hyper u1; /* session number? */
uint32 u2;
uint32 u3;
GUID bind_guid;
@ -618,7 +618,7 @@ interface drsuapi
uint32 u3;
uint32 u4;
uint32 u5;
HYPER_T u6;
hyper u6;
uint32 u7;
} drsuapi_DsReplica06;

4
source/librpc/idl/echo.idl
View File

@ -52,12 +52,12 @@ interface rpcecho
} echo_info3;
typedef struct {
HYPER_T v;
hyper v;
} echo_info4;
typedef struct {
uint8 v1;
HYPER_T v2;
hyper v2;
} echo_info5;
typedef struct {

4
source/librpc/idl/lsa.idl
View File

@ -150,11 +150,11 @@
uint32 min_wss;
uint32 max_wss;
uint32 pagefile;
HYPER_T unknown;
hyper unknown;
} lsa_DefaultQuotaInfo;
typedef struct {
HYPER_T modified_id;
hyper modified_id;
NTTIME db_create_time;
} lsa_ModificationInfo;

4
source/librpc/idl/oxidresolver.idl
View File

@ -21,8 +21,8 @@
]
interface IOXIDResolver
{
#define OXID HYPER_T
#define SETID HYPER_T
#define OXID hyper
#define SETID hyper
#define IPID GUID
#define OID GUID

2
source/librpc/idl/remact.idl
View File

@ -39,7 +39,7 @@ interface IRemoteActivation
[in, unique,size_is(Interfaces)] GUID *pIIDs,
[in] uint16 num_protseqs,
[in, size_is(num_protseqs)] uint16 protseq[],
[out] HYPER_T pOxid,
[out] hyper pOxid,
[out] DUALSTRINGARRAY *pdsaOxidBindings,
[out] GUID ipidRemUnknown,
[out] uint32 AuthnHint,

12
source/librpc/idl/samr.idl
View File

@ -174,7 +174,7 @@
} samr_DomInfo7;
typedef struct {
HYPER_T sequence_num;
hyper sequence_num;
NTTIME domain_create_time;
} samr_DomInfo8;
@ -184,19 +184,19 @@
typedef struct {
samr_DomInfo2 info2;
HYPER_T lockout_duration;
HYPER_T lockout_window;
hyper lockout_duration;
hyper lockout_window;
uint16 lockout_threshold;
} samr_DomInfo11;
typedef struct {
HYPER_T lockout_duration;
HYPER_T lockout_window;
hyper lockout_duration;
hyper lockout_window;
uint16 lockout_threshold;
} samr_DomInfo12;
typedef struct {
HYPER_T sequence_num;
hyper sequence_num;
NTTIME domain_create_time;
uint32 unknown1;
uint32 unknown2;

34
source/librpc/ndr/ndr_basic.c
View File

@ -141,7 +141,7 @@ NTSTATUS ndr_pull_dlong(struct ndr_pull *ndr, int64_t *v)
/*
parse a hyper
*/
NTSTATUS ndr_pull_HYPER_T(struct ndr_pull *ndr, uint64_t *v)
NTSTATUS ndr_pull_hyper(struct ndr_pull *ndr, uint64_t *v)
{
NDR_PULL_ALIGN(ndr, 8);
return ndr_pull_udlong(ndr, v);
@ -249,16 +249,16 @@ NTSTATUS ndr_pull_array_uint32(struct ndr_pull *ndr, int ndr_flags, uint32_t *da
}
/*
pull a const array of HYPER_T
pull a const array of hyper
*/
NTSTATUS ndr_pull_array_HYPER_T(struct ndr_pull *ndr, int ndr_flags, uint64_t *data, uint32_t n)
NTSTATUS ndr_pull_array_hyper(struct ndr_pull *ndr, int ndr_flags, uint64_t *data, uint32_t n)
{
uint32_t i;
if (!(ndr_flags & NDR_SCALARS)) {
return NT_STATUS_OK;
}
for (i=0;i<n;i++) {
NDR_CHECK(ndr_pull_HYPER_T(ndr, &data[i]));
NDR_CHECK(ndr_pull_hyper(ndr, &data[i]));
}
return NT_STATUS_OK;
}
@ -349,9 +349,9 @@ NTSTATUS ndr_push_dlong(struct ndr_push *ndr, int64_t v)
}
/*
push a HYPER_T
push a hyper
*/
NTSTATUS ndr_push_HYPER_T(struct ndr_push *ndr, uint64_t v)
NTSTATUS ndr_push_hyper(struct ndr_push *ndr, uint64_t v)
{
NDR_PUSH_ALIGN(ndr, 8);
return ndr_push_udlong(ndr, v);
@ -433,22 +433,22 @@ NTSTATUS ndr_push_array_uint32(struct ndr_push *ndr, int ndr_flags, const uint32
}
/*
push an array of HYPER_T
push an array of hyper
*/
NTSTATUS ndr_push_array_HYPER_T(struct ndr_push *ndr, int ndr_flags, const uint64_t *data, uint32_t n)
NTSTATUS ndr_push_array_hyper(struct ndr_push *ndr, int ndr_flags, const uint64_t *data, uint32_t n)
{
int i;
if (!(ndr_flags & NDR_SCALARS)) {
return NT_STATUS_OK;
}
for (i=0;i<n;i++) {
NDR_CHECK(ndr_push_HYPER_T(ndr, data[i]));
NDR_CHECK(ndr_push_hyper(ndr, data[i]));
}
return NT_STATUS_OK;
}
/*
push an array of HYPER_T
push an array of hyper
*/
NTSTATUS ndr_push_array_WERROR(struct ndr_push *ndr, int ndr_flags, const WERROR *data, uint32_t n)
{
@ -965,7 +965,7 @@ NTSTATUS ndr_pull_NTTIME(struct ndr_pull *ndr, NTTIME *t)
NTSTATUS ndr_push_NTTIME_1sec(struct ndr_push *ndr, NTTIME t)
{
t /= 10000000;
NDR_CHECK(ndr_push_HYPER_T(ndr, t));
NDR_CHECK(ndr_push_hyper(ndr, t));
return NT_STATUS_OK;
}
@ -974,7 +974,7 @@ NTSTATUS ndr_push_NTTIME_1sec(struct ndr_push *ndr, NTTIME t)
*/
NTSTATUS ndr_pull_NTTIME_1sec(struct ndr_pull *ndr, NTTIME *t)
{
NDR_CHECK(ndr_pull_HYPER_T(ndr, t));
NDR_CHECK(ndr_pull_hyper(ndr, t));
(*t) *= 10000000;
return NT_STATUS_OK;
}
@ -984,7 +984,7 @@ NTSTATUS ndr_pull_NTTIME_1sec(struct ndr_pull *ndr, NTTIME *t)
*/
NTSTATUS ndr_pull_NTTIME_hyper(struct ndr_pull *ndr, NTTIME *t)
{
NDR_CHECK(ndr_pull_HYPER_T(ndr, t));
NDR_CHECK(ndr_pull_hyper(ndr, t));
return NT_STATUS_OK;
}
@ -993,7 +993,7 @@ NTSTATUS ndr_pull_NTTIME_hyper(struct ndr_pull *ndr, NTTIME *t)
*/
NTSTATUS ndr_push_NTTIME_hyper(struct ndr_push *ndr, NTTIME t)
{
NDR_CHECK(ndr_push_HYPER_T(ndr, t));
NDR_CHECK(ndr_push_hyper(ndr, t));
return NT_STATUS_OK;
}
@ -1084,7 +1084,7 @@ void ndr_print_dlong(struct ndr_print *ndr, const char *name, int64_t v)
v);
}
void ndr_print_HYPER_T(struct ndr_print *ndr, const char *name, uint64_t v)
void ndr_print_hyper(struct ndr_print *ndr, const char *name, uint64_t v)
{
ndr_print_dlong(ndr, name, v);
}
@ -1162,7 +1162,7 @@ void ndr_print_array_WERROR(struct ndr_print *ndr, const char *name,
ndr->depth--;
}
void ndr_print_array_HYPER_T(struct ndr_print *ndr, const char *name,
void ndr_print_array_hyper(struct ndr_print *ndr, const char *name,
const uint64_t *data, uint32_t count)
{
int i;
@ -1173,7 +1173,7 @@ void ndr_print_array_HYPER_T(struct ndr_print *ndr, const char *name,
char *idx=NULL;
asprintf(&idx, "[%d]", i);
if (idx) {
ndr_print_HYPER_T(ndr, idx, data[i]);
ndr_print_hyper(ndr, idx, data[i]);
free(idx);
}
}