From 4e92b11649292714082754920d5b28477414cd5a Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 27 Apr 2016 13:44:08 +0200 Subject: 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 --- apt-pkg/contrib/fileutl.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'apt-pkg/contrib/fileutl.h') 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 #include -#ifdef APT_PKG_EXPOSE_STRING_VIEW -#include -#endif #include #include @@ -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); -- cgit v1.2.3