Remove trailing whitespace
Format C source code
Remove unnecessary '#define'
Drop redundant parentheses with sizeof
merge pull request from xuchunyang
Merge branch 'xuchunyang-master'