summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKirill A. Shutemov <kirill@shutemov.name>2010-01-20 00:56:14 +0100
committerAurelien Jarno <aurelien@aurel32.net>2010-06-30 23:40:48 +0200
commited3aac289ab2acfb04ec6a46a20ce1c228eee31c (patch)
tree5287b70c14b45c3eceba8a64fa82792b0f8cf5df
parentaudio/alsa: Spelling typo (paramters) (diff)
downloadqemu-kvm-ed3aac289ab2acfb04ec6a46a20ce1c228eee31c.tar.gz
qemu-kvm-ed3aac289ab2acfb04ec6a46a20ce1c228eee31c.tar.bz2
qemu-kvm-ed3aac289ab2acfb04ec6a46a20ce1c228eee31c.zip
block/vvfat.c: fix warnings with _FORTIFY_SOURCE
CC block/vvfat.o cc1: warnings being treated as errors block/vvfat.c: In function 'commit_one_file': block/vvfat.c:2259: error: ignoring return value of 'ftruncate', declared with attribute warn_unused_result make: *** [block/vvfat.o] Error 1 CC block/vvfat.o In file included from /usr/include/stdio.h:912, from ./qemu-common.h:19, from block/vvfat.c:27: In function 'snprintf', inlined from 'init_directories' at block/vvfat.c:871, inlined from 'vvfat_open' at block/vvfat.c:1068: /usr/include/bits/stdio2.h:65: error: call to __builtin___snprintf_chk will always overflow destination buffer make: *** [block/vvfat.o] Error 1 Signed-off-by: Kirill A. Shutemov <kirill@shutemov.name> Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> (cherry picked from commit 2dedf83ef0cc3463783d6b71bf1b25476f691f3a)
-rw-r--r--block/vvfat.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/block/vvfat.c b/block/vvfat.c
index c1acb3586..592d6e6b6 100644
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -868,7 +868,8 @@ static int init_directories(BDRVVVFATState* s,
{
direntry_t* entry=array_get_next(&(s->directory));
entry->attributes=0x28; /* archive | volume label */
- snprintf((char*)entry->name,11,"QEMU VVFAT");
+ memcpy(entry->name,"QEMU VVF",8);
+ memcpy(entry->extension,"AT ",3);
}
/* Now build FAT, and write back information into directory */
@@ -2256,7 +2257,11 @@ static int commit_one_file(BDRVVVFATState* s,
c = c1;
}
- ftruncate(fd, size);
+ if (ftruncate(fd, size)) {
+ perror("ftruncate()");
+ close(fd);
+ return -4;
+ }
close(fd);
return commit_mappings(s, first_cluster, dir_index);