...G...... [ZBX-8545] code fixes and style adjustments

git-svn-id: svn://svn.zabbix.com/trunk@49015 f4e7fd02-d210-4e34-a1e0-d4093fb66cc2