[SCM] Samba Shared Repository - branch master updated

Volker Lendecke vlendec at samba.org
Sun Aug 15 07:16:28 MDT 2010


The branch, master has been updated
       via  08b628e... s3: Remove some unused code
      from  3d447e0... s3-test: Try to fix the build farm subunit parsing.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 08b628efe40bd93993ed4b662d924436444bb242
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Aug 15 14:56:19 2010 +0200

    s3: Remove some unused code

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

Summary of changes:
 source3/include/proto.h    |    1 -
 source3/libsmb/clientgen.c |   31 -------------------------------
 2 files changed, 0 insertions(+), 32 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 0a417ab..c6061fc 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1878,7 +1878,6 @@ bool cli_state_seqnum_persistent(struct cli_state *cli,
 bool cli_state_seqnum_remove(struct cli_state *cli,
 			     uint16_t mid);
 bool cli_receive_smb(struct cli_state *cli);
-ssize_t cli_receive_smb_data(struct cli_state *cli, char *buffer, size_t len);
 bool cli_receive_smb_readX_header(struct cli_state *cli);
 bool cli_send_smb(struct cli_state *cli);
 bool cli_send_smb_direct_writeX(struct cli_state *cli,
diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c
index c530c14..608288d 100644
--- a/source3/libsmb/clientgen.c
+++ b/source3/libsmb/clientgen.c
@@ -285,37 +285,6 @@ bool cli_receive_smb(struct cli_state *cli)
 	return true;
 }
 
-/****************************************************************************
- Read the data portion of a readX smb.
- The timeout is in milliseconds
-****************************************************************************/
-
-ssize_t cli_receive_smb_data(struct cli_state *cli, char *buffer, size_t len)
-{
-	NTSTATUS status;
-
-	set_smb_read_error(&cli->smb_rw_error, SMB_READ_OK);
-
-	status = read_fd_with_timeout(
-		cli->fd, buffer, len, len, cli->timeout, NULL);
-	if (NT_STATUS_IS_OK(status)) {
-		return len;
-	}
-
-	if (NT_STATUS_EQUAL(status, NT_STATUS_END_OF_FILE)) {
-		set_smb_read_error(&cli->smb_rw_error, SMB_READ_EOF);
-		return -1;
-	}
-
-	if (NT_STATUS_EQUAL(status, NT_STATUS_IO_TIMEOUT)) {
-		set_smb_read_error(&cli->smb_rw_error, SMB_READ_TIMEOUT);
-		return -1;
-	}
-
-	set_smb_read_error(&cli->smb_rw_error, SMB_READ_ERROR);
-	return -1;
-}
-
 static ssize_t write_socket(int fd, const char *buf, size_t len)
 {
         ssize_t ret=0;


-- 
Samba Shared Repository


More information about the samba-cvs mailing list