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 /linux-user | |
| parent | 6b62d961373e0327f2af8fb77d6d5d6308864180 (diff) | |
| download | qemu-9be385980d37e8f4fd33f605f5fb1c3d144170a8.tar.gz | |
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 'linux-user')
| -rw-r--r-- | linux-user/signal.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/linux-user/signal.c b/linux-user/signal.c index 61c1145446..1dadddf2dd 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -195,7 +195,6 @@ int block_signals(void) { TaskState *ts = (TaskState *)thread_cpu->opaque; sigset_t set; - int pending; /* It's OK to block everything including SIGSEGV, because we won't * run any further guest code before unblocking signals in @@ -204,9 +203,7 @@ int block_signals(void) sigfillset(&set); sigprocmask(SIG_SETMASK, &set, 0); - pending = atomic_xchg(&ts->signal_pending, 1); - - return pending; + return atomic_xchg(&ts->signal_pending, 1); } /* Wrapper for sigprocmask function @@ -3956,9 +3953,7 @@ static void setup_sigcontext(struct target_sigcontext *sc, static inline unsigned long align_sigframe(unsigned long sp) { - unsigned long i; - i = sp & ~3UL; - return i; + return sp & ~3UL; } static inline abi_ulong get_sigframe(struct target_sigaction *ka, @@ -4555,7 +4550,7 @@ static target_ulong get_sigframe(struct target_sigaction *ka, CPUPPCState *env, int frame_size) { - target_ulong oldsp, newsp; + target_ulong oldsp; oldsp = env->gpr[1]; @@ -4565,9 +4560,7 @@ static target_ulong get_sigframe(struct target_sigaction *ka, + target_sigaltstack_used.ss_size); } - newsp = (oldsp - frame_size) & ~0xFUL; - - return newsp; + return (oldsp - frame_size) & ~0xFUL; } static void save_user_regs(CPUPPCState *env, struct target_mcontext *frame) |