Make __return variable local to the function scope; clean-up code a little.
Make __return variable local to the function scope; clean-up code a little.

Signed-off-by: Krzysztof Wilczynski <9bf091559fc98493329f7d619638c79e91ccf029@linux.com>

kwilczynski/miscellaneous,kwilczynski/miscellaneous,kwilczynski/miscellaneous,kwilczynski/miscellaneous,kwilczynski/miscellaneous,kwilczynski/miscellaneous,kwilczynski/miscellaneous