diff options
| author | Jeremy Allison <jra@samba.org> | 2000-04-11 19:44:54 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2000-04-11 19:44:54 +0000 |
| commit | f6be38cae223f1ad3f4ecc5b81d14c44d92f58ba (patch) | |
| tree | fdfba0ada6fb79f89c27ace70eea7913e9d97915 /source3/include/proto.h | |
| parent | ca085145a9392c229b483ee24c1d566a23335fb3 (diff) | |
| download | samba-f6be38cae223f1ad3f4ecc5b81d14c44d92f58ba.tar.gz samba-f6be38cae223f1ad3f4ecc5b81d14c44d92f58ba.tar.bz2 samba-f6be38cae223f1ad3f4ecc5b81d14c44d92f58ba.zip | |
include/byteorder.h: ALIGN4/ALIGN2 macros.
include/includes.h: Added SMB_BIG_UINT_BITS.
lib/util.c: Removed align2/align4 - use macros.
libsmb/namequery.c: Use ALIGN2.
locking/locking.c: Replace do_lock, do_unlock, args with SMB_BIG_UINT, not SMB_OFF_T.
Needed to move to hiding POSIX locks at a lower layer.
nmbd/nmbd_processlogon.c: Use ALIGN2/ALIGN4 macros.
smbd/blocking.c: Replace do_lock, do_unlock, args with SMB_BIG_UINT, not SMB_OFF_T.
smbd/reply.c: Replace do_lock, do_unlock, args with SMB_BIG_UINT, not SMB_OFF_T.
Jeremy.
(This used to be commit 491eea8a20bf80d426625479326211dc975857a6)
Diffstat (limited to 'source3/include/proto.h')
| -rw-r--r-- | source3/include/proto.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 0fafa89e82..f6d387d19e 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -331,8 +331,6 @@ BOOL fcntl_lock(int fd, int op, SMB_OFF_T offset, SMB_OFF_T count, int type); BOOL is_myname(char *s); void set_remote_arch(enum remote_arch_types type); enum remote_arch_types get_remote_arch(void); -char *align2(char *q, char *base); -char *align4(char *q, char *base); void out_ascii(FILE *f, unsigned char *buf,int len); void out_data(FILE *f,char *buf1,int len, int per_line); void print_asc(int level, unsigned char *buf,int len); @@ -780,13 +778,13 @@ int brl_forall(BRLOCK_FN(fn)); void locking_close_file(files_struct *fsp); BOOL is_locked(files_struct *fsp,connection_struct *conn, - SMB_OFF_T count,SMB_OFF_T offset, + SMB_BIG_UINT count,SMB_BIG_UINT offset, enum brl_type lock_type); BOOL do_lock(files_struct *fsp,connection_struct *conn, - SMB_OFF_T count,SMB_OFF_T offset,enum brl_type lock_type, + SMB_BIG_UINT count,SMB_BIG_UINT offset,enum brl_type lock_type, int *eclass,uint32 *ecode); BOOL do_unlock(files_struct *fsp,connection_struct *conn, - SMB_OFF_T count,SMB_OFF_T offset, + SMB_BIG_UINT count,SMB_BIG_UINT offset, int *eclass,uint32 *ecode); BOOL locking_init(int read_only); BOOL locking_end(void); @@ -3196,8 +3194,8 @@ int rename_internals(connection_struct *conn, int reply_mv(connection_struct *conn, char *inbuf,char *outbuf, int dum_size, int dum_buffsize); int reply_copy(connection_struct *conn, char *inbuf,char *outbuf, int dum_size, int dum_buffsize); int reply_setdir(connection_struct *conn, char *inbuf,char *outbuf, int dum_size, int dum_buffsize); -SMB_OFF_T get_lock_count( char *data, int data_offset, BOOL large_file_format, BOOL *err); -SMB_OFF_T get_lock_offset( char *data, int data_offset, BOOL large_file_format, BOOL *err); +SMB_BIG_UINT get_lock_count( char *data, int data_offset, BOOL large_file_format); +SMB_BIG_UINT get_lock_offset( char *data, int data_offset, BOOL large_file_format, BOOL *err); int reply_lockingX(connection_struct *conn, char *inbuf,char *outbuf,int length,int bufsize); int reply_readbmpx(connection_struct *conn, char *inbuf,char *outbuf,int length,int bufsize); int reply_writebmpx(connection_struct *conn, char *inbuf,char *outbuf, int size, int dum_buffsize); |