summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-09-25 16:05:08 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 15:07:13 -0500
commit7c30312c1734038825ac2e18fa2a32eb775d5c8d (patch)
tree0faa73cffa1beb185682a83d7deaf4103ea86d1b
parent7f894169d9b1010f52ffb95ba24473f7e2dd8fd5 (diff)
downloadsamba-7c30312c1734038825ac2e18fa2a32eb775d5c8d.tar.gz
samba-7c30312c1734038825ac2e18fa2a32eb775d5c8d.tar.bz2
samba-7c30312c1734038825ac2e18fa2a32eb775d5c8d.zip
r25316: Remove last few instances of old BOOL type in librpc/.
(This used to be commit 80d1dd41d4b224c46ad545f0afd97a847b99860b)
-rw-r--r--source4/librpc/ndr/ndr.c6
-rw-r--r--source4/librpc/ndr/ndr_drsuapi.c8
-rw-r--r--source4/librpc/ndr/ndr_table.c4
-rw-r--r--source4/librpc/ndr/uuid.c14
-rw-r--r--source4/librpc/rpc/dcerpc.c22
-rw-r--r--source4/librpc/rpc/dcerpc_auth.c6
-rw-r--r--source4/librpc/rpc/dcerpc_connect.c4
-rw-r--r--source4/librpc/rpc/dcerpc_smb.c5
-rw-r--r--source4/librpc/rpc/dcerpc_smb2.c2
-rw-r--r--source4/librpc/rpc/dcerpc_sock.c4
10 files changed, 38 insertions, 37 deletions
diff --git a/source4/librpc/ndr/ndr.c b/source4/librpc/ndr/ndr.c
index 49cfd3a9fe..1ee8d05975 100644
--- a/source4/librpc/ndr/ndr.c
+++ b/source4/librpc/ndr/ndr.c
@@ -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
*/
_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;
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)
{
- 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;
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;
return 0;
}
diff --git a/source4/librpc/ndr/ndr_drsuapi.c b/source4/librpc/ndr/ndr_drsuapi.c
index 6bd7d73cb8..689439c383 100644
--- a/source4/librpc/ndr/ndr_drsuapi.c
+++ b/source4/librpc/ndr/ndr_drsuapi.c
@@ -64,17 +64,17 @@ void ndr_print_drsuapi_DsReplicaObjectListItemEx(struct ndr_print *ndr, const ch
}
#define _OID_PUSH_CHECK(call) do { \
- BOOL _status; \
+ bool _status; \
_status = call; \
- if (_status != True) { \
+ if (_status != true) { \
return ndr_push_error(ndr, NDR_ERR_SUBCONTEXT, "OID Conversion Error: %s\n", __location__); \
} \
} while (0)
#define _OID_PULL_CHECK(call) do { \
- BOOL _status; \
+ bool _status; \
_status = call; \
- if (_status != True) { \
+ if (_status != true) { \
return ndr_pull_error(ndr, NDR_ERR_SUBCONTEXT, "OID Conversion Error: %s\n", __location__); \
} \
} while (0)
diff --git a/source4/librpc/ndr/ndr_table.c b/source4/librpc/ndr/ndr_table.c
index 9b43f8836d..d73e82bb71 100644
--- a/source4/librpc/ndr/ndr_table.c
+++ b/source4/librpc/ndr/ndr_table.c
@@ -123,10 +123,10 @@ NTSTATUS ndr_table_register_builtin_tables(void);
NTSTATUS ndr_table_init(void)
{
- static BOOL initialized = False;
+ static bool initialized = false;
if (initialized) return NT_STATUS_OK;
- initialized = True;
+ initialized = true;
ndr_table_register_builtin_tables();
diff --git a/source4/librpc/ndr/uuid.c b/source4/librpc/ndr/uuid.c
index dad65ee676..e92df22494 100644
--- a/source4/librpc/ndr/uuid.c
+++ b/source4/librpc/ndr/uuid.c
@@ -133,7 +133,7 @@ _PUBLIC_ struct GUID GUID_zero(void)
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 ||
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[1] != 0 ||
!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 ||
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[1] != u2->clock_seq[1] ||
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)
@@ -221,7 +221,7 @@ _PUBLIC_ char *NS_GUID_string(TALLOC_CTX *mem_ctx, const struct GUID *guid)
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));
}
diff --git a/source4/librpc/rpc/dcerpc.c b/source4/librpc/rpc/dcerpc.c
index 89eab1f244..1f0cc3699a 100644
--- a/source4/librpc/rpc/dcerpc.c
+++ b/source4/librpc/rpc/dcerpc.c
@@ -43,7 +43,7 @@ static void dcerpc_ship_next_request(struct dcerpc_connection *c);
static int dcerpc_connection_destructor(struct dcerpc_connection *conn)
{
if (conn->dead) {
- conn->free_skipped = True;
+ conn->free_skipped = true;
return -1;
}
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);
c->status = p->conn->transport.send_request(p->conn, &blob,
- True);
+ true);
if (!composite_is_ok(c)) return c;
event_add_timed(c->event_ctx, req,
@@ -798,7 +798,7 @@ NTSTATUS dcerpc_auth3(struct dcerpc_connection *c,
}
/* 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)) {
return status;
}
@@ -933,7 +933,7 @@ req_done:
static struct rpc_request *dcerpc_request_send(struct dcerpc_pipe *p,
const struct GUID *object,
uint16_t opnum,
- BOOL async,
+ bool async,
DATA_BLOB *stub_data)
{
struct rpc_request *req;
@@ -953,7 +953,7 @@ static struct rpc_request *dcerpc_request_send(struct dcerpc_pipe *p,
req->flags = 0;
req->fault_code = 0;
req->async_call = async;
- req->ignore_timeout = False;
+ req->ignore_timeout = false;
req->async.callback = NULL;
req->async.private_data = NULL;
req->recv_handler = NULL;
@@ -1001,7 +1001,7 @@ static void dcerpc_ship_next_request(struct dcerpc_connection *c)
struct ncacn_packet pkt;
DATA_BLOB blob;
uint32_t remaining, chunk_size;
- BOOL first_packet = True;
+ bool first_packet = true;
req = c->request_queue;
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 */
while (remaining > 0 || first_packet) {
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);
if (remaining == stub_data->length) {
@@ -1054,7 +1054,7 @@ static void dcerpc_ship_next_request(struct dcerpc_connection *c)
}
if (chunk == remaining) {
pkt.pfc_flags |= DCERPC_PFC_FLAG_LAST;
- last_frag = True;
+ last_frag = true;
}
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,
struct GUID *object,
uint16_t opnum,
- BOOL async,
+ bool async,
TALLOC_CTX *mem_ctx,
DATA_BLOB *stub_data_in,
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 *);
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;
event_add_timed(c->event_ctx, req,
diff --git a/source4/librpc/rpc/dcerpc_auth.c b/source4/librpc/rpc/dcerpc_auth.c
index 756cb58e3a..7db6c1b7cd 100644
--- a/source4/librpc/rpc/dcerpc_auth.c
+++ b/source4/librpc/rpc/dcerpc_auth.c
@@ -98,7 +98,7 @@ NTSTATUS dcerpc_bind_auth_none(struct dcerpc_pipe *p,
struct bind_auth_state {
struct dcerpc_pipe *pipe;
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? */
};
@@ -109,7 +109,7 @@ static void bind_auth_next_step(struct composite_context *c)
struct bind_auth_state *state;
struct dcerpc_security *sec;
struct composite_context *creq;
- BOOL more_processing = False;
+ bool more_processing = false;
state = talloc_get_type(c->private_data, struct bind_auth_state);
sec = &state->pipe->conn->security_state;
@@ -129,7 +129,7 @@ static void bind_auth_next_step(struct composite_context *c)
&state->credentials);
if (NT_STATUS_EQUAL(c->status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
- more_processing = True;
+ more_processing = true;
c->status = NT_STATUS_OK;
}
diff --git a/source4/librpc/rpc/dcerpc_connect.c b/source4/librpc/rpc/dcerpc_connect.c
index 7403dd90fe..edd86b8df4 100644
--- a/source4/librpc/rpc/dcerpc_connect.c
+++ b/source4/librpc/rpc/dcerpc_connect.c
@@ -127,9 +127,9 @@ static struct composite_context *dcerpc_pipe_connect_ncacn_np_smb_send(TALLOC_CT
*/
s->conn.in.credentials = s->io.creds;
if (s->io.binding->flags & DCERPC_SCHANNEL) {
- conn->in.fallback_to_anonymous = True;
+ conn->in.fallback_to_anonymous = true;
} else {
- conn->in.fallback_to_anonymous = False;
+ conn->in.fallback_to_anonymous = false;
}
/* send smb connect request */
diff --git a/source4/librpc/rpc/dcerpc_smb.c b/source4/librpc/rpc/dcerpc_smb.c
index f629410bf1..718ce694c5 100644
--- a/source4/librpc/rpc/dcerpc_smb.c
+++ b/source4/librpc/rpc/dcerpc_smb.c
@@ -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.offset = 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;
req = smb_raw_read_send(smb->tree, io);
if (req == NULL) {
@@ -310,7 +310,8 @@ static void smb_write_callback(struct smbcli_request *req)
/*
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;
union smb_write io;
diff --git a/source4/librpc/rpc/dcerpc_smb2.c b/source4/librpc/rpc/dcerpc_smb2.c
index 615c96c905..b06964d331 100644
--- a/source4/librpc/rpc/dcerpc_smb2.c
+++ b/source4/librpc/rpc/dcerpc_smb2.c
@@ -294,7 +294,7 @@ static void smb2_write_callback(struct smb2_request *req)
send a packet to the server
*/
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_write io;
diff --git a/source4/librpc/rpc/dcerpc_sock.c b/source4/librpc/rpc/dcerpc_sock.c
index c946d0b039..e9c0c96be6 100644
--- a/source4/librpc/rpc/dcerpc_sock.c
+++ b/source4/librpc/rpc/dcerpc_sock.c
@@ -162,7 +162,7 @@ static NTSTATUS sock_send_read(struct dcerpc_connection *p)
send an initial pdu in a multi-pdu sequence
*/
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;
DATA_BLOB blob;
@@ -295,7 +295,7 @@ static void continue_socket_connect(struct composite_context *ctx)
packet_set_initial_read(sock->packet, 16);
/* ensure we don't get SIGPIPE */
- BlockSignals(True,SIGPIPE);
+ BlockSignals(true, SIGPIPE);
composite_done(c);
}