svn commit: samba r25316 - in branches/SAMBA_4_0: .
source/librpc/ndr source/librpc/rpc
jelmer at samba.org
jelmer at samba.org
Tue Sep 25 16:05:15 GMT 2007
Author: jelmer
Date: 2007-09-25 16:05:08 +0000 (Tue, 25 Sep 2007)
New Revision: 25316
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25316
Log:
Remove last few instances of old BOOL type in librpc/.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/librpc/ndr/ndr.c
branches/SAMBA_4_0/source/librpc/ndr/ndr_drsuapi.c
branches/SAMBA_4_0/source/librpc/ndr/ndr_table.c
branches/SAMBA_4_0/source/librpc/ndr/uuid.c
branches/SAMBA_4_0/source/librpc/rpc/dcerpc.c
branches/SAMBA_4_0/source/librpc/rpc/dcerpc_auth.c
branches/SAMBA_4_0/source/librpc/rpc/dcerpc_connect.c
branches/SAMBA_4_0/source/librpc/rpc/dcerpc_smb.c
branches/SAMBA_4_0/source/librpc/rpc/dcerpc_smb2.c
branches/SAMBA_4_0/source/librpc/rpc/dcerpc_sock.c
Changeset:
Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/SAMBA_4_0/source/librpc/ndr/ndr.c
===================================================================
--- branches/SAMBA_4_0/source/librpc/ndr/ndr.c 2007-09-25 05:59:57 UTC (rev 25315)
+++ branches/SAMBA_4_0/source/librpc/ndr/ndr.c 2007-09-25 16:05:08 UTC (rev 25316)
@@ -572,7 +572,7 @@
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 @@
*/
_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 @@
{
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;
}
Modified: branches/SAMBA_4_0/source/librpc/ndr/ndr_drsuapi.c
===================================================================
--- branches/SAMBA_4_0/source/librpc/ndr/ndr_drsuapi.c 2007-09-25 05:59:57 UTC (rev 25315)
+++ branches/SAMBA_4_0/source/librpc/ndr/ndr_drsuapi.c 2007-09-25 16:05:08 UTC (rev 25316)
@@ -64,17 +64,17 @@
}
#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)
Modified: branches/SAMBA_4_0/source/librpc/ndr/ndr_table.c
===================================================================
--- branches/SAMBA_4_0/source/librpc/ndr/ndr_table.c 2007-09-25 05:59:57 UTC (rev 25315)
+++ branches/SAMBA_4_0/source/librpc/ndr/ndr_table.c 2007-09-25 16:05:08 UTC (rev 25316)
@@ -123,10 +123,10 @@
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();
Modified: branches/SAMBA_4_0/source/librpc/ndr/uuid.c
===================================================================
--- branches/SAMBA_4_0/source/librpc/ndr/uuid.c 2007-09-25 05:59:57 UTC (rev 25315)
+++ branches/SAMBA_4_0/source/librpc/ndr/uuid.c 2007-09-25 16:05:08 UTC (rev 25316)
@@ -133,7 +133,7 @@
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 @@
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 @@
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 @@
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));
}
Modified: branches/SAMBA_4_0/source/librpc/rpc/dcerpc.c
===================================================================
--- branches/SAMBA_4_0/source/librpc/rpc/dcerpc.c 2007-09-25 05:59:57 UTC (rev 25315)
+++ branches/SAMBA_4_0/source/librpc/rpc/dcerpc.c 2007-09-25 16:05:08 UTC (rev 25316)
@@ -43,7 +43,7 @@
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 @@
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 @@
}
/* 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 @@
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 @@
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 @@
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 @@
/* 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 @@
}
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(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 @@
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,
Modified: branches/SAMBA_4_0/source/librpc/rpc/dcerpc_auth.c
===================================================================
--- branches/SAMBA_4_0/source/librpc/rpc/dcerpc_auth.c 2007-09-25 05:59:57 UTC (rev 25315)
+++ branches/SAMBA_4_0/source/librpc/rpc/dcerpc_auth.c 2007-09-25 16:05:08 UTC (rev 25316)
@@ -98,7 +98,7 @@
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 @@
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 @@
&state->credentials);
if (NT_STATUS_EQUAL(c->status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
- more_processing = True;
+ more_processing = true;
c->status = NT_STATUS_OK;
}
Modified: branches/SAMBA_4_0/source/librpc/rpc/dcerpc_connect.c
===================================================================
--- branches/SAMBA_4_0/source/librpc/rpc/dcerpc_connect.c 2007-09-25 05:59:57 UTC (rev 25315)
+++ branches/SAMBA_4_0/source/librpc/rpc/dcerpc_connect.c 2007-09-25 16:05:08 UTC (rev 25316)
@@ -127,9 +127,9 @@
*/
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 */
Modified: branches/SAMBA_4_0/source/librpc/rpc/dcerpc_smb.c
===================================================================
--- branches/SAMBA_4_0/source/librpc/rpc/dcerpc_smb.c 2007-09-25 05:59:57 UTC (rev 25315)
+++ branches/SAMBA_4_0/source/librpc/rpc/dcerpc_smb.c 2007-09-25 16:05:08 UTC (rev 25316)
@@ -176,7 +176,7 @@
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 @@
/*
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;
Modified: branches/SAMBA_4_0/source/librpc/rpc/dcerpc_smb2.c
===================================================================
--- branches/SAMBA_4_0/source/librpc/rpc/dcerpc_smb2.c 2007-09-25 05:59:57 UTC (rev 25315)
+++ branches/SAMBA_4_0/source/librpc/rpc/dcerpc_smb2.c 2007-09-25 16:05:08 UTC (rev 25316)
@@ -294,7 +294,7 @@
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;
Modified: branches/SAMBA_4_0/source/librpc/rpc/dcerpc_sock.c
===================================================================
--- branches/SAMBA_4_0/source/librpc/rpc/dcerpc_sock.c 2007-09-25 05:59:57 UTC (rev 25315)
+++ branches/SAMBA_4_0/source/librpc/rpc/dcerpc_sock.c 2007-09-25 16:05:08 UTC (rev 25316)
@@ -162,7 +162,7 @@
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 @@
packet_set_initial_read(sock->packet, 16);
/* ensure we don't get SIGPIPE */
- BlockSignals(True,SIGPIPE);
+ BlockSignals(true, SIGPIPE);
composite_done(c);
}
More information about the samba-cvs
mailing list