[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  015511d s3: Make send_nt_replies() static
      from  94a97bf talloc: fix compiler warnings with -Wc++-compat

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


- Log -----------------------------------------------------------------
commit 015511d12a8cc1982249254b8893f83171ec2edf
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Apr 13 15:40:15 2011 +0200

    s3: Make send_nt_replies() static
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Wed Apr 13 16:25:29 CEST 2011 on sn-devel-104

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

Summary of changes:
 source3/smbd/nttrans.c |    8 ++++----
 source3/smbd/proto.h   |    4 ----
 2 files changed, 4 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index 2b54018..2dd5715 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -52,10 +52,10 @@ static char *nttrans_realloc(char **ptr, size_t size)
  HACK ! Always assumes smb_setup field is zero.
 ****************************************************************************/
 
-void send_nt_replies(connection_struct *conn,
-			struct smb_request *req, NTSTATUS nt_error,
-		     char *params, int paramsize,
-		     char *pdata, int datasize)
+static void send_nt_replies(connection_struct *conn,
+			    struct smb_request *req, NTSTATUS nt_error,
+			    char *params, int paramsize,
+			    char *pdata, int datasize)
 {
 	int data_to_send = datasize;
 	int params_to_send = paramsize;
diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index a0c94b4..c097202 100644
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -504,10 +504,6 @@ void *init_quota_handle(TALLOC_CTX *mem_ctx);
 
 /* The following definitions come from smbd/nttrans.c  */
 
-void send_nt_replies(connection_struct *conn,
-			struct smb_request *req, NTSTATUS nt_error,
-		     char *params, int paramsize,
-		     char *pdata, int datasize);
 void reply_ntcreate_and_X(struct smb_request *req);
 NTSTATUS set_sd(files_struct *fsp, uint8_t *data, uint32_t sd_len,
                        uint32_t security_info_sent);


-- 
Samba Shared Repository