A potentially uninitialised variable, some unreachable code,
and the main part of this, fixing the error path in the
unlink function.
Signed-off-by: NSteven Whitehouse <swhiteho@redhat.com>