Patchwork eliminate errors about unused results in block/vpc.c

login
register
mail settings
Submitter Nathan Froyd
Date Aug. 11, 2009, 7:47 p.m.
Message ID <1250020079-30940-1-git-send-email-froydnj@codesourcery.com>
Download mbox | patch
Permalink /patch/31162/
State Superseded
Headers show

Comments

Nathan Froyd - Aug. 11, 2009, 7:47 p.m.
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 <froydnj@codesourcery.com>
---
 block/vpc.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

v2: use memcpy instead of strncpy and casts to void*

Patch

diff --git a/block/vpc.c b/block/vpc.c
index ba482e9..6be24bf 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);