summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/acquire-method.h4
-rw-r--r--apt-pkg/cdrom.h4
-rw-r--r--apt-pkg/contrib/fileutl.h6
-rw-r--r--apt-pkg/deb/deblistparser.h3
-rw-r--r--apt-pkg/edsp.h11
-rw-r--r--apt-pkg/pkgcachegen.h18
-rw-r--r--apt-pkg/tagfile.h8
7 files changed, 31 insertions, 23 deletions
diff --git a/apt-pkg/acquire-method.h b/apt-pkg/acquire-method.h
index f0f2a537a..221ccf273 100644
--- a/apt-pkg/acquire-method.h
+++ b/apt-pkg/acquire-method.h
@@ -20,6 +20,8 @@
#ifndef PKGLIB_ACQUIRE_METHOD_H
#define PKGLIB_ACQUIRE_METHOD_H
+#include <apt-pkg/macros.h>
+
#include <stdarg.h>
#include <time.h>
@@ -107,7 +109,7 @@ class pkgAcqMethod
virtual ~pkgAcqMethod() {};
private:
- void Dequeue();
+ APT_HIDDEN void Dequeue();
};
/** @} */
diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h
index 0ed4a6a73..0f2c2cd02 100644
--- a/apt-pkg/cdrom.h
+++ b/apt-pkg/cdrom.h
@@ -1,6 +1,8 @@
#ifndef PKGLIB_CDROM_H
#define PKGLIB_CDROM_H
+#include <apt-pkg/macros.h>
+
#include<string>
#include<vector>
@@ -73,7 +75,7 @@ class pkgCdrom /*{{{*/
bool Add(pkgCdromStatus *log);
private:
- bool MountAndIdentCDROM(Configuration &Database, std::string &CDROM,
+ APT_HIDDEN bool MountAndIdentCDROM(Configuration &Database, std::string &CDROM,
std::string &ident, pkgCdromStatus * const log, bool const interactive);
};
/*}}}*/
diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h
index 278a25742..f25ed3622 100644
--- a/apt-pkg/contrib/fileutl.h
+++ b/apt-pkg/contrib/fileutl.h
@@ -150,11 +150,11 @@ class FileFd
private:
FileFdPrivate* d;
- bool OpenInternDescriptor(unsigned int const Mode, APT::Configuration::Compressor const &compressor);
+ APT_HIDDEN bool OpenInternDescriptor(unsigned int const Mode, APT::Configuration::Compressor const &compressor);
// private helpers to set Fail flag and call _error->Error
- bool FileFdErrno(const char* Function, const char* Description,...) APT_PRINTF(3) APT_COLD;
- bool FileFdError(const char* Description,...) APT_PRINTF(2) APT_COLD;
+ APT_HIDDEN bool FileFdErrno(const char* Function, const char* Description,...) APT_PRINTF(3) APT_COLD;
+ APT_HIDDEN bool FileFdError(const char* Description,...) APT_PRINTF(2) APT_COLD;
};
bool RunScripts(const char *Cnf);
diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h
index 286244cc9..baace79fe 100644
--- a/apt-pkg/deb/deblistparser.h
+++ b/apt-pkg/deb/deblistparser.h
@@ -15,6 +15,7 @@
#include <apt-pkg/tagfile.h>
#include <apt-pkg/md5.h>
#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/macros.h>
#include <string>
#include <vector>
@@ -102,7 +103,7 @@ class debListParser : public pkgCacheGenerator::ListParser
virtual ~debListParser() {};
private:
- unsigned char ParseMultiArch(bool const showErrors);
+ APT_HIDDEN unsigned char ParseMultiArch(bool const showErrors);
};
#endif
diff --git a/apt-pkg/edsp.h b/apt-pkg/edsp.h
index ae20ed7db..f3092d3c6 100644
--- 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/macros.h>
#include <stdio.h>
@@ -32,15 +33,15 @@ class EDSP /*{{{*/
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);
- void static WriteScenarioDependency(FILE* output,
+ APT_HIDDEN void static WriteScenarioDependency(FILE* output,
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:
diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h
index 5994dab9f..1e1a71026 100644
--- a/apt-pkg/pkgcachegen.h
+++ b/apt-pkg/pkgcachegen.h
@@ -38,10 +38,10 @@ class pkgCacheGenerator /*{{{*/
private:
pkgCache::StringItem *UniqHash[26];
- map_ptrloc WriteStringInMap(std::string const &String) { return WriteStringInMap(String.c_str()); };
- map_ptrloc WriteStringInMap(const char *String);
- map_ptrloc WriteStringInMap(const char *String, const unsigned long &Len);
- map_ptrloc AllocateInMap(const unsigned long &size);
+ APT_HIDDEN map_ptrloc WriteStringInMap(std::string const &String) { return WriteStringInMap(String.c_str()); };
+ APT_HIDDEN map_ptrloc WriteStringInMap(const char *String);
+ APT_HIDDEN map_ptrloc WriteStringInMap(const char *String, const unsigned long &Len);
+ APT_HIDDEN map_ptrloc AllocateInMap(const unsigned long &size);
public:
@@ -117,14 +117,14 @@ class pkgCacheGenerator /*{{{*/
~pkgCacheGenerator();
private:
- bool MergeListGroup(ListParser &List, std::string const &GrpName);
- bool MergeListPackage(ListParser &List, pkgCache::PkgIterator &Pkg);
- bool MergeListVersion(ListParser &List, pkgCache::PkgIterator &Pkg,
+ APT_HIDDEN bool MergeListGroup(ListParser &List, std::string const &GrpName);
+ APT_HIDDEN bool MergeListPackage(ListParser &List, pkgCache::PkgIterator &Pkg);
+ APT_HIDDEN bool MergeListVersion(ListParser &List, pkgCache::PkgIterator &Pkg,
std::string const &Version, pkgCache::VerIterator* &OutVer);
- bool AddImplicitDepends(pkgCache::GrpIterator &G, pkgCache::PkgIterator &P,
+ APT_HIDDEN bool AddImplicitDepends(pkgCache::GrpIterator &G, pkgCache::PkgIterator &P,
pkgCache::VerIterator &V);
- bool AddImplicitDepends(pkgCache::VerIterator &V, pkgCache::PkgIterator &D);
+ APT_HIDDEN bool AddImplicitDepends(pkgCache::VerIterator &V, pkgCache::PkgIterator &D);
};
/*}}}*/
// This is the abstract package list parser class. /*{{{*/
diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h
index 2f600d397..d5b62e76d 100644
--- a/apt-pkg/tagfile.h
+++ b/apt-pkg/tagfile.h
@@ -20,6 +20,8 @@
#ifndef PKGLIB_TAGFILE_H
#define PKGLIB_TAGFILE_H
+#include <apt-pkg/macros.h>
+
#include <stdio.h>
#include <string>
@@ -93,9 +95,9 @@ class pkgTagFile
{
pkgTagFilePrivate *d;
- bool Fill();
- bool Resize();
- bool Resize(unsigned long long const newSize);
+ APT_HIDDEN bool Fill();
+ APT_HIDDEN bool Resize();
+ APT_HIDDEN bool Resize(unsigned long long const newSize);
public:
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-01 16:22:00 +0000