Replace this while loop with a for loop and simplify error handling. Indent is broken on purpose, fixed in next commit. Signed-off-by: David Marchand <david.marchand@6wind.com> Acked-by: Sergio Gonzalez Monroy <sergio.gonzalez.monroy@intel.com>