r25554: Convert last instances of BOOL, True and False to the standard types.

(This used to be commit 566aa14139510788548a874e9213d91317f83ca9)

10 files changed, 37 insertions, 37 deletions

diff --git a/source4/scripting/ejs/ejsnet/net_ctx.c b/source4/scripting/ejs/ejsnet/net_ctx.c
index 5fdfe51887..97a05ab88f 100644
--- a/source4/scripting/ejs/ejsnet/net_ctx.c
+++ b/source4/scripting/ejs/ejsnet/net_ctx.c
@@ -166,9 +166,9 @@ static int ejs_net_join_domain(MprVarHandle eid, int argc, struct MprVar **argv)
 		MprVar error_string = mprString(join->out.error_string);
 		
 		mprSetPropertyValue(argv[0], "error_string", error_string);
-		mpr_Return(eid, mprCreateBoolVar(False));
+		mpr_Return(eid, mprCreateBoolVar(false));
 	} else {
-		mpr_Return(eid, mprCreateBoolVar(True));
+		mpr_Return(eid, mprCreateBoolVar(true));
 	}
 	talloc_free(mem_ctx);
 	return 0;
@@ -214,9 +214,9 @@ static int ejs_net_samsync_ldb(MprVarHandle eid, int argc, struct MprVar **argv)
 		MprVar error_string = mprString(samsync->out.error_string);
 		
 		mprSetPropertyValue(argv[0], "error_string", error_string);
-		mpr_Return(eid, mprCreateBoolVar(False));
+		mpr_Return(eid, mprCreateBoolVar(false));
 	} else {
-		mpr_Return(eid, mprCreateBoolVar(True));
+		mpr_Return(eid, mprCreateBoolVar(true));
 	}
 	talloc_free(mem_ctx);
 	return 0;
