summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2014-09-27 00:46:43 +0200
committerDavid Kalnischkies <david@kalnischkies.de>2014-09-27 00:47:08 +0200
commit5e49cbb7b65a79cf76ba251f6493fbd75e812466 (patch)
treefb8fa6ccac2bd90d6c2767a60293e7819b34aa06
parentc0f3bde3e0cf33b9134fae8289aa651f7f1866b1 (diff)
fix: Consecutive return, break, continue, goto or throw statements are unnecessary.
Git-Dch: Ignore Reported-By: cppcheck
-rw-r--r--apt-inst/dirstream.cc1
-rw-r--r--apt-pkg/contrib/fileutl.cc4
2 files changed, 1 insertions, 4 deletions
diff --git a/apt-inst/dirstream.cc b/apt-inst/dirstream.cc
index 39ebb3bb4..888020bfb 100644
--- a/apt-inst/dirstream.cc
+++ b/apt-inst/dirstream.cc
@@ -76,7 +76,6 @@ bool pkgDirStream::DoItem(Item &Itm,int &Fd)
if(mkdir(Itm.Name,Itm.Mode) < 0)
return false;
return true;
- break;
}
case Item::FIFO:
break;
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index 9e7702063..df409fa36 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -2126,10 +2126,8 @@ bool Popen(const char* Args[], FileFd &Fd, pid_t &Child, FileFd::OpenMode Mode)
int Pipe[2] = {-1, -1};
if(pipe(Pipe) != 0)
- {
return _error->Errno("pipe", _("Failed to create subprocess IPC"));
- return NULL;
- }
+
std::set<int> keep_fds;
keep_fds.insert(Pipe[0]);
keep_fds.insert(Pipe[1]);