sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-23 20:59:10 +03:00
Code Activity

Convert read_data() to NTSTATUS

Browse Source 
(This used to be commit af40b71023)
This commit is contained in:
Volker Lendecke
2008-01-26 10:39:21 +01:00
parent 21e7344d2f
commit b42a5d68a3
4 changed files with 30 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
source3/lib/util_sock.c
View File

@ -1046,30 +1046,9 @@ NTSTATUS read_socket_with_timeout(int fd, char *buf,
Read data from the client, reading exactly N bytes.
****************************************************************************/
ssize_t read_data(int fd,char *buffer,size_t N, enum smb_read_errors *pre)
NTSTATUS read_data(int fd, char *buffer, size_t N)
{
NTSTATUS status;
set_smb_read_error(pre, SMB_READ_OK);
status = read_socket_with_timeout(fd, buffer, N, N, 0, NULL);
if (NT_STATUS_IS_OK(status)) {
return N;
}
if (NT_STATUS_EQUAL(status, NT_STATUS_END_OF_FILE)) {
set_smb_read_error(pre, SMB_READ_EOF);
return -1;
}
if (NT_STATUS_EQUAL(status, NT_STATUS_IO_TIMEOUT)) {
set_smb_read_error(pre, SMB_READ_TIMEOUT);
return -1;
}
set_smb_read_error(pre, SMB_READ_ERROR);
return -1;
return read_socket_with_timeout(fd, buffer, N, N, 0, NULL);
}
/****************************************************************************