diff options
| author | Volker Lendecke <vl@samba.org> | 2009-01-30 23:44:21 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2009-01-31 11:09:39 +0100 |
| commit | d94e9c802ceddeff93168337b6fc5533db7f2d33 (patch) | |
| tree | f38232bdd6402b386b2248793d99cc02eceb68e6 /source3/include | |
| parent | b99859b948f31dbe474b6ce0c6cab601e7e7bc56 (diff) | |
| download | samba-d94e9c802ceddeff93168337b6fc5533db7f2d33.tar.gz samba-d94e9c802ceddeff93168337b6fc5533db7f2d33.tar.bz2 samba-d94e9c802ceddeff93168337b6fc5533db7f2d33.zip | |
Remove the global variable "chain_size"
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/proto.h | 2 | ||||
| -rw-r--r-- | source3/include/smb.h | 5 | ||||
| -rw-r--r-- | source3/include/smb_macros.h | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index c10db31d2a..d58dcef0b4 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -7201,6 +7201,7 @@ void remove_from_common_flags2(uint32 v); void construct_reply_common_req(struct smb_request *req, char *outbuf); size_t req_wct_ofs(struct smb_request *req); void chain_reply(struct smb_request *req); +bool req_is_in_chain(struct smb_request *req); void check_reload(time_t t); void smbd_process(void); @@ -7275,6 +7276,7 @@ NTSTATUS unlink_internals(connection_struct *conn, struct smb_request *req, uint32 dirtype, const char *name_in, bool has_wild); void reply_unlink(struct smb_request *req); void send_file_readbraw(connection_struct *conn, + struct smb_request *req, files_struct *fsp, SMB_OFF_T startpos, size_t nread, diff --git a/source3/include/smb.h b/source3/include/smb.h index 9451710255..be6ccbf597 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -1550,11 +1550,6 @@ enum acl_compatibility {ACL_COMPAT_AUTO, ACL_COMPAT_WINNT, ACL_COMPAT_WIN2K}; #define COPYBUF_SIZE (8*1024) /* - * Used in chaining code. - */ -extern int chain_size; - -/* * Map the Core and Extended Oplock requesst bits down * to common bits (EXCLUSIVE_OPLOCK & BATCH_OPLOCK). */ diff --git a/source3/include/smb_macros.h b/source3/include/smb_macros.h index 92c60a7530..fd1bba16a7 100644 --- a/source3/include/smb_macros.h +++ b/source3/include/smb_macros.h @@ -135,7 +135,7 @@ /* Note that chain_size must be available as an extern int to this macro. */ -#define smb_offset(p,buf) (PTR_DIFF(p,buf+4) + chain_size) +#define smb_offset(p,buf) (PTR_DIFF(p,buf+4)) #define smb_len(buf) (PVAL(buf,3)|(PVAL(buf,2)<<8)|((PVAL(buf,1)&1)<<16)) #define _smb_setlen(buf,len) do { buf[0] = 0; buf[1] = ((len)&0x10000)>>16; \ |