fix compiler warning and uncrustify
merge from lp:openpetraorg