Please review (take 2): [389 Project] #48203: Fix coverity issues - 06/22/2015

[Noriko Hosoi]

https://fedorahosted.org/389/ticket/48203

Replying to rmeggins https://fedorahosted.org/389/ticket/48203#comment:2
> nack - looks like you have some unrelated formatting changes in this

patch?

https://fedorahosted.org/389/attachment/ticket/48203/0001-Ticket-48203-Fix-c...
git patch file (master) -- no format fixes