Changelog: ========== - build fix with newer compilers - builds again on Solaris - some code cleanup, which prevented build with newer compilers Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>