[Libguestfs] [PATCH 3/5] Avoid various "declaration of <var> shadows a previous local"