sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-08 05:57:51 +03:00
Code

r25316: Remove last few instances of old BOOL type in librpc/.

Browse Source 
(This used to be commit 80d1dd41d4b224c46ad545f0afd97a847b99860b)
This commit is contained in:
Jelmer Vernooij 2007-09-25 16:05:08 +00:00 committed by Gerald (Jerry) Carter
parent 7f894169d9
commit 7c30312c17
10 changed files with 38 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source4/librpc/ndr/ndr.c
View File

@ -572,7 +572,7 @@ _PUBLIC_ NTSTATUS ndr_token_store(TALLOC_CTX *mem_ctx,
retrieve a token from a ndr context, using cmp_fn to match the tokens retrieve a token from a ndr context, using cmp_fn to match the tokens
*/ */
_PUBLIC_ NTSTATUS ndr_token_retrieve_cmp_fn(struct ndr_token_list **list, const void *key, uint32_t *v, _PUBLIC_ NTSTATUS ndr_token_retrieve_cmp_fn(struct ndr_token_list **list, const void *key, uint32_t *v,
comparison_fn_t _cmp_fn, BOOL _remove_tok) comparison_fn_t _cmp_fn, bool _remove_tok)
{ {
struct ndr_token_list *tok; struct ndr_token_list *tok;
for (tok=*list;tok;tok=tok->next) { for (tok=*list;tok;tok=tok->next) {
@ -594,7 +594,7 @@ found:
*/ */
_PUBLIC_ NTSTATUS ndr_token_retrieve(struct ndr_token_list **list, const void *key, uint32_t *v) _PUBLIC_ NTSTATUS ndr_token_retrieve(struct ndr_token_list **list, const void *key, uint32_t *v)
{ {
return ndr_token_retrieve_cmp_fn(list, key, v, NULL, True); return ndr_token_retrieve_cmp_fn(list, key, v, NULL, true);
} }
/* /*
@ -604,7 +604,7 @@ _PUBLIC_ uint32_t ndr_token_peek(struct ndr_token_list **list, const void *key)
{ {
NTSTATUS status; NTSTATUS status;
uint32_t v; uint32_t v;
status = ndr_token_retrieve_cmp_fn(list, key, &v, NULL, False); status = ndr_token_retrieve_cmp_fn(list, key, &v, NULL, false);
if (NT_STATUS_IS_OK(status)) return v; if (NT_STATUS_IS_OK(status)) return v;
return 0; return 0;
} }

8
source4/librpc/ndr/ndr_drsuapi.c
View File

@ -64,17 +64,17 @@ void ndr_print_drsuapi_DsReplicaObjectListItemEx(struct ndr_print *ndr, const ch
} }
#define _OID_PUSH_CHECK(call) do { \ #define _OID_PUSH_CHECK(call) do { \
BOOL _status; \ bool _status; \
_status = call; \ _status = call; \
if (_status != True) { \ if (_status != true) { \
return ndr_push_error(ndr, NDR_ERR_SUBCONTEXT, "OID Conversion Error: %s\n", __location__); \ return ndr_push_error(ndr, NDR_ERR_SUBCONTEXT, "OID Conversion Error: %s\n", __location__); \
} \ } \
} while (0) } while (0)
#define _OID_PULL_CHECK(call) do { \ #define _OID_PULL_CHECK(call) do { \
BOOL _status; \ bool _status; \
_status = call; \ _status = call; \
if (_status != True) { \ if (_status != true) { \
return ndr_pull_error(ndr, NDR_ERR_SUBCONTEXT, "OID Conversion Error: %s\n", __location__); \ return ndr_pull_error(ndr, NDR_ERR_SUBCONTEXT, "OID Conversion Error: %s\n", __location__); \
} \ } \
} while (0) } while (0)

4
source4/librpc/ndr/ndr_table.c
View File

@ -123,10 +123,10 @@ NTSTATUS ndr_table_register_builtin_tables(void);
NTSTATUS ndr_table_init(void) NTSTATUS ndr_table_init(void)
{ {
static BOOL initialized = False; static bool initialized = false;
if (initialized) return NT_STATUS_OK; if (initialized) return NT_STATUS_OK;
initialized = True; initialized = true;
ndr_table_register_builtin_tables(); ndr_table_register_builtin_tables();

14
source4/librpc/ndr/uuid.c
View File

@ -133,7 +133,7 @@ _PUBLIC_ struct GUID GUID_zero(void)
return guid; return guid;
} }
_PUBLIC_ BOOL GUID_all_zero(const struct GUID *u) _PUBLIC_ bool GUID_all_zero(const struct GUID *u)
{ {
if (u->time_low != 0 || if (u->time_low != 0 ||
u->time_mid != 0 || u->time_mid != 0 ||
@ -141,12 +141,12 @@ _PUBLIC_ BOOL GUID_all_zero(const struct GUID *u)
u->clock_seq[0] != 0 || u->clock_seq[0] != 0 ||
u->clock_seq[1] != 0 || u->clock_seq[1] != 0 ||
!all_zero(u->node, 6)) { !all_zero(u->node, 6)) {
return False; return false;
} }
return True; return true;
} }
_PUBLIC_ BOOL GUID_equal(const struct GUID *u1, const struct GUID *u2) _PUBLIC_ bool GUID_equal(const struct GUID *u1, const struct GUID *u2)
{ {
if (u1->time_low != u2->time_low || if (u1->time_low != u2->time_low ||
u1->time_mid != u2->time_mid || u1->time_mid != u2->time_mid ||
@ -154,9 +154,9 @@ _PUBLIC_ BOOL GUID_equal(const struct GUID *u1, const struct GUID *u2)
u1->clock_seq[0] != u2->clock_seq[0] || u1->clock_seq[0] != u2->clock_seq[0] ||
u1->clock_seq[1] != u2->clock_seq[1] || u1->clock_seq[1] != u2->clock_seq[1] ||
memcmp(u1->node, u2->node, 6) != 0) { memcmp(u1->node, u2->node, 6) != 0) {
return False; return false;
} }
return True; return true;
} }
_PUBLIC_ int GUID_compare(const struct GUID *u1, const struct GUID *u2) _PUBLIC_ int GUID_compare(const struct GUID *u1, const struct GUID *u2)
@ -221,7 +221,7 @@ _PUBLIC_ char *NS_GUID_string(TALLOC_CTX *mem_ctx, const struct GUID *guid)
guid->node[4], guid->node[5]); guid->node[4], guid->node[5]);
} }
_PUBLIC_ BOOL policy_handle_empty(struct policy_handle *h) _PUBLIC_ bool policy_handle_empty(struct policy_handle *h)
{ {
return (h->handle_type == 0 && GUID_all_zero(&h->uuid)); return (h->handle_type == 0 && GUID_all_zero(&h->uuid));
} }

22
source4/librpc/rpc/dcerpc.c
View File

@ -43,7 +43,7 @@ static void dcerpc_ship_next_request(struct dcerpc_connection *c);
static int dcerpc_connection_destructor(struct dcerpc_connection *conn) static int dcerpc_connection_destructor(struct dcerpc_connection *conn)
{ {
if (conn->dead) { if (conn->dead) {
conn->free_skipped = True; conn->free_skipped = true;
return -1; return -1;
} }
dcerpc_connection_dead(conn, NT_STATUS_LOCAL_DISCONNECT); dcerpc_connection_dead(conn, NT_STATUS_LOCAL_DISCONNECT);
@ -752,7 +752,7 @@ struct composite_context *dcerpc_bind_send(struct dcerpc_pipe *p,
talloc_set_destructor(req, dcerpc_req_dequeue); talloc_set_destructor(req, dcerpc_req_dequeue);
c->status = p->conn->transport.send_request(p->conn, &blob, c->status = p->conn->transport.send_request(p->conn, &blob,
True); true);
if (!composite_is_ok(c)) return c; if (!composite_is_ok(c)) return c;
event_add_timed(c->event_ctx, req, event_add_timed(c->event_ctx, req,
@ -798,7 +798,7 @@ NTSTATUS dcerpc_auth3(struct dcerpc_connection *c,
} }
/* send it on its way */ /* send it on its way */
status = c->transport.send_request(c, &blob, False); status = c->transport.send_request(c, &blob, false);
if (!NT_STATUS_IS_OK(status)) { if (!NT_STATUS_IS_OK(status)) {
return status; return status;
} }
@ -933,7 +933,7 @@ req_done:
static struct rpc_request *dcerpc_request_send(struct dcerpc_pipe *p, static struct rpc_request *dcerpc_request_send(struct dcerpc_pipe *p,
const struct GUID *object, const struct GUID *object,
uint16_t opnum, uint16_t opnum,
BOOL async, bool async,
DATA_BLOB *stub_data) DATA_BLOB *stub_data)
{ {
struct rpc_request *req; struct rpc_request *req;
@ -953,7 +953,7 @@ static struct rpc_request *dcerpc_request_send(struct dcerpc_pipe *p,
req->flags = 0; req->flags = 0;
req->fault_code = 0; req->fault_code = 0;
req->async_call = async; req->async_call = async;
req->ignore_timeout = False; req->ignore_timeout = false;
req->async.callback = NULL; req->async.callback = NULL;
req->async.private_data = NULL; req->async.private_data = NULL;
req->recv_handler = NULL; req->recv_handler = NULL;
@ -1001,7 +1001,7 @@ static void dcerpc_ship_next_request(struct dcerpc_connection *c)
struct ncacn_packet pkt; struct ncacn_packet pkt;
DATA_BLOB blob; DATA_BLOB blob;
uint32_t remaining, chunk_size; uint32_t remaining, chunk_size;
BOOL first_packet = True; bool first_packet = true;
req = c->request_queue; req = c->request_queue;
if (req == NULL) { if (req == NULL) {
@ -1044,9 +1044,9 @@ static void dcerpc_ship_next_request(struct dcerpc_connection *c)
/* we send a series of pdus without waiting for a reply */ /* we send a series of pdus without waiting for a reply */
while (remaining > 0 || first_packet) { while (remaining > 0 || first_packet) {
uint32_t chunk = MIN(chunk_size, remaining); uint32_t chunk = MIN(chunk_size, remaining);
BOOL last_frag = False; bool last_frag = false;
first_packet = False; first_packet = false;
pkt.pfc_flags &= ~(DCERPC_PFC_FLAG_FIRST |DCERPC_PFC_FLAG_LAST); pkt.pfc_flags &= ~(DCERPC_PFC_FLAG_FIRST |DCERPC_PFC_FLAG_LAST);
if (remaining == stub_data->length) { if (remaining == stub_data->length) {
@ -1054,7 +1054,7 @@ static void dcerpc_ship_next_request(struct dcerpc_connection *c)
} }
if (chunk == remaining) { if (chunk == remaining) {
pkt.pfc_flags |= DCERPC_PFC_FLAG_LAST; pkt.pfc_flags |= DCERPC_PFC_FLAG_LAST;
last_frag = True; last_frag = true;
} }
pkt.u.request.stub_and_verifier.data = stub_data->data + pkt.u.request.stub_and_verifier.data = stub_data->data +
@ -1123,7 +1123,7 @@ NTSTATUS dcerpc_request_recv(struct rpc_request *req,
NTSTATUS dcerpc_request(struct dcerpc_pipe *p, NTSTATUS dcerpc_request(struct dcerpc_pipe *p,
struct GUID *object, struct GUID *object,
uint16_t opnum, uint16_t opnum,
BOOL async, bool async,
TALLOC_CTX *mem_ctx, TALLOC_CTX *mem_ctx,
DATA_BLOB *stub_data_in, DATA_BLOB *stub_data_in,
DATA_BLOB *stub_data_out) DATA_BLOB *stub_data_out)
@ -1622,7 +1622,7 @@ struct composite_context *dcerpc_alter_context_send(struct dcerpc_pipe *p,
DLIST_ADD_END(p->conn->pending, req, struct rpc_request *); DLIST_ADD_END(p->conn->pending, req, struct rpc_request *);
talloc_set_destructor(req, dcerpc_req_dequeue); talloc_set_destructor(req, dcerpc_req_dequeue);
c->status = p->conn->transport.send_request(p->conn, &blob, True); c->status = p->conn->transport.send_request(p->conn, &blob, true);
if (!composite_is_ok(c)) return c; if (!composite_is_ok(c)) return c;
event_add_timed(c->event_ctx, req, event_add_timed(c->event_ctx, req,

6
source4/librpc/rpc/dcerpc_auth.c
View File

@ -98,7 +98,7 @@ NTSTATUS dcerpc_bind_auth_none(struct dcerpc_pipe *p,
struct bind_auth_state { struct bind_auth_state {
struct dcerpc_pipe *pipe; struct dcerpc_pipe *pipe;
DATA_BLOB credentials; DATA_BLOB credentials;
BOOL more_processing; /* Is there anything more to do after the bool more_processing; /* Is there anything more to do after the
* first bind itself received? */ * first bind itself received? */
}; };
@ -109,7 +109,7 @@ static void bind_auth_next_step(struct composite_context *c)
struct bind_auth_state *state; struct bind_auth_state *state;
struct dcerpc_security *sec; struct dcerpc_security *sec;
struct composite_context *creq; struct composite_context *creq;
BOOL more_processing = False; bool more_processing = false;
state = talloc_get_type(c->private_data, struct bind_auth_state); state = talloc_get_type(c->private_data, struct bind_auth_state);
sec = &state->pipe->conn->security_state; sec = &state->pipe->conn->security_state;
@ -129,7 +129,7 @@ static void bind_auth_next_step(struct composite_context *c)
&state->credentials); &state->credentials);
if (NT_STATUS_EQUAL(c->status, NT_STATUS_MORE_PROCESSING_REQUIRED)) { if (NT_STATUS_EQUAL(c->status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
more_processing = True; more_processing = true;
c->status = NT_STATUS_OK; c->status = NT_STATUS_OK;
} }

4
source4/librpc/rpc/dcerpc_connect.c
View File

@ -127,9 +127,9 @@ static struct composite_context *dcerpc_pipe_connect_ncacn_np_smb_send(TALLOC_CT
*/ */
s->conn.in.credentials = s->io.creds; s->conn.in.credentials = s->io.creds;
if (s->io.binding->flags & DCERPC_SCHANNEL) { if (s->io.binding->flags & DCERPC_SCHANNEL) {
conn->in.fallback_to_anonymous = True; conn->in.fallback_to_anonymous = true;
} else { } else {
conn->in.fallback_to_anonymous = False; conn->in.fallback_to_anonymous = false;
} }
/* send smb connect request */ /* send smb connect request */

5
source4/librpc/rpc/dcerpc_smb.c
View File

@ -176,7 +176,7 @@ static NTSTATUS send_read_request_continue(struct dcerpc_connection *c, DATA_BLO
io->readx.in.maxcnt = io->readx.in.mincnt; io->readx.in.maxcnt = io->readx.in.mincnt;
io->readx.in.offset = 0; io->readx.in.offset = 0;
io->readx.in.remaining = 0; io->readx.in.remaining = 0;
io->readx.in.read_for_execute = False; io->readx.in.read_for_execute = false;
io->readx.out.data = state->data.data + state->received; io->readx.out.data = state->data.data + state->received;
req = smb_raw_read_send(smb->tree, io); req = smb_raw_read_send(smb->tree, io);
if (req == NULL) { if (req == NULL) {
@ -310,7 +310,8 @@ static void smb_write_callback(struct smbcli_request *req)
/* /*
send a packet to the server send a packet to the server
*/ */
static NTSTATUS smb_send_request(struct dcerpc_connection *c, DATA_BLOB *blob, BOOL trigger_read) static NTSTATUS smb_send_request(struct dcerpc_connection *c, DATA_BLOB *blob,
bool trigger_read)
{ {
struct smb_private *smb = (struct smb_private *)c->transport.private_data; struct smb_private *smb = (struct smb_private *)c->transport.private_data;
union smb_write io; union smb_write io;

2
source4/librpc/rpc/dcerpc_smb2.c
View File

@ -294,7 +294,7 @@ static void smb2_write_callback(struct smb2_request *req)
send a packet to the server send a packet to the server
*/ */
static NTSTATUS smb2_send_request(struct dcerpc_connection *c, DATA_BLOB *blob, static NTSTATUS smb2_send_request(struct dcerpc_connection *c, DATA_BLOB *blob,
BOOL trigger_read) bool trigger_read)
{ {
struct smb2_private *smb = (struct smb2_private *)c->transport.private_data; struct smb2_private *smb = (struct smb2_private *)c->transport.private_data;
struct smb2_write io; struct smb2_write io;

4
source4/librpc/rpc/dcerpc_sock.c
View File

@ -162,7 +162,7 @@ static NTSTATUS sock_send_read(struct dcerpc_connection *p)
send an initial pdu in a multi-pdu sequence send an initial pdu in a multi-pdu sequence
*/ */
static NTSTATUS sock_send_request(struct dcerpc_connection *p, DATA_BLOB *data, static NTSTATUS sock_send_request(struct dcerpc_connection *p, DATA_BLOB *data,
BOOL trigger_read) bool trigger_read)
{ {
struct sock_private *sock = (struct sock_private *)p->transport.private_data; struct sock_private *sock = (struct sock_private *)p->transport.private_data;
DATA_BLOB blob; DATA_BLOB blob;
@ -295,7 +295,7 @@ static void continue_socket_connect(struct composite_context *ctx)
packet_set_initial_read(sock->packet, 16); packet_set_initial_read(sock->packet, 16);
/* ensure we don't get SIGPIPE */ /* ensure we don't get SIGPIPE */
BlockSignals(True,SIGPIPE); BlockSignals(true, SIGPIPE);
composite_done(c); composite_done(c);
} }