@@ -641,7 +641,6 @@ main(
GIOChannel *channel_stdin;
char *qemu_host;
char *qemu_port;
- VSCMsgHeader mhHeader;
VCardEmulOptions *command_line_options = NULL;
@@ -750,7 +749,7 @@ main(
.magic = VSCARD_MAGIC,
.capabilities = {0}
};
- send_msg(VSC_Init, mhHeader.reader_id, &init, sizeof(init));
+ send_msg(VSC_Init, 0, &init, sizeof(init));
g_main_loop_run(loop);
g_main_loop_unref(loop);
@@ -181,13 +181,11 @@ ssize_t iov_send_recv(int sockfd, struct iovec *iov, unsigned iov_cnt,
assert(iov[niov].iov_len > tail);
orig_len = iov[niov].iov_len;
iov[niov++].iov_len = tail;
- }
-
- ret = do_send_recv(sockfd, iov, niov, do_send);
-
- /* Undo the changes above before checking for errors */
- if (tail) {
+ ret = do_send_recv(sockfd, iov, niov, do_send);
+ /* Undo the changes above before checking for errors */
iov[niov-1].iov_len = orig_len;
+ } else {
+ ret = do_send_recv(sockfd, iov, niov, do_send);
}
if (offset) {
iov[0].iov_base -= offset;
This patch simply remove "variable may be used uninitialized" warning. Signed-off-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com> --- V2: Address Stefan and Peter's comments, use 0 in send_msg() instead of initialize mhHeader. V3: Address Markus's comments, adjust the code section in iov.c. libcacard/vscclient.c | 3 +-- util/iov.c | 10 ++++------ 2 files changed, 5 insertions(+), 8 deletions(-)