From: David Kalnischkies <david@kalnischkies.de>
Date: Mon, 7 Sep 2015 19:14:55 +0000 (+0200)
Subject: copy ReadWrite-error to the bottom to make clang happy
X-Git-Tag: 1.1.exp13~33
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/8f5b67ae1488f5addc70b337aea7aa1ced168550

copy ReadWrite-error to the bottom to make clang happy

clang detects that fd isn't set in the ReadWrite case – just that this
is supposed to be catched earlier in this method already, but it doesn't
hurt to make it explicit here as well and clang is happy, too.

Git-Dch: Ignore
---

diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index 9f95a2a90..52fedce8f 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -2230,11 +2230,14 @@ bool Popen(const char* Args[], FileFd &Fd, pid_t &Child, FileFd::OpenMode Mode)/
    {
       close(Pipe[1]);
       fd = Pipe[0];
-   } else if(Mode == FileFd::WriteOnly)
+   }
+   else if(Mode == FileFd::WriteOnly)
    {
       close(Pipe[0]);
       fd = Pipe[1];
    }
+   else
+      return _error->Error("Popen supports ReadOnly (x)or WriteOnly mode only");
    Fd.OpenDescriptor(fd, Mode, FileFd::None, true);
 
    return true;