From f9d8f8843dc0ab8c9d59abde7222e0f118b86b5d Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 25 May 2004 16:24:13 +0000 Subject: r884: convert samba4 to use [u]int32_t instead of [u]int32 metze (This used to be commit 0e5517d937a2eb7cf707991d1c7498c1ab456095) --- source4/librpc/rpc/dcerpc.c | 6 +++--- source4/librpc/rpc/dcerpc.h | 16 ++++++++-------- source4/librpc/rpc/dcerpc_schannel.c | 2 +- source4/librpc/rpc/dcerpc_smb.c | 6 +++--- source4/librpc/rpc/dcerpc_tcp.c | 6 +++--- source4/librpc/rpc/dcerpc_util.c | 20 ++++++++++---------- 6 files changed, 28 insertions(+), 28 deletions(-) (limited to 'source4/librpc/rpc') diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c index e4c5174af3..0e3ceaf757 100644 --- a/source4/librpc/rpc/dcerpc.c +++ b/source4/librpc/rpc/dcerpc.c @@ -469,7 +469,7 @@ NTSTATUS dcerpc_request(struct dcerpc_pipe *p, struct dcerpc_packet pkt; NTSTATUS status; DATA_BLOB blob, payload; - uint32 remaining, chunk_size; + uint32_t remaining, chunk_size; /* allow the application to tell when a fault has happened */ p->last_fault_code = 0; @@ -560,7 +560,7 @@ NTSTATUS dcerpc_request(struct dcerpc_pipe *p, /* continue receiving fragments */ while (!(pkt.pfc_flags & DCERPC_PFC_FLAG_LAST)) { - uint32 length; + uint32_t length; status = p->transport.secondary_request(p, mem_ctx, &blob); if (!NT_STATUS_IS_OK(status)) { @@ -764,7 +764,7 @@ static NTSTATUS dcerpc_ndr_validate_out(TALLOC_CTX *mem_ctx, standard format */ NTSTATUS dcerpc_ndr_request(struct dcerpc_pipe *p, - uint32 opnum, + uint32_t opnum, TALLOC_CTX *mem_ctx, NTSTATUS (*ndr_push)(struct ndr_push *, int, void *), NTSTATUS (*ndr_pull)(struct ndr_pull *, int, void *), diff --git a/source4/librpc/rpc/dcerpc.h b/source4/librpc/rpc/dcerpc.h index 25c2029f34..6afde2deb0 100644 --- a/source4/librpc/rpc/dcerpc.h +++ b/source4/librpc/rpc/dcerpc.h @@ -47,9 +47,9 @@ struct dcerpc_security { struct dcerpc_pipe { TALLOC_CTX *mem_ctx; int reference_count; - uint32 call_id; - uint32 srv_max_xmit_frag; - uint32 srv_max_recv_frag; + uint32_t call_id; + uint32_t srv_max_xmit_frag; + uint32_t srv_max_recv_frag; unsigned flags; struct dcerpc_security *security_state; struct dcerpc_auth *auth_info; @@ -67,7 +67,7 @@ struct dcerpc_pipe { } transport; /* the last fault code from a DCERPC fault */ - uint32 last_fault_code; + uint32_t last_fault_code; }; /* dcerpc pipe flags */ @@ -99,15 +99,15 @@ struct dcerpc_interface_call { }; struct dcerpc_endpoint_list { - uint32 count; + uint32_t count; const char * const *names; }; struct dcerpc_interface_table { const char *name; const char *uuid; - uint32 if_version; - uint32 num_calls; + uint32_t if_version; + uint32_t num_calls; const struct dcerpc_interface_call *calls; const struct dcerpc_endpoint_list *endpoints; }; @@ -118,5 +118,5 @@ struct dcerpc_binding { enum dcerpc_transport_t transport; const char *host; const char **options; - uint32 flags; + uint32_t flags; }; diff --git a/source4/librpc/rpc/dcerpc_schannel.c b/source4/librpc/rpc/dcerpc_schannel.c index f368ce30b3..f511ecb819 100644 --- a/source4/librpc/rpc/dcerpc_schannel.c +++ b/source4/librpc/rpc/dcerpc_schannel.c @@ -90,7 +90,7 @@ NTSTATUS dcerpc_schannel_key(struct dcerpc_pipe *p, uint8 mach_pwd[16]; struct creds_CredentialState creds; const char *workgroup, *workstation; - uint32 negotiate_flags = 0; + uint32_t negotiate_flags = 0; workstation = username; workgroup = domain; diff --git a/source4/librpc/rpc/dcerpc_smb.c b/source4/librpc/rpc/dcerpc_smb.c index 3d646944ac..070f554800 100644 --- a/source4/librpc/rpc/dcerpc_smb.c +++ b/source4/librpc/rpc/dcerpc_smb.c @@ -105,7 +105,7 @@ static NTSTATUS dcerpc_raw_recv(struct dcerpc_pipe *p, /* the rest of the data is available via SMBreadX */ while (frag_length > payload.length) { - uint32 n; + uint32_t n; union smb_read io; n = frag_length - payload.length; @@ -169,8 +169,8 @@ static NTSTATUS smb_secondary_request(struct dcerpc_pipe *p, { struct smb_private *smb = p->transport.private; union smb_read io; - uint32 n = 0x2000; - uint32 frag_length; + uint32_t n = 0x2000; + uint32_t frag_length; NTSTATUS status; *blob = data_blob_talloc(mem_ctx, NULL, n); diff --git a/source4/librpc/rpc/dcerpc_tcp.c b/source4/librpc/rpc/dcerpc_tcp.c index 1b016b8957..05c700ea89 100644 --- a/source4/librpc/rpc/dcerpc_tcp.c +++ b/source4/librpc/rpc/dcerpc_tcp.c @@ -26,7 +26,7 @@ struct tcp_private { int fd; char *server_name; - uint32 port; + uint32_t port; }; @@ -47,7 +47,7 @@ static NTSTATUS tcp_raw_recv(struct dcerpc_pipe *p, { struct tcp_private *tcp = p->transport.private; ssize_t ret; - uint32 frag_length; + uint32_t frag_length; DATA_BLOB blob1; blob1 = data_blob_talloc(mem_ctx, NULL, 16); @@ -171,7 +171,7 @@ static const char *tcp_peer_name(struct dcerpc_pipe *p) */ NTSTATUS dcerpc_pipe_open_tcp(struct dcerpc_pipe **p, const char *server, - uint32 port) + uint32_t port) { struct tcp_private *tcp; int fd; diff --git a/source4/librpc/rpc/dcerpc_util.c b/source4/librpc/rpc/dcerpc_util.c index dce325d7e1..5022449182 100644 --- a/source4/librpc/rpc/dcerpc_util.c +++ b/source4/librpc/rpc/dcerpc_util.c @@ -53,7 +53,7 @@ size_t ndr_size_epm_towers(struct epm_towers *towers) */ NTSTATUS dcerpc_epm_map_tcp_port(const char *server, const char *uuid, unsigned version, - uint32 *port) + uint32_t *port) { struct dcerpc_pipe *p; NTSTATUS status; @@ -160,7 +160,7 @@ NTSTATUS dcerpc_epm_map_tcp_port(const char *server, /* find the pipe name for a local IDL interface */ -const char *idl_pipe_name(const char *uuid, uint32 if_version) +const char *idl_pipe_name(const char *uuid, uint32_t if_version) { int i; for (i=0;dcerpc_pipes[i];i++) { @@ -175,7 +175,7 @@ const char *idl_pipe_name(const char *uuid, uint32 if_version) /* find the number of calls defined by local IDL */ -int idl_num_calls(const char *uuid, uint32 if_version) +int idl_num_calls(const char *uuid, uint32_t if_version) { int i; for (i=0;dcerpc_pipes[i];i++) { @@ -271,7 +271,7 @@ static const struct { static const struct { const char *name; - uint32 flag; + uint32_t flag; } ncacn_options[] = { {"sign", DCERPC_SIGN}, {"seal", DCERPC_SEAL}, @@ -429,7 +429,7 @@ NTSTATUS dcerpc_parse_binding(TALLOC_CTX *mem_ctx, const char *s, struct dcerpc_ static NTSTATUS dcerpc_pipe_connect_ncacn_np(struct dcerpc_pipe **p, struct dcerpc_binding *binding, const char *pipe_uuid, - uint32 pipe_version, + uint32_t pipe_version, const char *domain, const char *username, const char *password) @@ -514,13 +514,13 @@ done: static NTSTATUS dcerpc_pipe_connect_ncacn_ip_tcp(struct dcerpc_pipe **p, struct dcerpc_binding *binding, const char *pipe_uuid, - uint32 pipe_version, + uint32_t pipe_version, const char *domain, const char *username, const char *password) { NTSTATUS status; - uint32 port = 0; + uint32_t port = 0; if (binding->options && binding->options[0]) { port = atoi(binding->options[0]); @@ -574,7 +574,7 @@ static NTSTATUS dcerpc_pipe_connect_ncacn_ip_tcp(struct dcerpc_pipe **p, NTSTATUS dcerpc_pipe_connect_b(struct dcerpc_pipe **p, struct dcerpc_binding *binding, const char *pipe_uuid, - uint32 pipe_version, + uint32_t pipe_version, const char *domain, const char *username, const char *password) @@ -606,7 +606,7 @@ NTSTATUS dcerpc_pipe_connect_b(struct dcerpc_pipe **p, NTSTATUS dcerpc_pipe_connect(struct dcerpc_pipe **p, const char *binding, const char *pipe_uuid, - uint32 pipe_version, + uint32_t pipe_version, const char *domain, const char *username, const char *password) @@ -642,7 +642,7 @@ NTSTATUS dcerpc_pipe_connect(struct dcerpc_pipe **p, NTSTATUS dcerpc_secondary_smb(struct dcerpc_pipe *p, struct dcerpc_pipe **p2, const char *pipe_name, const char *pipe_uuid, - uint32 pipe_version) + uint32_t pipe_version) { NTSTATUS status; struct cli_tree *tree; -- cgit