[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1629-gf1d7de4

Volker Lendecke vl at samba.org
Thu Jan 24 08:38:09 GMT 2008


The branch, v3-2-test has been updated
       via  f1d7de462cf0f64648a3a1fc6f0c64a7bbdb3c2a (commit)
      from  4c08725a42a8babf0f078fb4b221a96f58deeb50 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit f1d7de462cf0f64648a3a1fc6f0c64a7bbdb3c2a
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Jan 23 17:37:59 2008 +0100

    More read_data -> read_socket_with_timeout

-----------------------------------------------------------------------

Summary of changes:
 source/lib/util_sock.c |   19 +++----------------
 1 files changed, 3 insertions(+), 16 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/util_sock.c b/source/lib/util_sock.c
index fb8f415..1a7cc02 100644
--- a/source/lib/util_sock.c
+++ b/source/lib/util_sock.c
@@ -1126,12 +1126,7 @@ ssize_t read_smb_length_return_keepalive(int fd,
 	bool ok = false;
 
 	while (!ok) {
-		if (timeout > 0) {
-			ok = (read_socket_with_timeout(fd,inbuf,4,4,
-						timeout,pre) == 4);
-		} else {
-			ok = (read_data(fd,inbuf,4,pre) == 4);
-		}
+		ok = (read_socket_with_timeout(fd,inbuf,4,4,timeout,pre) == 4);
 		if (!ok) {
 			return -1;
 		}
@@ -1237,16 +1232,8 @@ ssize_t receive_smb_raw(int fd,
 			len = MIN(len,maxlen);
 		}
 
-		if (timeout > 0) {
-			ret = read_socket_with_timeout(fd,
-					buffer+4,
-					len,
-					len,
-					timeout,
-					pre);
-		} else {
-			ret = read_data(fd,buffer+4,len,pre);
-		}
+		ret = read_socket_with_timeout(fd, buffer+4, len, len, timeout,
+					       pre);
 
 		if (ret != len) {
 			cond_set_smb_read_error(pre,SMB_READ_ERROR);


-- 
Samba Shared Repository


More information about the samba-cvs mailing list