diff options
| author | Jeremy Allison <jra@samba.org> | 2007-10-18 17:40:25 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2007-10-18 17:40:25 -0700 |
| commit | 30191d1a5704ad2b158386b511558972d539ce47 (patch) | |
| tree | 4f46e5c4f28f672ab661aa18f45745860970a88c /source3/script | |
| parent | 789856f63ff73fec66298e95c91c60db7bdaf14e (diff) | |
| download | samba-30191d1a5704ad2b158386b511558972d539ce47.tar.gz samba-30191d1a5704ad2b158386b511558972d539ce47.tar.bz2 samba-30191d1a5704ad2b158386b511558972d539ce47.zip | |
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)
Diffstat (limited to 'source3/script')
| -rw-r--r-- | source3/script/mkbuildoptions.awk | 8 | ||||
| -rw-r--r-- | source3/script/mkproto.awk | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/source3/script/mkbuildoptions.awk b/source3/script/mkbuildoptions.awk index 383891d2e0..21c4bfac85 100644 --- a/source3/script/mkbuildoptions.awk +++ b/source3/script/mkbuildoptions.awk @@ -23,14 +23,14 @@ BEGIN { print "#include \"build_env.h\""; print "#include \"dynconfig.h\""; print ""; - print "static void output(BOOL screen, const char *format, ...) PRINTF_ATTRIBUTE(2,3);"; - print "void build_options(BOOL screen);"; + print "static void output(bool screen, const char *format, ...) PRINTF_ATTRIBUTE(2,3);"; + print "void build_options(bool screen);"; print ""; print ""; print "/****************************************************************************"; print "helper function for build_options"; print "****************************************************************************/"; - print "static void output(BOOL screen, const char *format, ...)"; + print "static void output(bool screen, const char *format, ...)"; print "{"; print " char *ptr;"; print " va_list ap;"; @@ -51,7 +51,7 @@ BEGIN { print "/****************************************************************************"; print "options set at build time for the samba suite"; print "****************************************************************************/"; - print "void build_options(BOOL screen)"; + print "void build_options(bool screen)"; print "{"; print " if ((DEBUGLEVEL < 4) && (!screen)) {"; print " return;"; diff --git a/source3/script/mkproto.awk b/source3/script/mkproto.awk index fd38235e4e..a707378251 100644 --- a/source3/script/mkproto.awk +++ b/source3/script/mkproto.awk @@ -45,12 +45,12 @@ END { /^FN_LOCAL_BOOL/ { split($0,a,"[,()]") - printf "BOOL %s(int );\n", a[2] + printf "bool %s(int );\n", a[2] } /^FN_LOCAL_PARM_BOOL/ { split($0,a,"[,()]") - printf "BOOL %s(const struct share_params *p );\n", a[2] + printf "bool %s(const struct share_params *p );\n", a[2] } /^FN_LOCAL_PARM_INTEGER/ { @@ -90,7 +90,7 @@ END { /^FN_GLOBAL_BOOL/ { split($0,a,"[,()]") - printf "BOOL %s(void);\n", a[2] + printf "bool %s(void);\n", a[2] } /^FN_GLOBAL_LIST/ { @@ -139,7 +139,7 @@ END { gotstart = 1; } - if( $0 ~ /^smb_iconv_t|^long|^char|^uint|^NTSTATUS|^WERROR|^CLI_POLICY_HND|^struct|^bool|^BOOL|^void|^time|^smb_shm_offset_t|^shm_offset_t|^FILE|^XFILE|^SMB_OFF_T|^size_t|^ssize_t|^SMB_BIG_UINT|^SMB_BIG_INT/ ) { + if( $0 ~ /^smb_iconv_t|^long|^char|^uint|^NTSTATUS|^WERROR|^CLI_POLICY_HND|^struct|^bool|^void|^time|^smb_shm_offset_t|^shm_offset_t|^FILE|^XFILE|^SMB_OFF_T|^size_t|^ssize_t|^SMB_BIG_UINT|^SMB_BIG_INT/ ) { gotstart = 1; } |