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/torture/locktest2.c | |
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/torture/locktest2.c')
-rw-r--r-- | source3/torture/locktest2.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source3/torture/locktest2.c b/source3/torture/locktest2.c index 44ef250154..bdf9e51970 100644 --- a/source3/torture/locktest2.c +++ b/source3/torture/locktest2.c @@ -23,10 +23,10 @@ static fstring password; static fstring username; static int got_pass; static int numops = 1000; -static BOOL showall; -static BOOL analyze; -static BOOL hide_unlock_fails; -static BOOL use_oplocks; +static bool showall; +static bool analyze; +static bool hide_unlock_fails; +static bool use_oplocks; extern char *optarg; extern int optind; @@ -79,7 +79,7 @@ static int try_open(struct cli_state *c, char *nfs, int fstype, const char *fnam return -1; } -static BOOL try_close(struct cli_state *c, int fstype, int fd) +static bool try_close(struct cli_state *c, int fstype, int fd) { switch (fstype) { case FSTYPE_SMB: @@ -92,7 +92,7 @@ static BOOL try_close(struct cli_state *c, int fstype, int fd) return False; } -static BOOL try_lock(struct cli_state *c, int fstype, +static bool try_lock(struct cli_state *c, int fstype, int fd, unsigned start, unsigned len, enum brl_type op) { @@ -114,7 +114,7 @@ static BOOL try_lock(struct cli_state *c, int fstype, return False; } -static BOOL try_unlock(struct cli_state *c, int fstype, +static bool try_unlock(struct cli_state *c, int fstype, int fd, unsigned start, unsigned len) { struct flock lock; @@ -223,7 +223,7 @@ static void reconnect(struct cli_state *cli[NSERVERS][NCONNECTIONS], -static BOOL test_one(struct cli_state *cli[NSERVERS][NCONNECTIONS], +static bool test_one(struct cli_state *cli[NSERVERS][NCONNECTIONS], char *nfs[NSERVERS], int fnum[NSERVERS][NUMFSTYPES][NCONNECTIONS][NFILES], struct record *rec) @@ -237,7 +237,7 @@ static BOOL test_one(struct cli_state *cli[NSERVERS][NCONNECTIONS], unsigned r2 = rec->r2; enum brl_type op; int server; - BOOL ret[NSERVERS]; + bool ret[NSERVERS]; if (r1 < READ_PCT) { op = READ_LOCK; |