[fixed] some of the cppcheck warnings

Change-Id: I6cd2ed2d55a4c8222506fc7a734de80bc72422e2