From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Thomas Subject: [PATCH] [HVMLOADER] fixup compiler warnings and constant usage Date: Mon, 12 Mar 2007 16:02:27 -0400 Message-ID: <45F5B1D3.9040303@virtualiron.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------010200020408080908000804" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org This is a multi-part message in MIME format. --------------010200020408080908000804 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit This patch fixes up some compiler warnings from the hvmloader build. And, while I was there, I removed the hard constants from the strncpy functions. Signed-off-by: Ben Thomas (bthomas@virtualiron.com) -- ------------------------------------------------------------------------ Ben Thomas Virtual Iron Software bthomas@virtualiron.com Tower 1, Floor 2 978-849-1214 900 Chelmsford Street Lowell, MA 01851 --------------010200020408080908000804 Content-Type: text/x-patch; name="tools-hvmloader_acpi_build_warnings.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="tools-hvmloader_acpi_build_warnings.patch" diff -r 0444f009ccbb tools/firmware/hvmloader/acpi/build.c --- a/tools/firmware/hvmloader/acpi/build.c Mon Mar 12 15:48:11 2007 -0400 +++ b/tools/firmware/hvmloader/acpi/build.c Mon Mar 12 15:53:28 2007 -0400 @@ -57,8 +57,8 @@ int construct_madt(struct acpi_20_madt * memset(madt, 0, sizeof(*madt)); madt->header.signature = ACPI_2_0_MADT_SIGNATURE; madt->header.revision = ACPI_2_0_MADT_REVISION; - strncpy(madt->header.oem_id, ACPI_OEM_ID, 6); - strncpy(madt->header.oem_table_id, ACPI_OEM_TABLE_ID, 8); + strncpy((char *)madt->header.oem_id, ACPI_OEM_ID, sizeof(madt->header.oem_id)); + strncpy((char *)madt->header.oem_table_id, ACPI_OEM_TABLE_ID, sizeof(madt->header.oem_table_id)); madt->header.oem_revision = ACPI_OEM_REVISION; madt->header.creator_id = ACPI_CREATOR_ID; madt->header.creator_revision = ACPI_CREATOR_REVISION; @@ -131,8 +131,8 @@ int construct_hpet(struct acpi_20_hpet * memset(hpet, 0, sizeof(*hpet)); hpet->header.signature = ACPI_2_0_HPET_SIGNATURE; hpet->header.revision = ACPI_2_0_HPET_REVISION; - strncpy(hpet->header.oem_id, ACPI_OEM_ID, 6); - strncpy(hpet->header.oem_table_id, ACPI_OEM_TABLE_ID, 8); + strncpy((char *)hpet->header.oem_id, ACPI_OEM_ID, sizeof(hpet->header.oem_id)); + strncpy((char *)hpet->header.oem_table_id, ACPI_OEM_TABLE_ID, sizeof(hpet->header.oem_table_id)); hpet->header.oem_revision = ACPI_OEM_REVISION; hpet->header.creator_id = ACPI_CREATOR_ID; hpet->header.creator_revision = ACPI_CREATOR_REVISION; @@ -161,8 +161,8 @@ int construct_processor_objects(uint8_t hdr = (struct acpi_header *)p; hdr->signature = ASCII32('S','S','D','T'); hdr->revision = 2; - strncpy(hdr->oem_id, ACPI_OEM_ID, 6); - strncpy(hdr->oem_table_id, ACPI_OEM_TABLE_ID, 8); + strncpy((char *)hdr->oem_id, ACPI_OEM_ID, sizeof(hdr->oem_id)); + strncpy((char *)hdr->oem_table_id, ACPI_OEM_TABLE_ID, sizeof(hdr->oem_table_id)); hdr->oem_revision = ACPI_OEM_REVISION; hdr->creator_id = ACPI_CREATOR_ID; hdr->creator_revision = ACPI_CREATOR_REVISION; @@ -195,7 +195,7 @@ int construct_processor_objects(uint8_t } /* NameString */ - strncpy(p, "\\_PR_", 5); + strncpy((char *)p, "\\_PR_", strlen("\\_PR_")); p += 5; /* @@ -263,8 +263,8 @@ int construct_secondary_tables(uint8_t * tcpa->header.signature = ACPI_2_0_TCPA_SIGNATURE; tcpa->header.length = sizeof(*tcpa); tcpa->header.revision = ACPI_2_0_TCPA_REVISION; - strncpy(tcpa->header.oem_id, ACPI_OEM_ID, 6); - strncpy(tcpa->header.oem_table_id, ACPI_OEM_TABLE_ID, 8); + strncpy((char *)tcpa->header.oem_id, ACPI_OEM_ID, sizeof(tcpa->header.oem_id)); + strncpy((char *)tcpa->header.oem_table_id, ACPI_OEM_TABLE_ID, sizeof(tcpa->header.oem_table_id)); tcpa->header.oem_revision = ACPI_OEM_REVISION; tcpa->header.creator_id = ACPI_CREATOR_ID; tcpa->header.creator_revision = ACPI_CREATOR_REVISION; --------------010200020408080908000804 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --------------010200020408080908000804--