sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-12 09:18:10 +03:00
Code

got rid of some #ifdef LARGE_XXXX stuff and got rid of non-portable LL

Browse Source 
suffix from some constants.
(This used to be commit 84956eddf3)
This commit is contained in:
Andrew Tridgell 1998-09-18 02:21:07 +00:00
parent 6dfbe2fa1a
commit 8d6b713c5d
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source3/lib/util.c
View File

@ -4471,11 +4471,8 @@ BOOL fcntl_lock(int fd, int op, SMB_OFF_T offset, SMB_OFF_T count, int type)
int ret;
if(lp_ole_locking_compat()) {
#ifdef LARGE_SMB_OFF_T
SMB_OFF_T mask = 0xC000000000000000LL;
#else
SMB_OFF_T mask = 0xC0000000;
#endif
SMB_OFF_T mask = ((SMB_OFF_T)0xC) << (SMB_OFF_T_BITS-4);
SMB_OFF_T mask2= ((SMB_OFF_T)0x3) << (SMB_OFF_T_BITS-4);
/* make sure the count is reasonable, we might kill the lockd otherwise */
count &= ~mask;
@ -4485,17 +4482,9 @@ BOOL fcntl_lock(int fd, int op, SMB_OFF_T offset, SMB_OFF_T count, int type)
still allows OLE2 apps to operate, but should stop lockd from
dieing */
if ((offset & mask) != 0)
#ifdef LARGE_SMB_OFF_T
offset = (offset & ~mask) | (((offset & mask) >> 2) & 0x3000000000000000LL);
#else
offset = (offset & ~mask) | (((offset & mask) >> 2) & 0x30000000);
#endif
offset = (offset & ~mask) | (((offset & mask) >> 2) & mask2);
} else {
#ifdef LARGE_SMB_OFF_T
SMB_OFF_T mask = 0x8000000000000000LL;
#else
SMB_OFF_T mask = 0x80000000;
#endif
SMB_OFF_T mask = ((SMB_OFF_T)0x8) << (SMB_OFF_T_BITS-4);
SMB_OFF_T neg_mask = ~mask;
/* interpret negative counts as large numbers */