diff options
| author | Jeremy Allison <jra@samba.org> | 2000-08-01 18:32:34 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2000-08-01 18:32:34 +0000 |
| commit | 7f36df301e28dc8ca0e5bfadc109d6e907d9ba2b (patch) | |
| tree | 97f6e250200b3ecfdb820da3bf38117f86ab4184 /source3/libsmb | |
| parent | d95777ac34f68a3525786103b9217f6397d9f1d4 (diff) | |
| download | samba-7f36df301e28dc8ca0e5bfadc109d6e907d9ba2b.tar.gz samba-7f36df301e28dc8ca0e5bfadc109d6e907d9ba2b.tar.xz 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/libsmb')
| -rw-r--r-- | source3/libsmb/clierror.c | 3 | ||||
| -rw-r--r-- | source3/libsmb/clireadwrite.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/source3/libsmb/clierror.c b/source3/libsmb/clierror.c index 78a7c9d451c..314b343f252 100644 --- a/source3/libsmb/clierror.c +++ b/source3/libsmb/clierror.c @@ -161,7 +161,8 @@ int cli_error(struct cli_state *cli, uint8 *eclass, uint32 *num, uint32 *nt_rpc_ uint32 nt_err = IVAL(cli->inbuf,smb_rcls); if (num) *num = nt_err; DEBUG(10,("cli_error: 32 bit codes: code=%08x\n", nt_err)); - if (!IS_BITS_SET_ALL(nt_err, 0xc0000000)) return 0; + if (!(nt_err & 0xc0000000)) + return 0; switch (nt_err) { case NT_STATUS_ACCESS_VIOLATION: return EACCES; diff --git a/source3/libsmb/clireadwrite.c b/source3/libsmb/clireadwrite.c index 8012c02a8fc..86a51da8352 100644 --- a/source3/libsmb/clireadwrite.c +++ b/source3/libsmb/clireadwrite.c @@ -148,10 +148,10 @@ static void cli_issue_write(struct cli_state *cli, int fnum, off_t offset, uint1 SSVAL(cli->outbuf,smb_vwv2,fnum); SIVAL(cli->outbuf,smb_vwv3,offset); - SIVAL(cli->outbuf,smb_vwv5,IS_BITS_SET_ALL(mode, 0x0008) ? 0xFFFFFFFF : 0); + SIVAL(cli->outbuf,smb_vwv5,(mode & 0x0008) ? 0xFFFFFFFF : 0); SSVAL(cli->outbuf,smb_vwv7,mode); - SSVAL(cli->outbuf,smb_vwv8,IS_BITS_SET_ALL(mode, 0x0008) ? size : 0); + SSVAL(cli->outbuf,smb_vwv8,(mode & 0x0008) ? size : 0); SSVAL(cli->outbuf,smb_vwv10,size); SSVAL(cli->outbuf,smb_vwv11, smb_buf(cli->outbuf) - smb_base(cli->outbuf)); |