svn commit: samba r20839 - in branches/SAMBA_3_0: . source/librpc/ndr source/rpcclient

[jelmer at samba.org]

Author: jelmer
Date: 2007-01-16 18:26:02 +0000 (Tue, 16 Jan 2007)
New Revision: 20839

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20839

Log:
Fix other C++ warnings
Modified:
   branches/SAMBA_3_0/
   branches/SAMBA_3_0/source/librpc/ndr/libndr.h
   branches/SAMBA_3_0/source/rpcclient/cmd_echo.c


Changeset:

Property changes on: branches/SAMBA_3_0
___________________________________________________________________
Name: bzr:merge
   - jelmer at samba.org-20060718161613-53e1c111cabecd57
jelmer at samba.org-20060729112811-c224341dc6387f22
jelmer at samba.org-20060824202535-0923b9ac63b0de61
jelmer at samba.org-20060824205058-95b956f158533304
jelmer at samba.org-20060824220658-230fbfb53bdad5e7
jelmer at samba.org-20060824220942-b7a63fab1a82825e
jelmer at samba.org-20060824232016-69881278506065b0
jelmer at samba.org-20060825031555-18b374fbcabd3b04
jelmer at samba.org-20060906183058-bd444ea54d961569
jelmer at samba.org-20070116153619-w9vubayci8fujmes
jelmer at samba.org-20070116174619-tx8yabv4p50jlqp2

   + jelmer at samba.org-20060718161613-53e1c111cabecd57
jelmer at samba.org-20060729112811-c224341dc6387f22
jelmer at samba.org-20060824202535-0923b9ac63b0de61
jelmer at samba.org-20060824205058-95b956f158533304
jelmer at samba.org-20060824220658-230fbfb53bdad5e7
jelmer at samba.org-20060824220942-b7a63fab1a82825e
jelmer at samba.org-20060824232016-69881278506065b0
jelmer at samba.org-20060825031555-18b374fbcabd3b04
jelmer at samba.org-20060906183058-bd444ea54d961569
jelmer at samba.org-20070116153619-w9vubayci8fujmes
jelmer at samba.org-20070116174619-tx8yabv4p50jlqp2
jelmer at samba.org-20070116182350-dq986bj4yj3m4s12


Modified: branches/SAMBA_3_0/source/librpc/ndr/libndr.h
===================================================================
--- branches/SAMBA_3_0/source/librpc/ndr/libndr.h	2007-01-16 18:05:37 UTC (rev 20838)
+++ branches/SAMBA_3_0/source/librpc/ndr/libndr.h	2007-01-16 18:26:02 UTC (rev 20839)
@@ -274,7 +274,7 @@
 
 
 #define NDR_PUSH_ALLOC_SIZE(ndr, s, size) do { \
-       (s) = talloc_size(ndr, size); \
+       (s) = talloc_array(ndr, uint8, size); \
        if (!(s)) return ndr_push_error(ndr, NDR_ERR_ALLOC, "push alloc %u failed: %s\n", (unsigned)size, __location__); \
 } while (0)
 

Modified: branches/SAMBA_3_0/source/rpcclient/cmd_echo.c
===================================================================
--- branches/SAMBA_3_0/source/rpcclient/cmd_echo.c	2007-01-16 18:05:37 UTC (rev 20838)
+++ branches/SAMBA_3_0/source/rpcclient/cmd_echo.c	2007-01-16 18:26:02 UTC (rev 20839)
@@ -101,7 +101,7 @@
 
 	size = atoi(argv[1]);
 
-	out_data = SMB_MALLOC(size);
+	out_data = SMB_MALLOC_ARRAY(uint8, size);
 	result = rpccli_echo_SourceData(cli, mem_ctx, size, out_data);
 
 	if (!NT_STATUS_IS_OK(result))