From 30191d1a5704ad2b158386b511558972d539ce47 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 18 Oct 2007 17:40:25 -0700 Subject: RIP BOOL. Convert BOOL -> bool. I found a few interesting bugs in various places whilst doing this (places that assumed BOOL == int). I also need to fix the Samba4 pidl generation (next checkin). Jeremy. (This used to be commit f35a266b3cbb3e5fa6a86be60f34fe340a3ca71f) --- source3/libsmb/clirap2.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'source3/libsmb/clirap2.c') diff --git a/source3/libsmb/clirap2.c b/source3/libsmb/clirap2.c index b8fe31a562..6be7fb6a56 100644 --- a/source3/libsmb/clirap2.c +++ b/source3/libsmb/clirap2.c @@ -1231,7 +1231,7 @@ int cli_NetShareDelete(struct cli_state *cli, const char * share_name ) * False - failure * ************************************************************************/ -BOOL cli_get_pdc_name(struct cli_state *cli, char *workgroup, char *pdc_name) +bool cli_get_pdc_name(struct cli_state *cli, char *workgroup, char *pdc_name) { char *rparam = NULL; char *rdata = NULL; @@ -1311,7 +1311,7 @@ BOOL cli_get_pdc_name(struct cli_state *cli, char *workgroup, char *pdc_name) * Origins: samba 2.0.6 source/libsmb/clientgen.c cli_NetServerEnum() * ************************************************************************/ -BOOL cli_get_server_domain(struct cli_state *cli) +bool cli_get_server_domain(struct cli_state *cli) { char *rparam = NULL; char *rdata = NULL; @@ -1376,7 +1376,7 @@ BOOL cli_get_server_domain(struct cli_state *cli) * Origins: samba 2.0.6 source/libsmb/clientgen.c cli_NetServerEnum() * ************************************************************************/ -BOOL cli_get_server_type(struct cli_state *cli, uint32 *pstype) +bool cli_get_server_type(struct cli_state *cli, uint32 *pstype) { char *rparam = NULL; char *rdata = NULL; @@ -1416,7 +1416,7 @@ BOOL cli_get_server_type(struct cli_state *cli, uint32 *pstype) return(res == 0 || res == ERRmoredata); } -BOOL cli_get_server_name(TALLOC_CTX *mem_ctx, struct cli_state *cli, +bool cli_get_server_name(TALLOC_CTX *mem_ctx, struct cli_state *cli, char **servername) { char *rparam = NULL; @@ -1428,7 +1428,7 @@ BOOL cli_get_server_name(TALLOC_CTX *mem_ctx, struct cli_state *cli, +sizeof(RAP_SERVER_INFO_L1) /* return string */ +WORDSIZE /* info level */ +WORDSIZE]; /* buffer size */ - BOOL res = False; + bool res = False; fstring tmp; /* send a SMBtrans command with api NetServerGetInfo */ @@ -1499,7 +1499,7 @@ BOOL cli_get_server_name(TALLOC_CTX *mem_ctx, struct cli_state *cli, * False - failure * ************************************************************************/ -BOOL cli_ns_check_server_type(struct cli_state *cli, char *workgroup, uint32 stype) +bool cli_ns_check_server_type(struct cli_state *cli, char *workgroup, uint32 stype) { char *rparam = NULL; char *rdata = NULL; @@ -1512,7 +1512,7 @@ BOOL cli_ns_check_server_type(struct cli_state *cli, char *workgroup, uint32 sty +WORDSIZE /* buffer size */ +DWORDSIZE /* server type */ +RAP_MACHNAME_LEN]; /* workgroup */ - BOOL found_server = False; + bool found_server = False; int res = -1; /* send a SMBtrans command with api NetServerEnum */ @@ -1566,7 +1566,7 @@ BOOL cli_ns_check_server_type(struct cli_state *cli, char *workgroup, uint32 sty /**************************************************************************** perform a NetWkstaUserLogoff ****************************************************************************/ -BOOL cli_NetWkstaUserLogoff(struct cli_state *cli,char *user, char *workstation) +bool cli_NetWkstaUserLogoff(struct cli_state *cli,char *user, char *workstation) { char *rparam = NULL; char *rdata = NULL; -- cgit