Просмотр исходного кода

mark optional (private) symbols as hidden

This methods should not be used by anyone expect the library itself as
they are helpers for the specific class and therefore perfect candidates
for hidding.

Git-Dch: Ignore
David Kalnischkies лет назад: 12
Родитель
Сommit
ce62f1def6

+ 3 - 1
apt-pkg/acquire-method.h

@@ -20,6 +20,8 @@
 #ifndef PKGLIB_ACQUIRE_METHOD_H
 #ifndef PKGLIB_ACQUIRE_METHOD_H
 #define PKGLIB_ACQUIRE_METHOD_H
 #define PKGLIB_ACQUIRE_METHOD_H
 
 
+#include <apt-pkg/macros.h>
+
 #include <stdarg.h>
 #include <stdarg.h>
 #include <time.h>
 #include <time.h>
 
 
@@ -107,7 +109,7 @@ class pkgAcqMethod
    virtual ~pkgAcqMethod() {};
    virtual ~pkgAcqMethod() {};
 
 
    private:
    private:
-   void Dequeue();
+   APT_HIDDEN void Dequeue();
 };
 };
 
 
 /** @} */
 /** @} */

+ 3 - 1
apt-pkg/cdrom.h

@@ -1,6 +1,8 @@
 #ifndef PKGLIB_CDROM_H
 #ifndef PKGLIB_CDROM_H
 #define PKGLIB_CDROM_H
 #define PKGLIB_CDROM_H
 
 
+#include <apt-pkg/macros.h>
+
 #include<string>
 #include<string>
 #include<vector>
 #include<vector>
 
 
@@ -73,7 +75,7 @@ class pkgCdrom								/*{{{*/
    bool Add(pkgCdromStatus *log);
    bool Add(pkgCdromStatus *log);
 
 
  private:
  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);
 	 std::string &ident, pkgCdromStatus * const log, bool const interactive);
 };
 };
 									/*}}}*/
 									/*}}}*/

+ 3 - 3
apt-pkg/contrib/fileutl.h

@@ -150,11 +150,11 @@ class FileFd
 
 
    private:
    private:
    FileFdPrivate* d;
    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
    // 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);
 bool RunScripts(const char *Cnf);

+ 2 - 1
apt-pkg/deb/deblistparser.h

@@ -15,6 +15,7 @@
 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/md5.h>
 #include <apt-pkg/md5.h>
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/pkgcache.h>
+#include <apt-pkg/macros.h>
 
 
 #include <string>
 #include <string>
 #include <vector>
 #include <vector>
@@ -102,7 +103,7 @@ class debListParser : public pkgCacheGenerator::ListParser
    virtual ~debListParser() {};
    virtual ~debListParser() {};
 
 
    private:
    private:
-   unsigned char ParseMultiArch(bool const showErrors);
+   APT_HIDDEN unsigned char ParseMultiArch(bool const showErrors);
 };
 };
 
 
 #endif
 #endif

+ 6 - 5
apt-pkg/edsp.h

@@ -12,6 +12,7 @@
 #include <apt-pkg/cacheset.h>
 #include <apt-pkg/cacheset.h>
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/cacheiterators.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 PrioMap[];
 	static const char * const DepMap[];
 	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::PkgIterator const &Pkg,
 					 pkgCache::VerIterator const &Ver);
 					 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,
 						   pkgCache::VerIterator const &Ver,
 						   APT::PackageSet const &pkgset);
 						   APT::PackageSet const &pkgset);
 public:
 public:

+ 9 - 9
apt-pkg/pkgcachegen.h

@@ -38,10 +38,10 @@ class pkgCacheGenerator							/*{{{*/
    private:
    private:
 
 
    pkgCache::StringItem *UniqHash[26];
    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:
    public:
    
    
@@ -117,14 +117,14 @@ class pkgCacheGenerator							/*{{{*/
    ~pkgCacheGenerator();
    ~pkgCacheGenerator();
 
 
    private:
    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);
 			 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);
 			   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.			/*{{{*/
 // This is the abstract package list parser class.			/*{{{*/

+ 5 - 3
apt-pkg/tagfile.h

@@ -20,6 +20,8 @@
 #ifndef PKGLIB_TAGFILE_H
 #ifndef PKGLIB_TAGFILE_H
 #define PKGLIB_TAGFILE_H
 #define PKGLIB_TAGFILE_H
 
 
+#include <apt-pkg/macros.h>
+
 #include <stdio.h>
 #include <stdio.h>
 
 
 #include <string>
 #include <string>
@@ -93,9 +95,9 @@ class pkgTagFile
 {
 {
    pkgTagFilePrivate *d;
    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:
    public:
 
 

Разница между файлами не показана из-за своего большого размера
+ 19 - 40
debian/libapt-pkg4.12.symbols