Author: vlendec Date: 2007-08-29 13:56:52 +0000 (Wed, 29 Aug 2007) New Revision: 24782
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24782 Log: Fix C++ warnings Modified: branches/SAMBA_3_2/source/libsmb/dsgetdcname.c branches/SAMBA_3_2_0/source/libsmb/dsgetdcname.c Changeset: Modified: branches/SAMBA_3_2/source/libsmb/dsgetdcname.c =================================================================== --- branches/SAMBA_3_2/source/libsmb/dsgetdcname.c 2007-08-29 13:52:07 UTC (rev 24781) +++ branches/SAMBA_3_2/source/libsmb/dsgetdcname.c 2007-08-29 13:56:52 UTC (rev 24782) @@ -235,7 +235,8 @@ memcpy(&guid_flat.info, guid_buf, guid_len); smb_uuid_unpack(guid_flat, &guid); - info->domain_guid = talloc_memdup(mem_ctx, &guid, sizeof(guid)); + info->domain_guid = (struct GUID *)talloc_memdup( + mem_ctx, &guid, sizeof(guid)); if (!info->domain_guid) { goto failed; } @@ -694,8 +695,8 @@ info->domain_controller_address_type = domain_controller_address_type; if (domain_guid) { - info->domain_guid = talloc_memdup(mem_ctx, domain_guid, - sizeof(*domain_guid)); + info->domain_guid = (struct GUID *)talloc_memdup( + mem_ctx, domain_guid, sizeof(*domain_guid)); NT_STATUS_HAVE_NO_MEMORY(info->domain_guid); } Modified: branches/SAMBA_3_2_0/source/libsmb/dsgetdcname.c =================================================================== --- branches/SAMBA_3_2_0/source/libsmb/dsgetdcname.c 2007-08-29 13:52:07 UTC (rev 24781) +++ branches/SAMBA_3_2_0/source/libsmb/dsgetdcname.c 2007-08-29 13:56:52 UTC (rev 24782) @@ -235,7 +235,8 @@ memcpy(&guid_flat.info, guid_buf, guid_len); smb_uuid_unpack(guid_flat, &guid); - info->domain_guid = talloc_memdup(mem_ctx, &guid, sizeof(guid)); + info->domain_guid = (struct GUID *)talloc_memdup( + mem_ctx, &guid, sizeof(guid)); if (!info->domain_guid) { goto failed; } @@ -694,8 +695,8 @@ info->domain_controller_address_type = domain_controller_address_type; if (domain_guid) { - info->domain_guid = talloc_memdup(mem_ctx, domain_guid, - sizeof(*domain_guid)); + info->domain_guid = (struct GUID *)talloc_memdup( + mem_ctx, domain_guid, sizeof(*domain_guid)); NT_STATUS_HAVE_NO_MEMORY(info->domain_guid); }
