[RFA] Remove two more uses of make_cleanup_close

[Simon Marchi]

On 2018-06-07 22:55, Tom Tromey wrote:
> This removes two more uses of make_cleanup_close, replacing them with
> relatively straightforward uses of scoped_fd.

LGTM.

Simon