* merges:
Add a couple of missing semicolons on last commit
Fix build
Add some sanity assertions to format conversions.
Coverity: UNINIT: CID 409,408,407,406
Coverity: UNINIT: CID 410
Coverity: UNREACHABLE: CID 426, 425, 424, 423, 422, 421
Coverity: UNINIT: CID 453
Coverity: Uninit: CID 473
Coverity: Char IO: CID 595
Coverity: No effect: CID 598
Coverity: LOCK: CID 597