summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2008-11-01 17:22:15 +0100
committerVolker Lendecke <vl@samba.org>2008-11-01 19:41:07 +0100
commitab0561f3c39b2d10cc7d82940c9ec4bd7e4e16f8 (patch)
tree0503e0d76b2daa7c9a4a3b22c337cf09d55502e4 /source3
parent63da08d00fdec52a7384b8c3d6a6c6dee3ace7a7 (diff)
downloadsamba-ab0561f3c39b2d10cc7d82940c9ec4bd7e4e16f8.tar.gz
samba-ab0561f3c39b2d10cc7d82940c9ec4bd7e4e16f8.tar.bz2
samba-ab0561f3c39b2d10cc7d82940c9ec4bd7e4e16f8.zip
Apply some const to get_lock_*()
Diffstat (limited to 'source3')
-rw-r--r--source3/include/proto.h9
-rw-r--r--source3/smbd/blocking.c10
-rw-r--r--source3/smbd/reply.c9
3 files changed, 18 insertions, 10 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 2c2232ade8..c78c0a0fa7 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -8351,9 +8351,12 @@ NTSTATUS copy_file(TALLOC_CTX *ctx,
int count,
bool target_is_directory);
void reply_copy(struct smb_request *req);
-uint32 get_lock_pid( char *data, int data_offset, bool large_file_format);
-uint64_t get_lock_count( char *data, int data_offset, bool large_file_format);
-uint64_t get_lock_offset( char *data, int data_offset, bool large_file_format, bool *err);
+uint32 get_lock_pid(const uint8_t *data, int data_offset,
+ bool large_file_format);
+uint64_t get_lock_count(const uint8_t *data, int data_offset,
+ bool large_file_format);
+uint64_t get_lock_offset(const uint8_t *data, int data_offset,
+ bool large_file_format, bool *err);
void reply_lockingX(struct smb_request *req);
void reply_readbmpx(struct smb_request *req);
void reply_readbs(struct smb_request *req);
diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c
index 4374b50eac..14ce237ab8 100644
--- a/source3/smbd/blocking.c
+++ b/source3/smbd/blocking.c
@@ -335,10 +335,11 @@ static void reply_lockingX_error(blocking_lock_record *blr, NTSTATUS status)
uint32 lock_pid;
unsigned char locktype = CVAL(inbuf,smb_vwv3);
bool large_file_format = (locktype & LOCKING_ANDX_LARGE_FILES);
- char *data;
+ uint8_t *data;
int i;
- data = smb_buf(inbuf) + ((large_file_format ? 20 : 10)*num_ulocks);
+ data = (uint8_t *)smb_buf(inbuf)
+ + ((large_file_format ? 20 : 10)*num_ulocks);
/*
* Data now points at the beginning of the list
@@ -423,10 +424,11 @@ static bool process_lockingX(blocking_lock_record *blr)
uint64_t count = (uint64_t)0, offset = (uint64_t)0;
uint32 lock_pid;
bool large_file_format = (locktype & LOCKING_ANDX_LARGE_FILES);
- char *data;
+ uint8_t *data;
NTSTATUS status = NT_STATUS_OK;
- data = smb_buf(inbuf) + ((large_file_format ? 20 : 10)*num_ulocks);
+ data = (uint8_t *)smb_buf(inbuf)
+ + ((large_file_format ? 20 : 10)*num_ulocks);
/*
* Data now points at the beginning of the list
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 2d7e557980..c5abac77e2 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -6476,7 +6476,8 @@ void reply_copy(struct smb_request *req)
Get a lock pid, dealing with large count requests.
****************************************************************************/
-uint32 get_lock_pid( char *data, int data_offset, bool large_file_format)
+uint32 get_lock_pid(const uint8_t *data, int data_offset,
+ bool large_file_format)
{
if(!large_file_format)
return (uint32)SVAL(data,SMB_LPID_OFFSET(data_offset));
@@ -6488,7 +6489,8 @@ uint32 get_lock_pid( char *data, int data_offset, bool large_file_format)
Get a lock count, dealing with large count requests.
****************************************************************************/
-uint64_t get_lock_count( char *data, int data_offset, bool large_file_format)
+uint64_t get_lock_count(const uint8_t *data, int data_offset,
+ bool large_file_format)
{
uint64_t count = 0;
@@ -6560,7 +6562,8 @@ static uint32 map_lock_offset(uint32 high, uint32 low)
Get a lock offset, dealing with large offset requests.
****************************************************************************/
-uint64_t get_lock_offset( char *data, int data_offset, bool large_file_format, bool *err)
+uint64_t get_lock_offset(const uint8_t *data, int data_offset,
+ bool large_file_format, bool *err)
{
uint64_t offset = 0;