summaryrefslogtreecommitdiff
path: root/apt-pkg/contrib/fileutl.h
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2016-04-27 13:44:08 +0200
committerDavid Kalnischkies <david@kalnischkies.de>2016-05-20 14:18:36 +0200
commit4e92b11649292714082754920d5b28477414cd5a (patch)
treead73f62bb34a5d09ffab85db46cac6368fe7c1b5 /apt-pkg/contrib/fileutl.h
parentef00bd7af5b2bc0625df58482eacb4c2873c3647 (diff)
edsp: try harder to not generate unneeded error messages
The &= introduced in the EDSP-FileFd conversion isn't working to full satisfaction for multiple && clauses as the && has a higher binding than &= has, so that the methods were called even through they shouldn't have because of previous errors. Using variadic functions we can solve this in a slightly cleaner way bringing down the amount of 'broken pipe' errors for the error case of the dump resolver substantially. Git-Dch: Ignore
Diffstat (limited to 'apt-pkg/contrib/fileutl.h')
-rw-r--r--apt-pkg/contrib/fileutl.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h
index 13e9c610f..f33f7804b 100644
--- a/apt-pkg/contrib/fileutl.h
+++ b/apt-pkg/contrib/fileutl.h
@@ -23,9 +23,6 @@
#include <apt-pkg/macros.h>
#include <apt-pkg/aptconfiguration.h>
-#ifdef APT_PKG_EXPOSE_STRING_VIEW
-#include <apt-pkg/string_view.h>
-#endif
#include <string>
#include <vector>
@@ -92,9 +89,6 @@ class FileFd
char* ReadLine(char *To, unsigned long long const Size);
bool Flush();
bool Write(const void *From,unsigned long long Size);
-#ifdef APT_PKG_EXPOSE_STRING_VIEW
- APT_HIDDEN bool Write(APT::StringView From) { return Write(From.data(), From.size()); }
-#endif
bool static Write(int Fd, const void *From, unsigned long long Size);
bool Seek(unsigned long long To);
bool Skip(unsigned long long To);