summaryrefslogtreecommitdiff
path: root/source/lib/util_sock.c
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2008-01-25 23:43:50 +0100
committerVolker Lendecke <vl@samba.org>2008-02-02 11:03:22 +0100
commit90554799afa42855c3e7b87dc632e67f0952f988 (patch)
tree05d8e9d43ad0a87d96d30c691fb66d9df4d9de65 /source/lib/util_sock.c
parentf9c8ac83ff42137d2101d3bb17e5dcc3c3d70a8f (diff)
downloadsamba-90554799afa42855c3e7b87dc632e67f0952f988.tar.gz
read_socket_with_timeout_ntstatus->read_socket_with_timeout
Diffstat (limited to 'source/lib/util_sock.c')
-rw-r--r--source/lib/util_sock.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/source/lib/util_sock.c b/source/lib/util_sock.c
index d0d321ee39f..fcea5d8be66 100644
--- a/source/lib/util_sock.c
+++ b/source/lib/util_sock.c
@@ -913,10 +913,10 @@ ssize_t read_udp_v4_socket(int fd,
time_out = timeout in milliseconds
****************************************************************************/
-NTSTATUS read_socket_with_timeout_ntstatus(int fd, char *buf,
- size_t mincnt, size_t maxcnt,
- unsigned int time_out,
- size_t *size_ret)
+NTSTATUS read_socket_with_timeout(int fd, char *buf,
+ size_t mincnt, size_t maxcnt,
+ unsigned int time_out,
+ size_t *size_ret)
{
fd_set fds;
int selrtn;
@@ -1052,7 +1052,7 @@ ssize_t read_data(int fd,char *buffer,size_t N, enum smb_read_errors *pre)
set_smb_read_error(pre, SMB_READ_OK);
- status = read_socket_with_timeout_ntstatus(fd, buffer, N, N, 0, NULL);
+ status = read_socket_with_timeout(fd, buffer, N, N, 0, NULL);
if (NT_STATUS_IS_OK(status)) {
return N;
@@ -1138,8 +1138,7 @@ NTSTATUS read_smb_length_return_keepalive(int fd, char *inbuf,
int msg_type;
NTSTATUS status;
- status = read_socket_with_timeout_ntstatus(fd, inbuf, 4, 4, timeout,
- NULL);
+ status = read_socket_with_timeout(fd, inbuf, 4, 4, timeout, NULL);
if (!NT_STATUS_IS_OK(status)) {
return status;
@@ -1255,7 +1254,7 @@ ssize_t receive_smb_raw(int fd,
set_smb_read_error(pre, SMB_READ_OK);
- status = read_socket_with_timeout_ntstatus(
+ status = read_socket_with_timeout(
fd, buffer+4, len, len, timeout, &len);
if (!NT_STATUS_IS_OK(status)) {