From 5ec4d682d27afad912a3f7866fa0d87d37912aa3 Mon Sep 17 00:00:00 2001 From: Nathan Froyd Date: Tue, 11 Aug 2009 12:47:59 -0700 Subject: eliminate errors about unused results in block/vpc.c These errors come up when compiling with gcc-4.3.3 and some older headers: /scratch/froydnj/qemu.git/block/vpc.c: In function 'vpc_create': /scratch/froydnj/qemu.git/block/vpc.c:514: error: value computed is not used /scratch/froydnj/qemu.git/block/vpc.c:516: error: value computed is not used /scratch/froydnj/qemu.git/block/vpc.c:517: error: value computed is not used /scratch/froydnj/qemu.git/block/vpc.c:566: error: value computed is not used Use memcpy to copy the strings instead of strncpy. Signed-off-by: Nathan Froyd Signed-off-by: Anthony Liguori --- block/vpc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'block/vpc.c') diff --git a/block/vpc.c b/block/vpc.c index ba482e9afb..6be24bf84e 100644 --- a/block/vpc.c +++ b/block/vpc.c @@ -511,10 +511,10 @@ static int vpc_create(const char *filename, QEMUOptionParameter *options) // Prepare the Hard Disk Footer memset(buf, 0, 1024); - strncpy(footer->creator, "conectix", 8); + memcpy(footer->creator, "conectix", 8); // TODO Check if "qemu" creator_app is ok for VPC - strncpy(footer->creator_app, "qemu", 4); - strncpy(footer->creator_os, "Wi2k", 4); + memcpy(footer->creator_app, "qemu", 4); + memcpy(footer->creator_os, "Wi2k", 4); footer->features = be32_to_cpu(0x02); footer->version = be32_to_cpu(0x00010000); @@ -563,7 +563,7 @@ static int vpc_create(const char *filename, QEMUOptionParameter *options) // Prepare the Dynamic Disk Header memset(buf, 0, 1024); - strncpy(dyndisk_header->magic, "cxsparse", 8); + memcpy(dyndisk_header->magic, "cxsparse", 8); dyndisk_header->data_offset = be64_to_cpu(0xFFFFFFFF); dyndisk_header->table_offset = be64_to_cpu(3 * 512); -- cgit v1.2.1