summaryrefslogtreecommitdiff
path: root/source3/rpcclient
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2000-08-01 18:32:34 +0000
committerJeremy Allison <jra@samba.org>2000-08-01 18:32:34 +0000
commit7f36df301e28dc8ca0e5bfadc109d6e907d9ba2b (patch)
tree97f6e250200b3ecfdb820da3bf38117f86ab4184 /source3/rpcclient
parentd95777ac34f68a3525786103b9217f6397d9f1d4 (diff)
downloadsamba-7f36df301e28dc8ca0e5bfadc109d6e907d9ba2b.tar.gz
samba-7f36df301e28dc8ca0e5bfadc109d6e907d9ba2b.tar.bz2
samba-7f36df301e28dc8ca0e5bfadc109d6e907d9ba2b.zip
Tidyup removing many of the 0xC0000000 | NT_STATUS_XXX stuff (only need NT_STATUS_XXX).
Removed IS_BITS_xxx macros as they were just reproducing "C" syntax in a more obscure way. Jeremy. (This used to be commit c55bcec817f47d6162466b193d533c877194124a)
Diffstat (limited to 'source3/rpcclient')
-rw-r--r--source3/rpcclient/display.c8
-rw-r--r--source3/rpcclient/display_sec.c2
2 files changed, 5 insertions, 5 deletions
diff --git a/source3/rpcclient/display.c b/source3/rpcclient/display.c
index bb0cdac320..12ae5e2dfe 100644
--- a/source3/rpcclient/display.c
+++ b/source3/rpcclient/display.c
@@ -58,8 +58,8 @@ convert an oplock mode to a string
char *get_file_oplock_str(uint32 op_type)
{
static fstring oplock;
- BOOL excl = IS_BITS_SET_ALL(op_type, EXCLUSIVE_OPLOCK);
- BOOL batch = IS_BITS_SET_ALL(op_type, BATCH_OPLOCK );
+ BOOL excl = ((op_type & EXCLUSIVE_OPLOCK) != 0);
+ BOOL batch = ((op_type & BATCH_OPLOCK ) != 0);
oplock[0] = 0;
@@ -106,7 +106,7 @@ char *get_server_type_str(uint32 type)
typestr[0] = 0;
for (i = 0; i < 32; i++)
{
- if (IS_BITS_SET_ALL(type, 1 << i))
+ if (type & (1 << i))
{
switch (((unsigned)1) << i)
{
@@ -984,7 +984,7 @@ char *get_sec_mask_str(uint32 type)
typestr[0] = 0;
for (i = 0; i < 32; i++)
{
- if (IS_BITS_SET_ALL(type, 1 << i))
+ if (type & (1 << i))
{
switch (((unsigned)1) << i)
{
diff --git a/source3/rpcclient/display_sec.c b/source3/rpcclient/display_sec.c
index e0e3bf0831..44e7e6e8aa 100644
--- a/source3/rpcclient/display_sec.c
+++ b/source3/rpcclient/display_sec.c
@@ -54,7 +54,7 @@ static const char *get_sec_mask_str(uint32 type)
typestr[0] = 0;
for (i = 0; i < 32; i++)
{
- if (IS_BITS_SET_ALL(type, 1 << i))
+ if (type & (1 << i))
{
switch (1 << i)
{