From 2151cde58014ea2e822c13d2f8a369b45dc19ca8 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 6 Oct 2007 22:28:14 +0000 Subject: r25554: Convert last instances of BOOL, True and False to the standard types. (This used to be commit 566aa14139510788548a874e9213d91317f83ca9) --- source4/torture/local/dbspeed.c | 20 ++++++++++---------- source4/torture/local/iconv.c | 2 +- source4/torture/local/irpc.c | 12 ++++++------ source4/torture/local/share.c | 6 +++--- 4 files changed, 20 insertions(+), 20 deletions(-) (limited to 'source4/torture/local') diff --git a/source4/torture/local/dbspeed.c b/source4/torture/local/dbspeed.c index b6c1a43d48..3445812365 100644 --- a/source4/torture/local/dbspeed.c +++ b/source4/torture/local/dbspeed.c @@ -50,7 +50,7 @@ static bool tdb_add_record(struct tdb_wrap *tdbw, const char *fmt1, /* test tdb speed */ -static BOOL test_tdb_speed(struct torture_context *torture, const void *_data) +static bool test_tdb_speed(struct torture_context *torture, const void *_data) { struct timeval tv; struct tdb_wrap *tdbw; @@ -120,32 +120,32 @@ static BOOL test_tdb_speed(struct torture_context *torture, const void *_data) unlink("test.tdb"); talloc_free(tmp_ctx); - return True; + return true; failed: unlink("test.tdb"); talloc_free(tmp_ctx); - return False; + return false; } -static BOOL ldb_add_record(struct ldb_context *ldb, unsigned rid) +static bool ldb_add_record(struct ldb_context *ldb, unsigned rid) { struct ldb_message *msg; int ret; msg = ldb_msg_new(ldb); if (msg == NULL) { - return False; + return false; } msg->dn = ldb_dn_new_fmt(msg, ldb, "SID=S-1-5-21-53173311-3623041448-2049097239-%u", rid); if (msg->dn == NULL) { - return False; + return false; } if (ldb_msg_add_fmt(msg, "UID", "%u", rid) != 0) { - return False; + return false; } ret = ldb_add(ldb, msg); @@ -159,7 +159,7 @@ static BOOL ldb_add_record(struct ldb_context *ldb, unsigned rid) /* test ldb speed */ -static BOOL test_ldb_speed(struct torture_context *torture, const void *_data) +static bool test_ldb_speed(struct torture_context *torture, const void *_data) { struct timeval tv; struct ldb_context *ldb; @@ -241,12 +241,12 @@ static BOOL test_ldb_speed(struct torture_context *torture, const void *_data) unlink("./test.ldb"); talloc_free(tmp_ctx); - return True; + return true; failed: unlink("./test.ldb"); talloc_free(tmp_ctx); - return False; + return false; } struct torture_suite *torture_local_dbspeed(TALLOC_CTX *mem_ctx) diff --git a/source4/torture/local/iconv.c b/source4/torture/local/iconv.c index e9d270b3a8..259769d60f 100644 --- a/source4/torture/local/iconv.c +++ b/source4/torture/local/iconv.c @@ -340,7 +340,7 @@ static bool test_first_1m(struct torture_context *tctx) } if (codepoint % 1000 == 0) { - if (torture_setting_bool(tctx, "progress", True)) { + if (torture_setting_bool(tctx, "progress", true)) { torture_comment(tctx, "codepoint=%u \r", codepoint); fflush(stdout); } diff --git a/source4/torture/local/irpc.c b/source4/torture/local/irpc.c index 70f9ac1e5f..aae6b4882e 100644 --- a/source4/torture/local/irpc.c +++ b/source4/torture/local/irpc.c @@ -29,7 +29,7 @@ const uint32_t MSG_ID1 = 1, MSG_ID2 = 2; -static BOOL test_debug; +static bool test_debug; struct irpc_test_data { @@ -72,7 +72,7 @@ static void deferred_echodata(struct event_context *ev, struct timed_event *te, */ static NTSTATUS irpc_EchoData(struct irpc_message *irpc, struct echo_EchoData *r) { - irpc->defer_reply = True; + irpc->defer_reply = true; event_add_timed(irpc->ev, irpc, timeval_zero(), deferred_echodata, irpc); return NT_STATUS_OK; } @@ -92,10 +92,10 @@ static bool test_addone(struct torture_context *test, const void *_data, /* make the call */ r.in.in_data = value; - test_debug = True; + test_debug = true; status = IRPC_CALL(data->msg_ctx1, cluster_id(MSG_ID2), rpcecho, ECHO_ADDONE, &r, test); - test_debug = False; + test_debug = false; torture_assert_ntstatus_ok(test, status, "AddOne failed"); /* check the answer */ @@ -209,7 +209,7 @@ static bool test_speed(struct torture_context *tctx, } -static BOOL irpc_setup(struct torture_context *tctx, void **_data) +static bool irpc_setup(struct torture_context *tctx, void **_data) { struct irpc_test_data *data; @@ -237,7 +237,7 @@ static BOOL irpc_setup(struct torture_context *tctx, void **_data) IRPC_REGISTER(data->msg_ctx1, rpcecho, ECHO_ECHODATA, irpc_EchoData, NULL); IRPC_REGISTER(data->msg_ctx2, rpcecho, ECHO_ECHODATA, irpc_EchoData, NULL); - return True; + return true; } struct torture_suite *torture_local_irpc(TALLOC_CTX *mem_ctx) diff --git a/source4/torture/local/share.c b/source4/torture/local/share.c index a4250bccf9..de93e3c591 100644 --- a/source4/torture/local/share.c +++ b/source4/torture/local/share.c @@ -175,17 +175,17 @@ static void tcase_add_share_tests(struct torture_tcase *tcase) torture_tcase_add_test(tcase, "share_double_create", test_double_create, NULL); } -static BOOL setup_ldb(struct torture_context *tctx, void **data) +static bool setup_ldb(struct torture_context *tctx, void **data) { return NT_STATUS_IS_OK(share_get_context_by_name(tctx, "ldb", (struct share_context **)data)); } -static BOOL setup_classic(struct torture_context *tctx, void **data) +static bool setup_classic(struct torture_context *tctx, void **data) { return NT_STATUS_IS_OK(share_get_context_by_name(tctx, "classic", (struct share_context **)data)); } -static BOOL teardown(struct torture_context *tctx, void *data) +static bool teardown(struct torture_context *tctx, void *data) { talloc_free(data); return true; -- cgit