fixes #1548
#1549

Signed-off-by: Suki <suki@missallsunday.com>
use call_hook_helper on the smf_main()

Signed-off-by: Suki <suki@missallsunday.com>
Use call_hook_helper on integrate_buffer hook

Signed-off-by: Suki <suki@missallsunday.com>
Merge pull request #1556 from MissAllSunday/stuff

Stuff