MB-8804: Use calloc instead of malloc and assignment

Change-Id: I076814087f1fb7d53ffedef297d826ab1811eed3
MB-8804: Don't use C++ style comments

Change-Id: Ibec515cc15ef594a4001adb1b12198e63fd447a7
MB-8804: Don't mix decl

Change-Id: Ie9584ba22f57473526b78e05c4e8d8742f35643a