diff --git a/source4/scripting/ejs/ejsrpc.c b/source4/scripting/ejs/ejsrpc.c
index a5654e0f00..3769607949 100644
--- a/source4/scripting/ejs/ejsrpc.c
+++ b/source4/scripting/ejs/ejsrpc.c
@@ -315,12 +315,12 @@ bool ejs_pull_null(struct ejs_rpc *ejs, struct MprVar *v, const char *name)
 {
 	NTSTATUS status = mprGetVar(&v, name);
 	if (!NT_STATUS_IS_OK(status)) {
-		return False;
+		return false;
 	}
 	if (v->type == MPR_TYPE_PTR && v->ptr == NULL) {
-		return True;
+		return true;
 	}
-	return False;
+	return false;
 }
 
 /*
diff --git a/source4/scripting/ejs/mprutil.c b/source4/scripting/ejs/mprutil.c
index b8271d97c5..9143947fb8 100644
--- a/source4/scripting/ejs/mprutil.c
+++ b/source4/scripting/ejs/mprutil.c
@@ -134,7 +134,7 @@ struct MprVar mprString(const char *s)
 	if (s == NULL) {
 		return mprCreatePtrVar(NULL);
 	}
-	return mprCreateStringVar(s, True);
+	return mprCreateStringVar(s, true);
 }
 
 /*
diff --git a/source4/scripting/ejs/smbcalls_auth.c b/source4/scripting/ejs/smbcalls_auth.c
index 44059d7537..b4848d4323 100644
--- a/source4/scripting/ejs/smbcalls_auth.c
+++ b/source4/scripting/ejs/smbcalls_auth.c
@@ -65,19 +65,19 @@ static int ejs_doauth(MprVarHandle eid,
 		nt_status = auth_context_create(tmp_ctx, ev, msg, &auth_context);
 	}
 	if (!NT_STATUS_IS_OK(nt_status)) {
-		mprSetPropertyValue(auth, "result", mprCreateBoolVar(False));
+		mprSetPropertyValue(auth, "result", mprCreateBoolVar(false));
 		mprSetPropertyValue(auth, "report", mprString("Auth System Failure"));
 		goto done;
 	}
 
 	user_info = talloc(tmp_ctx, struct auth_usersupplied_info);
 	if (!user_info) {
-		mprSetPropertyValue(auth, "result", mprCreateBoolVar(False));
+		mprSetPropertyValue(auth, "result", mprCreateBoolVar(false));
 		mprSetPropertyValue(auth, "report", mprString("talloc failed"));
 		goto done;
 	}
 
-	user_info->mapped_state = True;
+	user_info->mapped_state = true;
 	user_info->client.account_name = username;
 	user_info->mapped.account_name = username;
 	user_info->client.domain_name = domain;
@@ -104,14 +104,14 @@ static int ejs_doauth(MprVarHandle eid,
 	if (!NT_STATUS_IS_OK(nt_status)) {
 		mprSetPropertyValue(auth, "report", 
 				    mprString(talloc_strdup(mprMemCtx(), get_friendly_nt_error_msg(nt_status))));
-		mprSetPropertyValue(auth, "result", mprCreateBoolVar(False));
+		mprSetPropertyValue(auth, "result", mprCreateBoolVar(false));
 		goto done;
 	}
 
 	nt_status = auth_generate_session_info(tmp_ctx, server_info, &session_info);
 	if (!NT_STATUS_IS_OK(nt_status)) {
 		mprSetPropertyValue(auth, "report", mprString("Session Info generation failed"));
-		mprSetPropertyValue(auth, "result", mprCreateBoolVar(False));
+		mprSetPropertyValue(auth, "result", mprCreateBoolVar(false));
 		goto done;
 	}
 
@@ -132,13 +132,13 @@ static int ejs_doauth(MprVarHandle eid,
 
 	if (security_token_is_anonymous(session_info->security_token)) {
 		mprSetPropertyValue(auth, "report", mprString("Anonymous login not permitted"));
-		mprSetPropertyValue(auth, "result", mprCreateBoolVar(False));
+		mprSetPropertyValue(auth, "result", mprCreateBoolVar(false));
 		goto done;
 	}
 
 	if (!set) {
 		mprSetPropertyValue(auth, "report", mprString("Session Info generation failed"));
-		mprSetPropertyValue(auth, "result", mprCreateBoolVar(False));
+		mprSetPropertyValue(auth, "result", mprCreateBoolVar(false));
 	}
 	
 	session_info_obj = mprInitObject(eid, "session_info", 0, NULL);
diff --git a/source4/scripting/ejs/smbcalls_cli.c b/source4/scripting/ejs/smbcalls_cli.c
index af86be9432..e08a098833 100644
--- a/source4/scripting/ejs/smbcalls_cli.c
+++ b/source4/scripting/ejs/smbcalls_cli.c
@@ -61,7 +61,7 @@ static int ejs_cli_connect(MprVarHandle eid, int argc, char **argv)
 		return -1;
 	}
 
-	transport = smbcli_transport_init(sock, sock, False);
+	transport = smbcli_transport_init(sock, sock, false);
 
 	if (!transport) {
 		ejsSetErrorMsg(eid, "transport init failed");
@@ -192,7 +192,7 @@ static int ejs_cli_ssetup(MprVarHandle eid, int argc, MprVar **argv)
 
 	/* Do session setup */
 
-	session = smbcli_session_init(transport, transport, False);
+	session = smbcli_session_init(transport, transport, false);
 
 	if (!session) {
 		ejsSetErrorMsg(eid, "session init failed");
@@ -252,7 +252,7 @@ static int ejs_cli_tree_connect(MprVarHandle eid, int argc, MprVar **argv)
 	}
 
 	session = argv[0]->ptr;
