From 7c30312c1734038825ac2e18fa2a32eb775d5c8d Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 25 Sep 2007 16:05:08 +0000
Subject: r25316: Remove last few instances of old BOOL type in librpc/. (This
 used to be commit 80d1dd41d4b224c46ad545f0afd97a847b99860b)

---
 source4/librpc/ndr/ndr.c         |  6 +++---
 source4/librpc/ndr/ndr_drsuapi.c |  8 ++++----
 source4/librpc/ndr/ndr_table.c   |  4 ++--
 source4/librpc/ndr/uuid.c        | 14 +++++++-------
 4 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'source4/librpc/ndr')

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));
 }
-- 
cgit