diff options
| author | Jeremy Allison <jra@samba.org> | 1997-10-06 17:52:25 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 1997-10-06 17:52:25 +0000 |
| commit | 2e92be3aaf01c574d32d1a10e1359888638b68bc (patch) | |
| tree | 5280182dda3e36282bd11699e022e015ad531bdc /source3/lib | |
| parent | 8429cec72ff15efdd5ab742ba71ede36db43ef14 (diff) | |
| download | samba-2e92be3aaf01c574d32d1a10e1359888638b68bc.tar.gz samba-2e92be3aaf01c574d32d1a10e1359888638b68bc.tar.bz2 samba-2e92be3aaf01c574d32d1a10e1359888638b68bc.zip | |
client.c: Changed shadowed variable.
locking.c: Removed USE_OPLOCKS - now the default.
params.c: Removed unused variable.
proto.h: Updated.
reply.c: Removed USE_OPLOCKS - now the default.
server.c: Removed USE_OPLOCKS - now the default.
smb.h: Removed USE_OPLOCKS - now the default.
smbparse.c: Changed shadowed variable.
status.c: Removed USE_OPLOCKS - now the default.
util.c: Removed USE_OPLOCKS - now the default.
Jeremy (jallison@whistle.com)
(This used to be commit b93509846d6291771787af457500eec8984ee6bd)
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/util.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/source3/lib/util.c b/source3/lib/util.c index c5cfdd99f7..611794c4a8 100644 --- a/source3/lib/util.c +++ b/source3/lib/util.c @@ -2301,7 +2301,6 @@ BOOL receive_smb(int fd,char *buffer, int timeout) return(True); } -#ifdef USE_OPLOCKS /**************************************************************************** read a message from a udp fd. The timeout is in milli seconds @@ -2498,7 +2497,6 @@ BOOL receive_message_or_smb(int smbfd, int oplock_fd, return receive_local_message(oplock_fd, buffer, buffer_len, 0); } } -#endif /* USE_OPLOCKS */ /**************************************************************************** send an smb to a fd @@ -4335,11 +4333,11 @@ char *align2(char *q, char *base) align a pointer to a multiple of align_offset bytes. looks like it will work for offsets of 0, 2 and 4... ********************************************************************/ -char *align_offset(char *q, char *base, int align_offset) +char *align_offset(char *q, char *base, int align_offset_len) { - if (align_offset != 0 && ((q - base) & (align_offset-1))) + if (align_offset_len != 0 && ((q - base) & (align_offset_len-1))) { - q += align_offset - ((q - base) & (align_offset)); + q += align_offset_len - ((q - base) & (align_offset_len)); } return q; } |