diff options
author | Eduardo Habkost <ehabkost@redhat.com> | 2016-06-13 18:57:58 -0300 |
---|---|---|
committer | Markus Armbruster <armbru@redhat.com> | 2016-06-20 16:38:13 +0200 |
commit | 9be385980d37e8f4fd33f605f5fb1c3d144170a8 (patch) | |
tree | d4516d2305c01fabda776667acdb48c48cb105af /qga | |
parent | 6b62d961373e0327f2af8fb77d6d5d6308864180 (diff) | |
download | qemu-9be385980d37e8f4fd33f605f5fb1c3d144170a8.zip qemu-9be385980d37e8f4fd33f605f5fb1c3d144170a8.tar.gz qemu-9be385980d37e8f4fd33f605f5fb1c3d144170a8.tar.bz2 |
coccinelle: Remove unnecessary variables for function return value
Use Coccinelle script to replace 'ret = E; return ret' with
'return E'. The script will do the substitution only when the
function return type and variable type are the same.
Manual fixups:
* audio/audio.c: coding style of "read (...)" and "write (...)"
* block/qcow2-cluster.c: wrap line to make it shorter
* block/qcow2-refcount.c: change indentation of wrapped line
* target-tricore/op_helper.c: fix coding style of
"remainder|quotient"
* target-mips/dsp_helper.c: reverted changes because I don't
want to argue about checkpatch.pl
* ui/qemu-pixman.c: fix line indentation
* block/rbd.c: restore blank line between declarations and
statements
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <1465855078-19435-4-git-send-email-ehabkost@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[Unused Coccinelle rule name dropped along with a redundant comment;
whitespace touched up in block/qcow2-cluster.c; stale commit message
paragraph deleted]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'qga')
-rw-r--r-- | qga/commands-posix.c | 4 | ||||
-rw-r--r-- | qga/commands-win32.c | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/qga/commands-posix.c b/qga/commands-posix.c index eaef7be..ea37c09 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -127,7 +127,6 @@ int64_t qmp_guest_get_time(Error **errp) { int ret; qemu_timeval tq; - int64_t time_ns; ret = qemu_gettimeofday(&tq); if (ret < 0) { @@ -135,8 +134,7 @@ int64_t qmp_guest_get_time(Error **errp) return -1; } - time_ns = tq.tv_sec * 1000000000LL + tq.tv_usec * 1000; - return time_ns; + return tq.tv_sec * 1000000000LL + tq.tv_usec * 1000; } void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp) diff --git a/qga/commands-win32.c b/qga/commands-win32.c index ea23797..9c9be12 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -1150,7 +1150,6 @@ out: int64_t qmp_guest_get_time(Error **errp) { SYSTEMTIME ts = {0}; - int64_t time_ns; FILETIME tf; GetSystemTime(&ts); @@ -1164,10 +1163,8 @@ int64_t qmp_guest_get_time(Error **errp) return -1; } - time_ns = ((((int64_t)tf.dwHighDateTime << 32) | tf.dwLowDateTime) + return ((((int64_t)tf.dwHighDateTime << 32) | tf.dwLowDateTime) - W32_FT_OFFSET) * 100; - - return time_ns; } void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp) |