HCoop
/
ntk
/
apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
apt-key del: Ignore case when checking if a keyid exists in a keyring.
[ntk/apt.git]
/
apt-pkg
/
edsp.h
diff --git
a/apt-pkg/edsp.h
b/apt-pkg/edsp.h
index
ae20ed7
..
9e83355
100644
(file)
--- a/
apt-pkg/edsp.h
+++ b/
apt-pkg/edsp.h
@@
-12,6
+12,7
@@
#include <apt-pkg/cacheset.h>
#include <apt-pkg/pkgcache.h>
#include <apt-pkg/cacheiterators.h>
#include <apt-pkg/cacheset.h>
#include <apt-pkg/pkgcache.h>
#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/macros.h>
#include <stdio.h>
#include <stdio.h>
@@
-32,15
+33,15
@@
class EDSP /*{{{*/
static const char * const PrioMap[];
static const char * const DepMap[];
static const char * const PrioMap[];
static const char * const DepMap[];
- bool static ReadLine(int const input, std::string &line);
- bool static StringToBool(char const *answer, bool const defValue);
+
APT_HIDDEN
bool static ReadLine(int const input, std::string &line);
+
APT_HIDDEN
bool static StringToBool(char const *answer, bool const defValue);
- void static WriteScenarioVersion(pkgDepCache &Cache, FILE* output,
+
APT_HIDDEN
void static WriteScenarioVersion(pkgDepCache &Cache, FILE* output,
pkgCache::PkgIterator const &Pkg,
pkgCache::VerIterator const &Ver);
pkgCache::PkgIterator const &Pkg,
pkgCache::VerIterator const &Ver);
- void static WriteScenarioDependency(FILE* output,
+
APT_HIDDEN
void static WriteScenarioDependency(FILE* output,
pkgCache::VerIterator const &Ver);
pkgCache::VerIterator const &Ver);
- void static WriteScenarioLimitedDependency(FILE* output,
+
APT_HIDDEN
void static WriteScenarioLimitedDependency(FILE* output,
pkgCache::VerIterator const &Ver,
APT::PackageSet const &pkgset);
public:
pkgCache::VerIterator const &Ver,
APT::PackageSet const &pkgset);
public:
@@
-204,10
+205,10
@@
public:
* \param[out] solver_in will be the stdin of the solver
* \param[out] solver_out will be the stdout of the solver
*
* \param[out] solver_in will be the stdin of the solver
* \param[out] solver_out will be the stdout of the solver
*
- * \return true if the solver could be started and the pipes
- * are set up correctly, otherwise false and the pipes are invalid
+ * \return PID of the started solver or 0 if failure occurred
*/
*/
- bool static ExecuteSolver(const char* const solver, int *solver_in, int *solver_out);
+ pid_t static ExecuteSolver(const char* const solver, int * const solver_in, int * const solver_out, bool /*overload*/);
+ APT_DEPRECATED bool static ExecuteSolver(const char* const solver, int *solver_in, int *solver_out);
/** \brief call an external resolver to handle the request
*
/** \brief call an external resolver to handle the request
*