[Xen-devel] [PATCH 05 of 18] tools/blktap2: fix build errors caused by Werror in vhd_journal_write_entry

[Olaf Hering <olaf@xxxxxxxxx>]

# HG changeset patch
# User Olaf Hering <olaf@xxxxxxxxx>
# Date 1333046230 -7200
# Node ID 91286869cde3e05f3eff1b1a7f8bea9d11452792
# Parent  9abe0baa60fb8773707118856c300c1dd478aaf2
tools/blktap2: fix build errors caused by Werror in vhd_journal_write_entry

-O2 -Wall -Werror triggers these warnings:

libvhd-journal.c: In function 'vhd_journal_write_entry':
libvhd-journal.c:335: warning: statement with no effect

Really return the error from vhd_journal_write() to caller.

Signed-off-by: Olaf Hering <olaf@xxxxxxxxx>

diff -r 9abe0baa60fb -r 91286869cde3 tools/blktap2/vhd/lib/libvhd-journal.c
--- a/tools/blktap2/vhd/lib/libvhd-journal.c
+++ b/tools/blktap2/vhd/lib/libvhd-journal.c
@@ -330,11 +330,7 @@ vhd_journal_write_entry(vhd_journal_t *j
        memcpy(&e, entry, sizeof(vhd_journal_entry_t));
        vhd_journal_entry_out(&e);
 
-       err = vhd_journal_write(j, &e, sizeof(vhd_journal_entry_t));
-       if (err)
-               err;
-
-       return 0;
+       return vhd_journal_write(j, &e, sizeof(vhd_journal_entry_t));
 }
 
 static int

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel