From fe0ce8dd8e18de6110404661f26db7a66ebac5ad Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 18 May 2005 18:02:15 +0000 Subject: r6890: Refactor printing interface to take offset into job. Fixes bug where large print jobs can have out-of-order offsets. Bug found by Arcady Chernyak Jeremy. (This used to be commit 482f7e0e3706098b71aa0b31a134994acb1e9fcf) --- source3/lib/util_sock.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'source3/lib/util_sock.c') diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c index 4222c3c5ef..72837d73d9 100644 --- a/source3/lib/util_sock.c +++ b/source3/lib/util_sock.c @@ -403,7 +403,7 @@ static ssize_t read_socket_data(int fd,char *buffer,size_t N) Write data to a fd. ****************************************************************************/ -ssize_t write_data(int fd,char *buffer,size_t N) +ssize_t write_data(int fd, const char *buffer, size_t N) { size_t total=0; ssize_t ret; @@ -427,7 +427,7 @@ ssize_t write_data(int fd,char *buffer,size_t N) Write data to a socket - use send rather than write. ****************************************************************************/ -static ssize_t write_socket_data(int fd,char *buffer,size_t N) +static ssize_t write_socket_data(int fd, const char *buffer, size_t N) { size_t total=0; ssize_t ret; @@ -451,7 +451,7 @@ static ssize_t write_socket_data(int fd,char *buffer,size_t N) Write to a socket. ****************************************************************************/ -ssize_t write_socket(int fd,char *buf,size_t len) +ssize_t write_socket(int fd, const char *buf, size_t len) { ssize_t ret=0; @@ -489,7 +489,7 @@ BOOL send_keepalive(int client) Timeout is in milliseconds. ****************************************************************************/ -static ssize_t read_smb_length_return_keepalive(int fd,char *inbuf,unsigned int timeout) +static ssize_t read_smb_length_return_keepalive(int fd, char *inbuf, unsigned int timeout) { ssize_t len=0; int msg_type; @@ -523,7 +523,7 @@ static ssize_t read_smb_length_return_keepalive(int fd,char *inbuf,unsigned int Timeout is in milliseconds. ****************************************************************************/ -ssize_t read_smb_length(int fd,char *inbuf,unsigned int timeout) +ssize_t read_smb_length(int fd, char *inbuf, unsigned int timeout) { ssize_t len; @@ -552,7 +552,7 @@ ssize_t read_smb_length(int fd,char *inbuf,unsigned int timeout) Doesn't check the MAC on signed packets. ****************************************************************************/ -BOOL receive_smb_raw(int fd,char *buffer, unsigned int timeout) +BOOL receive_smb_raw(int fd, char *buffer, unsigned int timeout) { ssize_t len,ret; @@ -617,7 +617,7 @@ BOOL receive_smb_raw(int fd,char *buffer, unsigned int timeout) Checks the MAC on signed packets. ****************************************************************************/ -BOOL receive_smb(int fd,char *buffer, unsigned int timeout) +BOOL receive_smb(int fd, char *buffer, unsigned int timeout) { if (!receive_smb_raw(fd, buffer, timeout)) { return False; @@ -638,7 +638,7 @@ BOOL receive_smb(int fd,char *buffer, unsigned int timeout) Send an smb to a fd. ****************************************************************************/ -BOOL send_smb(int fd,char *buffer) +BOOL send_smb(int fd, char *buffer) { size_t len; size_t nwritten=0; -- cgit