Use ++ instead of += 1

Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Remove redundant elses

Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Merge pull request #7642 from LK4D4/style_fixes

Style fixes for daemon package