-	tree = smbcli_tree_init(session, session, False);
+	tree = smbcli_tree_init(session, session, false);
 
 	if (!tree) {
 		ejsSetErrorMsg(eid, "tree init failed");
@@ -442,7 +442,7 @@ static int ejs_tree_connect(MprVarHandle eid, int argc, char **argv)
 	io.in.service                = sharename;
 	io.in.service_type           = "?????";
 	io.in.credentials            = creds;
-	io.in.fallback_to_anonymous  = False;
+	io.in.fallback_to_anonymous  = false;
 	io.in.workgroup              = lp_workgroup(global_loadparm);
 
 	result = smb_composite_connect(&io, mem_ctx, NULL);
diff --git a/source4/scripting/ejs/smbcalls_config.c b/source4/scripting/ejs/smbcalls_config.c
index 6b9c245e7e..1c76757659 100644
--- a/source4/scripting/ejs/smbcalls_config.c
+++ b/source4/scripting/ejs/smbcalls_config.c
@@ -138,7 +138,7 @@ static int ejs_lpGet(MprVarHandle eid, int argc, char **argv)
 		mpr_ReturnString(eid, *(char **)parm_ptr);
 		break;
 	case P_BOOL:
-		mpr_Return(eid, mprCreateBoolVar(*(BOOL *)parm_ptr));
+		mpr_Return(eid, mprCreateBoolVar(*(bool *)parm_ptr));
 		break;
 	case P_INTEGER:
 	case P_OCTAL:
@@ -187,7 +187,7 @@ static int ejs_lpSet(MprVarHandle eid, int argc, char **argv)
 */
 static int ejs_lpReload(MprVarHandle eid, int argc, char **argv)
 {
-	BOOL ret = lp_load(lp_configfile(global_loadparm));
+	bool ret = lp_load(lp_configfile(global_loadparm));
 	if (ret) {
 		unload_interfaces();
 	}
diff --git a/source4/scripting/ejs/smbcalls_creds.c b/source4/scripting/ejs/smbcalls_creds.c
index 730753d158..781843371a 100644
--- a/source4/scripting/ejs/smbcalls_creds.c
+++ b/source4/scripting/ejs/smbcalls_creds.c
@@ -61,7 +61,7 @@ static int ejs_creds_set_domain(MprVarHandle eid, int argc, char **argv)
 	}
 
 	cli_credentials_set_domain(creds, argv[0], CRED_SPECIFIED);
-	mpr_Return(eid, mprCreateBoolVar(True));
+	mpr_Return(eid, mprCreateBoolVar(true));
 	return 0;
 }
 
@@ -90,7 +90,7 @@ static int ejs_creds_set_username(MprVarHandle eid, int argc, char **argv)
 	}
 
 	cli_credentials_set_username(creds, argv[0], CRED_SPECIFIED);
-	mpr_Return(eid, mprCreateBoolVar(True));
+	mpr_Return(eid, mprCreateBoolVar(true));
 	return 0;
 }
 
@@ -119,7 +119,7 @@ static int ejs_creds_set_password(MprVarHandle eid, int argc, char **argv)
 	}
 
 	cli_credentials_set_password(creds, argv[0], CRED_SPECIFIED);
-	mpr_Return(eid, mprCreateBoolVar(True));
+	mpr_Return(eid, mprCreateBoolVar(true));
 	return 0;
 }
 
@@ -136,7 +136,7 @@ static int ejs_creds_set_realm(MprVarHandle eid, int argc, char **argv)
 	}
 
 	cli_credentials_set_realm(creds, argv[0], CRED_SPECIFIED);
-	mpr_Return(eid, mprCreateBoolVar(True));
+	mpr_Return(eid, mprCreateBoolVar(true));
 	return 0;
 }
 
@@ -165,7 +165,7 @@ static int ejs_creds_set_workstation(MprVarHandle eid, int argc, char **argv)
 	}
 	
 	cli_credentials_set_workstation(creds, argv[0], CRED_SPECIFIED);
-	mpr_Return(eid, mprCreateBoolVar(True));
+	mpr_Return(eid, mprCreateBoolVar(true));
 	return 0;
 }
 
