Simplify code by removing goto's where they point to simple return.

Avoid confusing |= on error values.

Correct whitespace.
Signed-off-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>