fixed wrong conditions and pointer incrementation; parenthesis matching made redundant
fixed wrong conditions and pointer incrementation; parenthesis matching made redundant

triffon/up-2014-15,triffon/up-2014-15,triffon/up-2014-15,triffon/up-2014-15