summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2012-03-04 23:50:30 +0100
committerDavid Kalnischkies <kalnischkies@gmail.com>2012-03-04 23:50:30 +0100
commitf685054e7e37c2d24dd0f0391c6d5a4e1a0b9099 (patch)
tree374eab6b794583f774507990af008023b8504eba
parentdcaa1185506986142bccd990a5dca4c6ec1228cf (diff)
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
-rw-r--r--apt-inst/dirstream.cc6
1 files changed, 2 insertions, 4 deletions
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;