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 - [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] + [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED] 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))