@@ -193,9 +193,9 @@ static int ejs_creds_set_machine_account(MprVarHandle eid, int argc, struct MprV
 	}
 	
 	if (NT_STATUS_IS_OK(cli_credentials_set_machine_account(creds))) {
-		mpr_Return(eid, mprCreateBoolVar(True));
+		mpr_Return(eid, mprCreateBoolVar(true));
 	} else {
-		mpr_Return(eid, mprCreateBoolVar(False));
+		mpr_Return(eid, mprCreateBoolVar(false));
 	}
 	return 0;
 }
diff --git a/source4/scripting/ejs/smbcalls_data.c b/source4/scripting/ejs/smbcalls_data.c
index 60dadc5165..a98266c3da 100644
--- a/source4/scripting/ejs/smbcalls_data.c
+++ b/source4/scripting/ejs/smbcalls_data.c
@@ -107,7 +107,7 @@ failed:
 static int ejs_blobCompare(MprVarHandle eid, int argc, struct MprVar **argv)
 {
 	DATA_BLOB *blob1, *blob2;
-	BOOL ret = False;
+	bool ret = false;
 
 	if (argc != 2) {
 		ejsSetErrorMsg(eid, "blobCompare invalid arguments");
@@ -118,24 +118,24 @@ static int ejs_blobCompare(MprVarHandle eid, int argc, struct MprVar **argv)
 	blob2 = mprToDataBlob(argv[1]);
 
 	if (blob1 == blob2) {
-		ret = True;
+		ret = true;
 		goto done;
 	}
 	if (blob1 == NULL || blob2 == NULL) {
-		ret = False;
+		ret = false;
 		goto done;
 	}
 
 	if (blob1->length != blob2->length) {
-		ret = False;
+		ret = false;
 		goto done;
 	}
 
 	if (memcmp(blob1->data, blob2->data, blob1->length) != 0) {
-		ret = False;
+		ret = false;
 		goto done;
 	}
-	ret = True;
+	ret = true;
 
 done:
 	mpr_Return(eid, mprCreateBoolVar(ret));
diff --git a/source4/scripting/ejs/smbcalls_ldb.c b/source4/scripting/ejs/smbcalls_ldb.c
index 42105e7965..04162830b4 100644
--- a/source4/scripting/ejs/smbcalls_ldb.c
+++ b/source4/scripting/ejs/smbcalls_ldb.c
@@ -483,7 +483,7 @@ static int ejs_ldbClose(MprVarHandle eid, int argc, struct MprVar **argv)
 	}
 
 	mprSetThisPtr(eid, "db", NULL);
-	mpr_Return(eid, mprCreateBoolVar(True));
+	mpr_Return(eid, mprCreateBoolVar(true));
 	return 0;
 }
 
diff --git a/source4/scripting/ejs/smbcalls_sys.c b/source4/scripting/ejs/smbcalls_sys.c
index 96e665ab3a..10de8e162e 100644
--- a/source4/scripting/ejs/smbcalls_sys.c
+++ b/source4/scripting/ejs/smbcalls_sys.c
@@ -294,7 +294,7 @@ static int ejs_sys_file_load(MprVarHandle eid, int argc, char **argv)
 */
 static int ejs_sys_file_save(MprVarHandle eid, int argc, char **argv)
 {
-	BOOL ret;
+	bool ret;
 	if (argc != 2) {
 		ejsSetErrorMsg(eid, "sys_file_save invalid arguments");
 		return -1;
@@ -311,7 +311,7 @@ static int ejs_sys_file_save(MprVarHandle eid, int argc, char **argv)
 */
 static int ejs_sys_mkdir(MprVarHandle eid, int argc, struct MprVar **argv)
 {
-	BOOL ret;
+	bool ret;
 	char *name;
 	if (argc != 2) {
 		ejsSetErrorMsg(eid, "sys_mkdir invalid arguments, need mkdir(dirname, mode)");