From f685054e7e37c2d24dd0f0391c6d5a4e1a0b9099 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 4 Mar 2012 23:50:30 +0100 Subject: fix "(style) Statements following return, break, continue, goto or throw will never be executed." from cppcheck. The fd was closed only after a return, so invert the order of lines and be happy --- apt-inst/dirstream.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'apt-inst/dirstream.cc') diff --git a/apt-inst/dirstream.cc b/apt-inst/dirstream.cc index bb0bf96c1..65d1aa188 100644 --- a/apt-inst/dirstream.cc +++ b/apt-inst/dirstream.cc @@ -46,15 +46,13 @@ bool pkgDirStream::DoItem(Item &Itm,int &Fd) // fchmod deals with umask and fchown sets the ownership if (fchmod(iFd,Itm.Mode) != 0) { - _error->Errno("fchmod",_("Failed to write file %s"), Itm.Name); close(iFd); - return false; + return _error->Errno("fchmod",_("Failed to write file %s"), Itm.Name); } if (fchown(iFd,Itm.UID,Itm.GID) != 0 && errno != EPERM) { - return _error->Errno("fchown",_("Failed to write file %s"), Itm.Name); close(iFd); - return false; + return _error->Errno("fchown",_("Failed to write file %s"), Itm.Name); } Fd = iFd; return true; -- cgit v1.2.3