From: David Kalnischkies <kalnischkies@gmail.com>
Date: Sun, 4 Mar 2012 22:50:30 +0000 (+0100)
Subject: fix "(style) Statements following return, break, continue, goto or throw
X-Git-Tag: 0.9.0~13^2~12
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/f685054e7e37c2d24dd0f0391c6d5a4e1a0b9099?hp=--cc

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
---

f685054e7e37c2d24dd0f0391c6d5a4e1a0b9099
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;