[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-601-g6a6eb90

Tim Prouty tprouty at samba.org
Sat Feb 7 08:48:02 GMT 2009


The branch, master has been updated
       via  6a6eb90803dc47140fda1984e148a98f4bb898da (commit)
       via  7168cf440ecacb3c49c1026320347632b629668d (commit)
      from  04c971dc6c5b1f4a621b1a28bdfbb396bc6d1a9e (commit)

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


- Log -----------------------------------------------------------------
commit 6a6eb90803dc47140fda1984e148a98f4bb898da
Author: Tim Prouty <tprouty at samba.org>
Date:   Sat Feb 7 00:45:19 2009 -0800

    librpc: Re-run make idl_full from source3

commit 7168cf440ecacb3c49c1026320347632b629668d
Author: Tim Prouty <tprouty at samba.org>
Date:   Sat Feb 7 00:43:16 2009 -0800

    pidl: Fix a const build warning in the samba3 merged build
    
    ../librpc/gen_ndr/cli_spoolss.c: In function `rpccli_spoolss_EnumPrinterData':
    ../librpc/gen_ndr/cli_spoolss.c:3400: warning: passing arg 1 of `memcpy' discards qualifiers from pointer target type
    
    This is a very similar fix to:
    2337f402f0f2fd6c1fa077b1b35347905a38c715

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

Summary of changes:
 librpc/gen_ndr/cli_spoolss.c            |    2 +-
 pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm |    6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/gen_ndr/cli_spoolss.c b/librpc/gen_ndr/cli_spoolss.c
index d8dc5a9..0255d00 100644
--- a/librpc/gen_ndr/cli_spoolss.c
+++ b/librpc/gen_ndr/cli_spoolss.c
@@ -3397,7 +3397,7 @@ NTSTATUS rpccli_spoolss_EnumPrinterData(struct rpc_pipe_client *cli,
 	}
 
 	/* Return variables */
-	memcpy(value_name, r.out.value_name, r.in.value_offered / 2 * sizeof(*value_name));
+	memcpy(CONST_DISCARD(char *, value_name), r.out.value_name, r.in.value_offered / 2 * sizeof(*value_name));
 	*value_needed = *r.out.value_needed;
 	*printerdata_type = *r.out.printerdata_type;
 	*buffer = *r.out.buffer;
diff --git a/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm b/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm
index 1a0eb51..ed1b71a 100644
--- a/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm
+++ b/pidl/lib/Parse/Pidl/Samba3/ClientNDR.pm
@@ -97,7 +97,11 @@ sub ParseOutputArgument($$$)
 		# to allocate a structure of the right size.
 		my $env = GenerateFunctionInEnv($fn, "r.");
 		my $size_is = ParseExpr($e->{LEVELS}[$level]->{SIZE_IS}, $env, $e->{ORIGINAL});
-		$self->pidl("memcpy($e->{NAME}, r.out.$e->{NAME}, $size_is * sizeof(*$e->{NAME}));");
+		if (has_property($e, "charset")) {
+		    $self->pidl("memcpy(CONST_DISCARD(char *, $e->{NAME}), r.out.$e->{NAME}, $size_is * sizeof(*$e->{NAME}));");
+		} else {
+		    $self->pidl("memcpy($e->{NAME}, r.out.$e->{NAME}, $size_is * sizeof(*$e->{NAME}));");
+		}
 	} else {
 		$self->pidl("*$e->{NAME} = *r.out.$e->{NAME};");
 	}


-- 
Samba Shared Repository


More information about the samba-cvs mailing list